fix: fixed rotation condition IsTrue value.

ArchiDog1998 · Oct 23, 2023 · 5b9851c · 5b9851c
1 parent bb27f6b
commit 5b9851c
Show file tree

Hide file tree

Showing 10 changed files with 122 additions and 106 deletions.
diff --git a/Resources/UsersHash.json b/Resources/UsersHash.json
@@ -1,5 +1,4 @@
 [
   "Cs5AdOZTzkt2xdRfVaLw9Q==",
-  "cs5AdOZTzkt2xdRfVaLw9Q==",
   "1jvDI83Mn8heGaogKWl1fA=="
 ]
diff --git a/RotationSolver.Basic/Configuration/Conditions/RotationCondition.cs b/RotationSolver.Basic/Configuration/Conditions/RotationCondition.cs
@@ -4,10 +4,10 @@ internal class RotationCondition : DelayCondition
 {
     public ComboConditionType ComboConditionType = ComboConditionType.Float;
     internal PropertyInfo _prop;
-    public string PropertyName = nameof(CustomRotation.CombatTime);
+    public string PropertyName = "Not Chosen";
 
     MethodInfo _method;
-    public string MethodName = string.Empty;
+    public string MethodName = "Not Chosen";
 
     internal IBaseAction _action;
     public ActionID ID { get; set; } = ActionID.None;
@@ -17,13 +17,12 @@ internal class RotationCondition : DelayCondition
     public int Param1;
     public float Param2;
 
-
     public override bool CheckBefore(ICustomRotation rotation)
     {
-        return CheckBaseAction(rotation, ID, ref _action)
-            && CheckMemberInfo(rotation, ref PropertyName, ref _prop)
-            && CheckMemberInfo(rotation, ref MethodName, ref _method)
-            && base.CheckBefore(rotation);
+        CheckBaseAction(rotation, ID, ref _action);
+        CheckMemberInfo(rotation, ref PropertyName, ref _prop);
+        CheckMemberInfo(rotation, ref MethodName, ref _method);
+        return base.CheckBefore(rotation);
     }
 
     public override bool IsTrueInside(ICustomRotation rotation)

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -47,7 +47,6 @@ public static MajorConditionSet RightSet
 
     public static ICustomRotation RightNowRotation { get; internal set; }
 
-
     internal static bool NoPoslock => Svc.Condition[ConditionFlag.OccupiedInEvent]
         || !Service.Config.GetValue(PluginConfigBool.PoslockCasting)
         //Key cancel.
@@ -252,30 +251,30 @@ public static void SetSpecialType(SpecialCommandType specialType)
     public static IEnumerable<BattleChara> AllianceTanks { get; internal set; } = Array.Empty<PlayerCharacter>();
 
     public static ObjectListDelay<BattleChara> DeathPeopleAll { get; } = new(
-    () => (Service.Config.GetValue(Configuration.PluginConfigFloat.DeathDelayMin),
-    Service.Config.GetValue(Configuration.PluginConfigFloat.DeathDelayMax)));
+    () => (Service.Config.GetValue(PluginConfigFloat.DeathDelayMin),
+    Service.Config.GetValue(PluginConfigFloat.DeathDelayMax)));
 
     public static ObjectListDelay<BattleChara> DeathPeopleParty { get; } = new(
-    () => (Service.Config.GetValue(Configuration.PluginConfigFloat.DeathDelayMin),
-    Service.Config.GetValue(Configuration.PluginConfigFloat.DeathDelayMax)));
+    () => (Service.Config.GetValue(PluginConfigFloat.DeathDelayMin),
+    Service.Config.GetValue(PluginConfigFloat.DeathDelayMax)));
 
     public static ObjectListDelay<BattleChara> WeakenPeople { get; } = new(
-    () => (Service.Config.GetValue(Configuration.PluginConfigFloat.WeakenDelayMin),
-    Service.Config.GetValue(Configuration.PluginConfigFloat.WeakenDelayMax)));
+    () => (Service.Config.GetValue(PluginConfigFloat.WeakenDelayMin),
+    Service.Config.GetValue(PluginConfigFloat.WeakenDelayMax)));
 
     public static IEnumerable<BattleChara> DyingPeople { get; internal set; } = Array.Empty<BattleChara>();
 
     public static ObjectListDelay<BattleChara> HostileTargets { get; } = new ObjectListDelay<BattleChara>(
-    () => (Service.Config.GetValue(Configuration.PluginConfigFloat.HostileDelayMin),
-    Service.Config.GetValue(Configuration.PluginConfigFloat.HostileDelayMax)));
+    () => (Service.Config.GetValue(PluginConfigFloat.HostileDelayMin),
+    Service.Config.GetValue(PluginConfigFloat.HostileDelayMax)));
 
     public static IEnumerable<BattleChara> AllHostileTargets { get; internal set; } = Array.Empty<BattleChara>();
 
     public static IEnumerable<BattleChara> TarOnMeTargets { get; internal set; } = Array.Empty<BattleChara>();
 
     public static ObjectListDelay<BattleChara> CanInterruptTargets { get; } = new ObjectListDelay<BattleChara>(
-    () => (Service.Config.GetValue(Configuration.PluginConfigFloat.InterruptDelayMin),
-    Service.Config.GetValue(Configuration.PluginConfigFloat.InterruptDelayMax)));
+    () => (Service.Config.GetValue(PluginConfigFloat.InterruptDelayMin),
+    Service.Config.GetValue(PluginConfigFloat.InterruptDelayMax)));
 
     public static IEnumerable<GameObject> AllTargets { get; set; }
 
@@ -297,7 +296,6 @@ public static void SetSpecialType(SpecialCommandType specialType)
 
     public static bool HasPet { get; internal set; }
 
-
     public static unsafe bool HasCompanion => (IntPtr)Player.BattleChara != IntPtr.Zero 
                                            && (IntPtr)CharacterManager.Instance()->LookupBuddyByOwnerObject(Player.BattleChara) != IntPtr.Zero;
 

diff --git a/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs b/RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
@@ -144,6 +144,11 @@ public abstract partial class CustomRotation
     /// </summary>
     public static bool HasHostilesInRange => DataCenter.HasHostilesInRange;
 
+    /// <summary>
+    /// Is there any hostile target in 25 yalms?
+    /// </summary>
+    public static bool HasHostilesInMaxRange => DataCenter.HasHostilesInMaxRange;
+
     /// <summary>
     /// How many hostile targets in range? 25 for ranged jobs and healer, 3 for melee and tank.
     /// </summary>

diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs
@@ -147,8 +147,7 @@ internal static void UpdateRotationState()
                 CancelState();
             }
             else if (Service.Config.GetValue(PluginConfigBool.AutoOffBetweenArea) 
-                && (
-                Svc.Condition[ConditionFlag.BetweenAreas]
+                && (Svc.Condition[ConditionFlag.BetweenAreas]
                 || Svc.Condition[ConditionFlag.BetweenAreas51]))
             {
                 CancelState();

diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -298,6 +298,7 @@
     "IsTargetDying": "Is target going to die",
     "IsTargetBoss": "Is target a boss",
     "HasHostilesInRange": "Has hostiles in Range",
+    "HasHostilesInMaxRange": "Has hostiles in 25 yalms",
     "NumberOfHostilesInRange": "The number of hostiles in Range",
     "NumberOfHostilesInMaxRange": "The number of hostiles in max Range",
     "NumberOfAllHostilesInRange": "The number of all hostiles in Range",

diff --git a/RotationSolver/Localization/Strings.cs b/RotationSolver/Localization/Strings.cs
@@ -423,6 +423,7 @@ internal class Strings
         { nameof(CustomRotation.IsTargetDying), "Is target going to die"},
         { nameof(CustomRotation.IsTargetBoss), "Is target a boss"},
         { nameof(CustomRotation.HasHostilesInRange), "Has hostiles in Range"},
+        { nameof(CustomRotation.HasHostilesInMaxRange), "Has hostiles in 25 yalms"},
         { nameof(CustomRotation.NumberOfHostilesInRange), "The number of hostiles in Range"},
         { nameof(CustomRotation.NumberOfHostilesInMaxRange), "The number of hostiles in max Range"},
         { nameof(CustomRotation.NumberOfAllHostilesInRange), "The number of all hostiles in Range"},