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

This commit is contained in:
Asriel Camora
2023-11-14 00:44:21 -08:00
parent 0a55e87b3a
commit 51e5f6e049
2 changed files with 0 additions and 17 deletions
-3
View File
@@ -24,8 +24,6 @@ public struct ActionSet
ActionType.DelicateSynthesis, ActionType.DelicateSynthesis,
ActionType.PreparatoryTouch, ActionType.PreparatoryTouch,
ActionType.Reflect, ActionType.Reflect,
ActionType.FocusedTouch,
ActionType.FocusedSynthesis,
ActionType.PrudentTouch, ActionType.PrudentTouch,
ActionType.Manipulation, ActionType.Manipulation,
ActionType.MuscleMemory, ActionType.MuscleMemory,
@@ -37,7 +35,6 @@ public struct ActionSet
ActionType.StandardTouch, ActionType.StandardTouch,
ActionType.Veneration, ActionType.Veneration,
ActionType.WasteNot, ActionType.WasteNot,
ActionType.Observe,
ActionType.MastersMend, ActionType.MastersMend,
ActionType.BasicTouch, ActionType.BasicTouch,
}; };
-14
View File
@@ -42,22 +42,12 @@ internal sealed class Simulator : SimulatorNoRandom
if (Quality >= Input.Recipe.MaxQuality && baseAction.IncreasesQuality) if (Quality >= Input.Recipe.MaxQuality && baseAction.IncreasesQuality)
return false; return false;
if (action == ActionType.Observe &&
ActionStates.Observed)
return false;
if (strict) if (strict)
{ {
// always use Trained Eye if it's available // always use Trained Eye if it's available
if (action == ActionType.TrainedEye) if (action == ActionType.TrainedEye)
return baseAction.CanUse(this); 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 // don't allow quality moves under Muscle Memory for difficult crafts
if (Input.Recipe.ClassJobLevel == 90 && if (Input.Recipe.ClassJobLevel == 90 &&
HasEffect(EffectType.MuscleMemory) && HasEffect(EffectType.MuscleMemory) &&
@@ -116,10 +106,6 @@ internal sealed class Simulator : SimulatorNoRandom
(HasEffect(EffectType.WasteNot) || HasEffect(EffectType.WasteNot2))) (HasEffect(EffectType.WasteNot) || HasEffect(EffectType.WasteNot2)))
return false; return false;
if (action == ActionType.Observe &&
CP < 12)
return false;
if (action == ActionType.MastersMend && if (action == ActionType.MastersMend &&
Input.Recipe.MaxDurability - Durability < 25) Input.Recipe.MaxDurability - Durability < 25)
return false; return false;