Fix combo action heuristics

WorkingRobot · Jul 1, 2024 · e67f263 · e67f263 · github-actions · Jul 1, 2024
1 parent 480cc15
commit e67f263
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Simulator/Actions/AdvancedTouchCombo.cs b/Simulator/Actions/AdvancedTouchCombo.cs
@@ -4,5 +4,6 @@ internal sealed class AdvancedTouchCombo() : BaseComboAction<StandardTouchCombo,
     ActionType.StandardTouchCombo, ActionType.AdvancedTouch, 18 * 3
     )
 {
-
+    public override bool CouldUse(Simulator s) =>
+        BaseCouldUse(s) && VerifyDurability3(s, StandardTouchCombo.ActionA.DurabilityCost, StandardTouchCombo.ActionB.DurabilityCost);
 }
diff --git a/Simulator/Actions/BaseComboAction.cs b/Simulator/Actions/BaseComboAction.cs
@@ -43,7 +43,8 @@ public static bool VerifyDurability3(int durabilityA, int durabilityB, int durab
 
         if (!perfection)
         {
-            durability -= (int)MathF.Ceiling(durabilityA * wasteNots > 0 ? .5f : 1f);
+            durability -= (int)MathF.Ceiling(durabilityA * (wasteNots > 0 ? .5f : 1f));
+
             if (durability <= 0)
                 return false;
         }
@@ -54,7 +55,7 @@ public static bool VerifyDurability3(int durabilityA, int durabilityB, int durab
         if (wasteNots > 0)
             wasteNots--;
 
-        durability -= (int)MathF.Ceiling(durabilityB * wasteNots > 0 ? .5f : 1f);
+        durability -= (int)MathF.Ceiling(durabilityB * (wasteNots > 0 ? .5f : 1f));
 
         if (durability <= 0)
             return false;

diff --git a/Simulator/Simulator.cs b/Simulator/Simulator.cs
@@ -64,9 +64,9 @@ private ActionResponse Execute(ActionType action)
                 return ActionResponse.ActionNotUnlocked;
             if (action == ActionType.Manipulation && !Input.Stats.CanUseManipulation)
                 return ActionResponse.ActionNotUnlocked;
-            if (action is ActionType.CarefulObservation or ActionType.HeartAndSoul && !Input.Stats.IsSpecialist)
+            if (action is ActionType.CarefulObservation or ActionType.HeartAndSoul or ActionType.QuickInnovation && !Input.Stats.IsSpecialist)
                 return ActionResponse.ActionNotUnlocked;
-            if (baseAction.CPCost(this) > CP)
+            if (CalculateCPCost(baseAction.CPCost(this)) > CP)
                 return ActionResponse.NotEnoughCP;
             return ActionResponse.CannotUseAction;
         }
Benchmark suite	Current: `e67f263`	Previous: `7ad073a`	Ratio
`Craftimizer.Benchmark.Bench.Solve(State: 006E4F24, Config: 81686DB4)`	`104068146.66666667` ns (`± 961061.836531914`)
`Craftimizer.Benchmark.Bench.Solve(State: 4CD0EDD1, Config: 81686DB4)`	`94112731.11111112` ns (`± 795441.4926372613`)