Fixed an issue with reserve flask usage and minor UI changes

sychotixdev · Jan 31, 2018 · 89176dd · 89176dd
1 parent 70423da
commit 89176dd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/BasicFlaskRoutine.cs b/BasicFlaskRoutine.cs
@@ -397,10 +397,13 @@ protected override void RunWindow()
                     Settings.RemAilment.Value = ImGuiExtension.Checkbox("Enable", Settings.RemAilment);
                     ImGui.Separator();
                     Settings.RemFrozen.Value = ImGuiExtension.Checkbox("Frozen", Settings.RemFrozen);
+                    ImGui.SameLine();
                     Settings.RemBurning.Value = ImGuiExtension.Checkbox("Burning", Settings.RemBurning);
                     Settings.RemShocked.Value = ImGuiExtension.Checkbox("Shocked", Settings.RemShocked);
+                    ImGui.SameLine();
                     Settings.RemCurse.Value = ImGuiExtension.Checkbox("Cursed", Settings.RemCurse);
                     Settings.RemPoison.Value = ImGuiExtension.Checkbox("Poison", Settings.RemPoison);
+                    ImGui.SameLine();
                     Settings.RemBleed.Value = ImGuiExtension.Checkbox("Bleed", Settings.RemBleed);
                     Settings.CorruptCount.Value = ImGuiExtension.IntSlider("Corrupting Blood Stacks", Settings.MinManaFlask);
                     ImGui.TreePop();
@@ -419,8 +422,8 @@ protected override void RunWindow()
                 {
                     Settings.DefensiveFlaskEnable.Value = ImGuiExtension.Checkbox("Enable", Settings.DefensiveFlaskEnable);
                     ImGui.Separator();
-                    Settings.HPPercentDefensive.Value = ImGuiExtension.IntSlider("Min HP%", Settings.HPPercentDefensive);
-                    Settings.ESPercentDefensive.Value = ImGuiExtension.IntSlider("Min ES%", Settings.ESPercentDefensive);
+                    Settings.HPPercentDefensive.Value = ImGuiExtension.IntSlider("Min Life %", Settings.HPPercentDefensive);
+                    Settings.ESPercentDefensive.Value = ImGuiExtension.IntSlider("Min ES %", Settings.ESPercentDefensive);
                     Settings.OffensiveAsDefensiveEnable.Value = ImGuiExtension.Checkbox("Use offensive flasks for defense", Settings.OffensiveAsDefensiveEnable);
                     ImGui.TreePop();
                 }
@@ -429,8 +432,8 @@ protected override void RunWindow()
                 {
                     Settings.OffensiveFlaskEnable.Value = ImGuiExtension.Checkbox("Enable", Settings.OffensiveFlaskEnable);
                     ImGui.Separator();
-                    Settings.HPPercentOffensive.Value = ImGuiExtension.IntSlider("Min HP%", Settings.HPPercentOffensive);
-                    Settings.ESPercentOffensive.Value = ImGuiExtension.IntSlider("Min ES%", Settings.ESPercentOffensive);
+                    Settings.HPPercentOffensive.Value = ImGuiExtension.IntSlider("Min Life %", Settings.HPPercentOffensive);
+                    Settings.ESPercentOffensive.Value = ImGuiExtension.IntSlider("Min ES %", Settings.ESPercentOffensive);
                     ImGui.TreePop();
                 }
             }

diff --git a/Flask/FlaskSetting.cs b/Flask/FlaskSetting.cs
@@ -4,21 +4,28 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace TreeRoutine.Routine.BasicFlaskRoutine.Flask
 {
     public class FlaskSetting
     {
+        public FlaskSetting()
+        {
+            // Initializing this here seems to fix the deserialization issue with min/max values
+            ReservedUses = new RangeNode<int>(0, 0, 5);
+        }
+
         public FlaskSetting (ToggleNode enabled, HotkeyNode hotkey, RangeNode<int> reservedUses)
         {
             Enabled = enabled;
             Hotkey = hotkey;
             ReservedUses = reservedUses;
         }
 
-        public HotkeyNode Hotkey { get; }
-        public ToggleNode Enabled { get; }
-        public RangeNode<int> ReservedUses { get; }
+        public HotkeyNode Hotkey { get; set; }
+        public ToggleNode Enabled { get; set; }
+        public RangeNode<int> ReservedUses { get; set; }
 
     }
 }