diff --git a/Craftimizer/SimulatorWindow.cs b/Craftimizer/SimulatorWindow.cs index 2c1f355..4530096 100644 --- a/Craftimizer/SimulatorWindow.cs +++ b/Craftimizer/SimulatorWindow.cs @@ -93,7 +93,7 @@ public class SimulatorWindow : Window ImGui.Text($"Step {State.StepCount + 1}"); ImGui.Text(State.Condition.Name()); if (ImGui.IsItemHovered()) - ImGui.SetTooltip(State.Condition.Description(State.Input.Stats.HasRelic)); + ImGui.SetTooltip(State.Condition.Description(State.Input.Stats.HasSplendorousBuff)); ImGui.Text($"{State.HQPercent}%% HQ"); ImGui.PushStyleColor(ImGuiCol.PlotHistogram, new Vector4(.2f, 1f, .2f, 1f)); ImGui.ProgressBar(Math.Min((float)State.Progress / State.Input.Recipe.MaxProgress, 1f), new Vector2(200, 20), $"{State.Progress} / {State.Input.Recipe.MaxProgress}"); @@ -123,16 +123,6 @@ public class SimulatorWindow : Window ImGuiHelpers.ScaledDummy(5); { ImGui.Text("TODO: Action History"); - //var i = 0; - //foreach (var action in State.ActionHistory) - //{ - // var baseAction = action.With(Simulation); - // ImGui.Image(action.GetIcon(ClassJob.Carpenter).ImGuiHandle, new Vector2(ImGui.GetFontSize() * 2f)); - // if (ImGui.IsItemHovered()) - // ImGui.SetTooltip($"{action.GetName(ClassJob.Carpenter)}\n{baseAction.GetTooltip(false)}"); - // if (++i % 5 != 0) - // ImGui.SameLine(); - //} } ImGui.EndChild(); ImGui.EndTable(); diff --git a/Simulator/CharacterStats.cs b/Simulator/CharacterStats.cs index f114dbf..b8389df 100644 --- a/Simulator/CharacterStats.cs +++ b/Simulator/CharacterStats.cs @@ -6,7 +6,7 @@ public sealed record CharacterStats public int Control { get; init; } public int CP { get; init; } public int Level { get; init; } - public bool HasRelic { get; init; } + public bool HasSplendorousBuff { get; init; } public bool IsSpecialist { get; init; } public int CLvl { get; init; } } diff --git a/Simulator/Simulator.cs b/Simulator/Simulator.cs index 8efcb76..c04ade6 100644 --- a/Simulator/Simulator.cs +++ b/Simulator/Simulator.cs @@ -224,7 +224,7 @@ public class Simulator var conditionModifier = Condition switch { Condition.Poor => 0.50f, - Condition.Good => Input.Stats.HasRelic ? 1.75f : 1.50f, + Condition.Good => Input.Stats.HasSplendorousBuff ? 1.75f : 1.50f, Condition.Excellent => 4.00f, _ => 1.00f, }; diff --git a/Solver/Crafty/Solver.cs b/Solver/Crafty/Solver.cs index 61f5a5b..0d3c5d0 100644 --- a/Solver/Crafty/Solver.cs +++ b/Solver/Crafty/Solver.cs @@ -1,7 +1,5 @@ using Craftimizer.Simulator; using Craftimizer.Simulator.Actions; -using System; -using System.Diagnostics; using System.Diagnostics.Contracts; using System.Numerics; using System.Runtime.CompilerServices;