Fix missing percents and use % for stats of expert recipe quality bar

This commit is contained in:
Asriel Camora
2023-11-14 00:47:12 -08:00
parent 51e5f6e049
commit 466d7ab508
+10 -4
View File
@@ -135,7 +135,10 @@ public sealed class MacroEditor : Window, IDisposable
if (recipeData.Recipe.ItemResult.Value!.IsCollectable) if (recipeData.Recipe.ItemResult.Value!.IsCollectable)
getParam = s => s.Collectability; getParam = s => s.Collectability;
else if (recipeData.Recipe.RequiredQuality > 0) else if (recipeData.Recipe.RequiredQuality > 0)
getParam = s => s.Quality; {
var reqQual = recipeData.Recipe.RequiredQuality;
getParam = s => (int)((float)s.Quality / reqQual * 100);
}
else if (recipeData.RecipeInfo.MaxQuality > 0) else if (recipeData.RecipeInfo.MaxQuality > 0)
getParam = s => s.HQPercent; getParam = s => s.HQPercent;
else else
@@ -1098,9 +1101,12 @@ public sealed class MacroEditor : Window, IDisposable
if (RecipeData.Recipe.ItemResult.Value!.IsCollectable) if (RecipeData.Recipe.ItemResult.Value!.IsCollectable)
datas.Add(new("Collectability", Colors.HQ, Reliability.Param, State.Collectability, State.MaxCollectability, $"{State.Collectability}", null)); datas.Add(new("Collectability", Colors.HQ, Reliability.Param, State.Collectability, State.MaxCollectability, $"{State.Collectability}", null));
else if (RecipeData.Recipe.RequiredQuality > 0) else if (RecipeData.Recipe.RequiredQuality > 0)
datas.Add(new("Quality %", Colors.HQ, Reliability.Param, State.Quality, RecipeData.Recipe.RequiredQuality, $"{(float)State.Quality / RecipeData.Recipe.RequiredQuality * 100:0}%", null)); {
var qualityPercent = (float)State.Quality / RecipeData.Recipe.RequiredQuality * 100;
datas.Add(new("Quality %%", Colors.HQ, Reliability.Param, qualityPercent, 100, $"{qualityPercent:0}%", null));
}
else if (RecipeData.RecipeInfo.MaxQuality > 0) else if (RecipeData.RecipeInfo.MaxQuality > 0)
datas.Add(new("HQ %", Colors.HQ, Reliability.Param, State.HQPercent, 100, $"{State.HQPercent}%", null)); datas.Add(new("HQ %%", Colors.HQ, Reliability.Param, State.HQPercent, 100, $"{State.HQPercent}%", null));
DrawBars(datas); DrawBars(datas);
ImGui.TableNextColumn(); ImGui.TableNextColumn();
@@ -1194,7 +1200,7 @@ public sealed class MacroEditor : Window, IDisposable
ImGui.Text(condition.Name()); ImGui.Text(condition.Name());
} }
if (ImGui.IsItemHovered()) if (ImGui.IsItemHovered())
ImGui.SetTooltip(condition.Description(CharacterStats.HasSplendorousBuff)); ImGui.SetTooltip(condition.Description(CharacterStats.HasSplendorousBuff).Replace("%", "%%"));
ImGui.SetCursorPos(pos); ImGui.SetCursorPos(pos);
ImGuiUtils.AlignRight(ImGui.GetFrameHeight(), totalSize); ImGuiUtils.AlignRight(ImGui.GetFrameHeight(), totalSize);