Remove focused actions and observe from action set (combos exist)

WorkingRobot · Nov 14, 2023 · 51e5f6e · 51e5f6e · github-actions · Nov 14, 2023
1 parent 0a55e87
commit 51e5f6e
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 17 deletions.
diff --git a/Solver/ActionSet.cs b/Solver/ActionSet.cs
@@ -24,8 +24,6 @@ public struct ActionSet
         ActionType.DelicateSynthesis,
         ActionType.PreparatoryTouch,
         ActionType.Reflect,
-        ActionType.FocusedTouch,
-        ActionType.FocusedSynthesis,
         ActionType.PrudentTouch,
         ActionType.Manipulation,
         ActionType.MuscleMemory,
@@ -37,7 +35,6 @@ public struct ActionSet
         ActionType.StandardTouch,
         ActionType.Veneration,
         ActionType.WasteNot,
-        ActionType.Observe,
         ActionType.MastersMend,
         ActionType.BasicTouch,
     };

diff --git a/Solver/Simulator.cs b/Solver/Simulator.cs
@@ -42,22 +42,12 @@ private bool CanUseAction(ActionType action, bool strict)
         if (Quality >= Input.Recipe.MaxQuality && baseAction.IncreasesQuality)
             return false;
 
-        if (action == ActionType.Observe &&
-            ActionStates.Observed)
-            return false;
-
         if (strict)
         {
             // always use Trained Eye if it's available
             if (action == ActionType.TrainedEye)
                 return baseAction.CanUse(this);
 
-            // only allow Focused moves after Observe
-            if (ActionStates.Observed &&
-                action != ActionType.FocusedSynthesis &&
-                action != ActionType.FocusedTouch)
-                return false;
-
             // don't allow quality moves under Muscle Memory for difficult crafts
             if (Input.Recipe.ClassJobLevel == 90 &&
                 HasEffect(EffectType.MuscleMemory) &&
@@ -116,10 +106,6 @@ private bool CanUseAction(ActionType action, bool strict)
                 (HasEffect(EffectType.WasteNot) || HasEffect(EffectType.WasteNot2)))
                 return false;
 
-            if (action == ActionType.Observe &&
-                CP < 12)
-                return false;
-
             if (action == ActionType.MastersMend &&
                 Input.Recipe.MaxDurability - Durability < 25)
                 return false;
Benchmark suite	Current: `51e5f6e`	Previous: `4bf7397`	Ratio
`Craftimizer.Benchmark.Bench.Solve(State: 5372D31C98FA4C357F54029912394B0F5ECBE94AEC9D12C1C2B7F453C62ACD2F, Config: B75845A5DEDC79F3C98FE35F28206855B0EF4E065555FAF2AA129AED115B7744)`	`1446517540` ns (`± 6249241.284325185`)	`1480306700` ns (`± 23679878.252854258`)	`0.98`
`Craftimizer.Benchmark.Bench.Solve(State: 5372D31C98FA4C357F54029912394B0F5ECBE94AEC9D12C1C2B7F453C62ACD2F, Config: B75845A5DEDC79F3C98FE35F28206855B0EF4E065555FAF2AA129AED115B7744)`	`1108076306.6666667` ns (`± 5804956.620911707`)	`1480306700` ns (`± 23679878.252854258`)	`0.75`
`Craftimizer.Benchmark.Bench.Solve(State: 99B0F1AD46A18B4D8262F9BA75ABE23507217C2F20FBF895A49282DDFEF50190, Config: B75845A5DEDC79F3C98FE35F28206855B0EF4E065555FAF2AA129AED115B7744)`	`1472814440` ns (`± 7310406.939405924`)	`1450385066.6666667` ns (`± 6712458.243197247`)	`1.02`
`Craftimizer.Benchmark.Bench.Solve(State: 99B0F1AD46A18B4D8262F9BA75ABE23507217C2F20FBF895A49282DDFEF50190, Config: B75845A5DEDC79F3C98FE35F28206855B0EF4E065555FAF2AA129AED115B7744)`	`1086880386.6666667` ns (`± 2669995.1128544537`)	`1450385066.6666667` ns (`± 6712458.243197247`)	`0.75`