Merge pull request #405 from FFXIV-CombatReborn/NPC-heal-defaults

Rename and update default for friendly NPC heal config for Autoduty users
FFXIV-CombatReborn · Sep 24, 2024 · 575c62c · 575c62c
2 parents b2a6661 + ae3b379
commit 575c62c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -473,7 +473,7 @@ public const string
 
     [ConditionBool, UI("Heal and raise Party NPCs.",
         Filter = HealingActionCondition, Section = 3)]
-    private static readonly bool _friendlyPartyNPCHeal = false;
+    private static readonly bool _friendlyPartyNPCHealRaise = true;
 
     [ConditionBool, UI("Heal/Dance partner your chocobo. (Experimental)",
         Filter = HealingActionCondition, Section = 3)]

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -410,7 +410,7 @@ public static IBattleChara? DeathTarget
                 return deathAll.FirstOrDefault();
             }
 
-            if (deathNPC.Any() && Service.Config.FriendlyPartyNpcHeal)
+            if (deathNPC.Any() && Service.Config.FriendlyPartyNpcHealRaise)
             {
                 var deathNPCT = deathNPC.GetJobCategory(JobRole.Tank).ToList();
                 var deathNPCH = deathNPC.GetJobCategory(JobRole.Healer).ToList();

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -167,7 +167,7 @@ internal static bool IsParty(this IGameObject gameObject)
             // Accessing Player.Object and Svc.Party within the lock to ensure thread safety
             if (gameObject.GameObjectId == Player.Object?.GameObjectId) return true;
             if (Svc.Party.Any(p => p.GameObject?.GameObjectId == gameObject.GameObjectId)) return true;
-            if (Service.Config.FriendlyPartyNpcHeal && gameObject.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember) return true;
+            if (Service.Config.FriendlyPartyNpcHealRaise && gameObject.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember) return true;
 
             // Check if ChocoboPartyMember is enabled
             if (Service.Config.ChocoboPartyMember)