JonKazama-Hellion/Craftimizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix combo action heuristics

Browse Source
This commit is contained in:
Asriel Camora
2024-07-01 09:51:44 -07:00
parent 480cc15cc7
commit e67f263286
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Simulator/Actions/AdvancedTouchCombo.cs
+2 -1
View File
@@ -4,5 +4,6 @@ internal sealed class AdvancedTouchCombo() : BaseComboAction<StandardTouchCombo,
ActionType.StandardTouchCombo, ActionType.AdvancedTouch, 18 * 3 ActionType.StandardTouchCombo, ActionType.AdvancedTouch, 18 * 3
) )
{ {
public override bool CouldUse(Simulator s) =>
BaseCouldUse(s) && VerifyDurability3(s, StandardTouchCombo.ActionA.DurabilityCost, StandardTouchCombo.ActionB.DurabilityCost);
} }
Simulator/Actions/BaseComboAction.cs
+3 -2
View File
@@ -43,7 +43,8 @@ public abstract class BaseComboAction(
if (!perfection) if (!perfection)
{ {
durability -= (int)MathF.Ceiling(durabilityA * wasteNots > 0 ? .5f : 1f); durability -= (int)MathF.Ceiling(durabilityA * (wasteNots > 0 ? .5f : 1f));
if (durability <= 0) if (durability <= 0)
return false; return false;
} }
@@ -54,7 +55,7 @@ public abstract class BaseComboAction(
if (wasteNots > 0) if (wasteNots > 0)
wasteNots--; wasteNots--;
durability -= (int)MathF.Ceiling(durabilityB * wasteNots > 0 ? .5f : 1f); durability -= (int)MathF.Ceiling(durabilityB * (wasteNots > 0 ? .5f : 1f));
if (durability <= 0) if (durability <= 0)
return false; return false;
Simulator/Simulator.cs
+2 -2
View File
@@ -64,9 +64,9 @@ public class Simulator
return ActionResponse.ActionNotUnlocked; return ActionResponse.ActionNotUnlocked;
if (action == ActionType.Manipulation && !Input.Stats.CanUseManipulation) if (action == ActionType.Manipulation && !Input.Stats.CanUseManipulation)
return ActionResponse.ActionNotUnlocked; 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; return ActionResponse.ActionNotUnlocked;
if (baseAction.CPCost(this) > CP) if (CalculateCPCost(baseAction.CPCost(this)) > CP)
return ActionResponse.NotEnoughCP; return ActionResponse.NotEnoughCP;
return ActionResponse.CannotUseAction; return ActionResponse.CannotUseAction;
} }