fix: state update and defense fix.

Ted-Jin-Lab · Ted-Jin-Lab · commit 1d1ac56a31ff · 2024-08-11T18:40:34.000+08:00
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -685,6 +685,8 @@
   "34711": 0.1,
   "35663": 0.1,
   "36623": 0.1,
+  "36921": 0.6,
+  "36922": 0.6,
   "36923": 0.6,
   "36924": 0.6,
   "36969": 0.6,
diff --git a/Resources/RotationSolverRecord.json b/Resources/RotationSolverRecord.json
@@ -1 +1 @@
-xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1ZBRZKwOFEfs7yShVUM8eFZ9UsIVNVcStNuvmUGKtQwxLjZLSIzuMnrcEziHNOIQQPW0mrTBWCh11YOYLQEThqY0Cxo+06+/GOjYzVoXkwfLYnbJhOmz533oDsdfaGXgl+I11ibws34sV41RkLUZ2h/EbSRgcvn9XBajCxJuGx8x4w/9iBKdCqbndwkaUOVfoDy0mbd+/BukCNUqByMQfFQ==
+xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtS7PPFsQv7EbZtxJYKo/4ceFYvxKFIZNITokP2JJyJyNbI6Mfm3yhY4rNSe5HN3KZ/rzbf7rFiGDbzNriyR9N8TOANIHdQQxQRmMwZip+rI5qqYJksjQoRKwf7fj6+tePZif7YGCr1Ddqmr5bzekXjPx8Six82fZJ/8uUlODKmdJBcGXUI/B9oUOUhiszS/pu7zaA3tUW9QjFAK6+K/kEnhIwtZlbAtVaQ==
diff --git a/Resources/StatusProvide.json b/Resources/StatusProvide.json
@@ -282,5 +282,64 @@
   ],
   "36969": [],
   "36973": [],
-  "24386": []
+  "24386": [],
+  "9": [],
+  "15": [],
+  "3539": [
+    1902
+  ],
+  "16460": [
+    3827
+  ],
+  "7384": [],
+  "36918": [
+    3828
+  ],
+  "36919": [],
+  "36921": [
+    1368
+  ],
+  "16459": [],
+  "25748": [],
+  "25749": [],
+  "25750": [
+    3831
+  ],
+  "36922": [],
+  "22": [
+    77
+  ],
+  "20": [
+    3847
+  ],
+  "3538": [],
+  "28": [],
+  "23": [],
+  "25747": [],
+  "16461": [],
+  "25746": [
+    2674
+  ],
+  "152": [],
+  "36986": [],
+  "16505": [],
+  "154": [],
+  "3576": [],
+  "25797": [],
+  "141": [],
+  "25795": [],
+  "159": [],
+  "25794": [],
+  "162": [],
+  "36989": [],
+  "149": [],
+  "36987": [],
+  "16507": [],
+  "3577": [],
+  "158": [],
+  "142": [],
+  "7421": [
+    1211
+  ],
+  "7422": []
 }
diff --git a/Resources/TargetStatusProvide.json b/Resources/TargetStatusProvide.json
@@ -220,5 +220,56 @@
   "24391": [],
   "36969": [],
   "36973": [],
-  "24386": []
+  "24386": [],
+  "9": [],
+  "15": [],
+  "3539": [],
+  "16460": [],
+  "7384": [],
+  "36918": [],
+  "36919": [],
+  "36921": [],
+  "16459": [],
+  "25748": [],
+  "25749": [],
+  "25750": [],
+  "36922": [],
+  "22": [],
+  "20": [
+    76
+  ],
+  "3538": [],
+  "28": [
+    79
+  ],
+  "23": [
+    248
+  ],
+  "25747": [],
+  "16461": [],
+  "25746": [],
+  "152": [],
+  "36986": [
+    3871
+  ],
+  "16505": [],
+  "154": [],
+  "3576": [],
+  "25797": [],
+  "141": [],
+  "25795": [],
+  "159": [],
+  "25794": [],
+  "162": [],
+  "36989": [],
+  "149": [],
+  "36987": [
+    3872
+  ],
+  "16507": [],
+  "3577": [],
+  "158": [],
+  "142": [],
+  "7421": [],
+  "7422": []
 }
diff --git a/Resources/TerritoryConfigs/1208.json b/Resources/TerritoryConfigs/1208.json
@@ -3,6 +3,14 @@
     "WAR": {
       "Timeline": {},
       "Trigger": []
+    },
+    "ADV": {
+      "Timeline": {},
+      "Trigger": []
+    },
+    "SGE": {
+      "Timeline": {},
+      "Trigger": []
     }
   },
   "NoHostileNames": [],
diff --git a/Resources/TerritoryConfigs/641.json b/Resources/TerritoryConfigs/641.json
@@ -63,6 +63,10 @@
     "BRD": {
       "Timeline": {},
       "Trigger": []
+    },
+    "BLM": {
+      "Timeline": {},
+      "Trigger": []
     }
   },
   "NoHostileNames": [
diff --git a/Resources/TerritoryConfigs/952.json b/Resources/TerritoryConfigs/952.json
@@ -27,6 +27,14 @@
     "RPR": {
       "Timeline": {},
       "Trigger": []
+    },
+    "PLD": {
+      "Timeline": {},
+      "Trigger": []
+    },
+    "BLM": {
+      "Timeline": {},
+      "Trigger": []
     }
   },
   "NoHostileNames": [],
diff --git a/RotationSolver.Basic b/RotationSolver.Basic
@@ -1 +1 @@
-Subproject commit e5433e1868d309a75c25d43dcede6f442104fdbf
+Subproject commit ff31c8b74b2ad87e94d2c70829a1171673c2b1cb
diff --git a/RotationSolver/Localization/Localization.json b/RotationSolver/Localization/Localization.json
@@ -630,5 +630,8 @@
   "RotationSolver.Basic.Configuration.PositionName.Pos": "Pos",
   "RotationSolver.Basic.Configuration.PositionName.Draw": "Draw",
   "RotationSolver.Basic.Configuration.Position": "Position",
-  "RotationSolver.Basic.Configuration.Drawing.ObjectLockOnGetterName.LockOnPath": "Path"
+  "RotationSolver.Basic.Configuration.Drawing.ObjectLockOnGetterName.LockOnPath": "Path",
+  "RotationSolver.Basic.Configuration.ConfigsName.OnlyPartiesAreFriendly": "Only the players in party are friendly.",
+  "RotationSolver.Basic.Configuration.ConfigsName.DontTargetPetsAsFriendly": "Do not target pets as friendly",
+  "RotationSolver.Basic.Configuration.ConfigsName.DontTargetChocoboAsFriendly": "Do not target chocobos as friendly"
 }
diff --git a/RotationSolver/UI/ConfigWindows/ActionsItem.cs b/RotationSolver/UI/ConfigWindows/ActionsItem.cs
@@ -189,7 +189,7 @@ static void DrawConfigsOfBaseAction(IBaseAction a)
                 }
                 ImGuiHelper.HoveredTooltip(ConfigUnitType.Seconds.Local());
 
-                if (a.Setting.StatusProvide != null || a.Setting.TargetStatusProvide != null)
+                if (a.Info.StatusProvide.Length > 0 || a.Info.TargetStatusProvide.Length > 0)
                 {
                     var shouldStatus = config.ShouldCheckStatus;
                     if (ImGui.Checkbox($"{UiString.ConfigWindow_Actions_CheckStatus.Local()}##{a}", ref shouldStatus))
@@ -256,14 +256,19 @@ static void DrawActionDebug()
                     ImGui.Text("AttackType: " + action.Info.AttackType.ToString());
                     ImGui.Text("Aspect: " + action.Info.Aspect.ToString());
                     ImGui.Text("Has One:" + action.CD.HasOneCharge.ToString());
-                    ImGui.Text("Recast One: " + action.CD.RecastTimeOneChargeRaw.ToString());
+                    ImGui.Text("Recast One: " + action.CD.RecastTime.ToString());
                     ImGui.Text("Recast One Remain: " + action.CD.RecastTimeRemainOneCharge.ToString());
                     ImGui.Text("Recast Elapsed: " + action.CD.RecastTimeElapsedRaw.ToString());
                     ImGui.Text($"Charges: {action.CD.CurrentCharges} / {action.CD.MaxCharges}");
 
+                    ImGui.Text("-----");
+
                     ImGui.Text("Status Need: " + string.Join(", ", action.Info.TargetStatusNeed));
                     ImGui.Text("Status Provide: " + string.Join(", ", action.Info.StatusProvide));
                     ImGui.Text("Status Target Provide: " + string.Join(", ", action.Info.TargetStatusProvide));
+                    ImGui.Text("Combo Actions: " + string.Join(", ", action.Info.ComboActions));
+
+                    ImGui.Text("-----");
 
                     ImGui.Text($"Can Use: {action.CanUse(out _, skipClippingCheck: true)} ");
                     ImGui.Text($"Why Can't: {action.WhyCant.Local()} ");
diff --git a/RotationSolver/UI/ConfigWindows/DebugItem.cs b/RotationSolver/UI/ConfigWindows/DebugItem.cs
@@ -110,7 +110,10 @@ private static unsafe void DrawTargetData()
         {
             ImGui.Text("Height: " + Svc.Targets.Target.Struct()->Height.ToString());
             ImGui.Text("Kind: " + Svc.Targets.Target.GetObjectKind().ToString());
-            ImGui.Text("SubKind: " + Svc.Targets.Target.GetBattleNPCSubKind().ToString());
+            if (Svc.Targets.Target is IBattleNpc npc)
+            {
+                ImGui.Text("SubKind: " + npc.BattleNpcKind.ToString());
+            }
             ImGui.Text("Data Id: " + Svc.Targets.Target.DataId.ToString());
             ImGui.Text("Name Plate: " + Svc.Targets.Target.Struct()->NamePlateIconId);
             var owner = Svc.Objects.SearchById(Svc.Targets.Target.OwnerId);
diff --git a/RotationSolver/UI/ConfigWindows/RotationItem.cs b/RotationSolver/UI/ConfigWindows/RotationItem.cs
@@ -261,7 +261,7 @@ private static void DrawRotationRating()
                         if (ImGui.Button($"{i}##My Rating Value"))
                         {
                             GithubRecourcesHelper.ModifyYourRate(rotation.GetType(), i);
-                            DownloadHelper.ModifyMyRate(i);
+                            DownloadHelper.ModifyMyRate(rotation.GetType(), i);
                             _nextChangeTime = DateTime.Now + TimeSpan.FromMinutes(1);
                             ImGui.CloseCurrentPopup();
                         }
diff --git a/RotationSolver/Updaters/StateUpdater.cs b/RotationSolver/Updaters/StateUpdater.cs
@@ -124,20 +124,13 @@ private static AutoStatus StatusFromAutomatic()
 
                 if (DataCenter.Role == JobRole.Healer || DataCenter.Job == ECommons.ExcelServices.Job.PLD) // Help defense.
                 {
-                    if (DataCenter.PartyMembers.Any((tank) =>
-                    {
-                        var attackingTankObj = DataCenter.AllHostileTargets.Where(t => t.TargetObjectId == tank.EntityId);
-
-                        if (attackingTankObj.Count() != 1) return false;
-
-                        return DataCenter.IsHostileCastingToTank;
-                    }))
+                    if (DataCenter.IsHostileCastingToOthers)
                     {
                         status |= AutoStatus.DefenseSingle;
                     }
                 }
 
-                if (DataCenter.Role == JobRole.Tank) // defense self.
+                if (DataCenter.Role == JobRole.Tank) // Defense self. TODO: maybe better
                 {
                     var movingHere = (float)DataCenter.NumberOfHostilesInRange / DataCenter.NumberOfHostilesInMaxRange > 0.3f;
 
@@ -156,7 +149,7 @@ private static AutoStatus StatusFromAutomatic()
                     }
 
                     //Big damage casting action.
-                    if (DataCenter.IsHostileCastingToTank)
+                    if (DataCenter.IsHostileCastingToMe)
                     {
                         status |= AutoStatus.DefenseSingle;
                     }
diff --git a/RotationSolver/Updaters/TargetUpdater.cs b/RotationSolver/Updaters/TargetUpdater.cs
@@ -88,6 +88,7 @@ private static float JobRange
     private static RandomDelay
         _interruptDelay = new(() => Service.Config.InterruptDelay),
         _knockbackDelay = new(() => Service.Config.AntiKnockbackDelay),
+        _defenseMeDelay = new(() => Service.Config.DefenseSingleDelay),
         _defenseSingleDelay = new(() => Service.Config.DefenseSingleDelay),
         _defenseAreaDelay = new(() => Service.Config.DefenseAreaDelay),
         _provokeDelay = new(() => Service.Config.ProvokeDelay);
@@ -141,20 +142,30 @@ private unsafe static void UpdateHostileTargets(IEnumerable<IBattleChara> allTar
         DataCenter.MobsTime = DataCenter.AllHostileTargets.Count(o => o.DistanceToPlayer() <= JobRange && o.CanSee())
             >= Service.Config.AutoDefenseNumber;
 
-        DataCenter.IsHostileCastingToTank = _defenseSingleDelay.Delay(IsCastingTankVfx() || DataCenter.AllHostileTargets.Any(IsHostileCastingTank));
+        DataCenter.IsHostileCastingToMe = _defenseMeDelay.Delay(IsCastingTankVfx(true) || DataCenter.AllHostileTargets.Any(t => IsHostileCastingTank(t, true)));
+        DataCenter.IsHostileCastingToOthers = _defenseSingleDelay.Delay(IsCastingTankVfx(false) || DataCenter.AllHostileTargets.Any(t => IsHostileCastingTank(t, false)));
+
         DataCenter.IsHostileCastingAOE = _defenseAreaDelay.Delay(IsCastingAreaVfx() || DataCenter.AllHostileTargets.Any(IsHostileCastingArea));
         DataCenter.IsHostileCastingKnockback = _knockbackDelay.Delay(DataCenter.AllHostileTargets.Any(IsHostileCastingKnockback));
 
         DataCenter.ProvokeTarget = _provokeDelay.Delay(DataCenter.AllHostileTargets.FirstOrDefault(ObjectHelper.CanProvoke));
     }
 
-    private static bool IsCastingTankVfx()
+    private static bool IsCastingTankVfx(bool isMe)
     {
         return IsCastingVfx(s =>
         {
             if (!s.Path.StartsWith("vfx/lockon/eff/tank_lockon")) return false;
             if (!Player.Available) return false;
-            if (Player.Object.IsJobCategory(JobRole.Tank) && s.Object?.EntityId != Player.Object.EntityId) return false;
+
+            if (isMe)
+            {
+                if (s.Object?.GameObjectId != Player.Object.GameObjectId) return false;
+            }
+            else
+            {
+                if (s.Object?.GameObjectId == Player.Object.GameObjectId) return false;
+            }
 
             return true;
         });
@@ -182,10 +193,21 @@ private static bool IsCastingVfx(Func<VfxNewData, bool> isVfx)
         return false;
     }
 
-    private static bool IsHostileCastingTank(IBattleChara h)
+    private static bool IsHostileCastingTank(IBattleChara h, bool isMe)
     {
         return IsHostileCastingBase(h, (act) =>
         {
+            if (!Player.Available) return false;
+
+            if (isMe)
+            {
+                if (h.CastTargetObjectId != Player.Object.GameObjectId) return false;
+            }
+            else
+            {
+                if (h.CastTargetObjectId == Player.Object.GameObjectId) return false;
+            }
+
             return OtherConfiguration.HostileCastingTank.Contains(act.RowId)
                 || h.CastTargetObjectId == h.TargetObjectId;
         });

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtanK2txymJ/1ZBRZKwOFEfs7yShVUM8eFZ9UsIVNVcStNuvmUGKtQwxLjZLSIzuMnrcEziHNOIQQPW0mrTBWCh11YOYLQEThqY0Cxo+06+/GOjYzVoXkwfLYnbJhOmz533oDsdfaGXgl+I11ibws34sV41RkLUZ2h/EbSRgcvn9XBajCxJuGx8x4w/9iBKdCqbndwkaUOVfoDy0mbd+/BukCNUqByMQfFQ==`
	`1`	`+xr3o9iHF3RQFBt+Qw6g3uHMZD1xzVVD+kGDb509UUQeoq1E6TtjmtS7PPFsQv7EbZtxJYKo/4ceFYvxKFIZNITokP2JJyJyNbI6Mfm3yhY4rNSe5HN3KZ/rzbf7rFiGDbzNriyR9N8TOANIHdQQxQRmMwZip+rI5qqYJksjQoRKwf7fj6+tePZif7YGCr1Ddqmr5bzekXjPx8Six82fZJ/8uUlODKmdJBcGXUI/B9oUOUhiszS/pu7zaA3tUW9QjFAK6+K/kEnhIwtZlbAtVaQ==`