Merge pull request #448 from FFXIV-CombatReborn/setting-bump-down

Rename and update NPC Heal/Raise config setting
FFXIV-CombatReborn · Nov 19, 2024 · 512a085 · 512a085
2 parents a4fc6e1 + 7eb85dc
commit 512a085
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs
@@ -448,9 +448,9 @@ public const string
         Filter = HealingActionCondition, Section = 3)]
     private static readonly bool _friendlyBattleNPCHeal = false;
 
-    [ConditionBool, UI("Heal and raise Party NPCs.",
+    [ConditionBool, UI("Heal and raise Party NPCs. (Breaks some fights due to status weirdness)", Description = "Experimental, only enable as needed.",
         Filter = HealingActionCondition, Section = 3)]
-    private static readonly bool _friendlyPartyNPCHealRaise = true;
+    private static readonly bool _friendlyPartyNPCHealRaise2 = false;
 
     [ConditionBool, UI("Heal/Dance partner your chocobo", Description = "Experimental.",
         Filter = HealingActionCondition, Section = 3)]

diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs
@@ -327,7 +327,7 @@ public unsafe static IBattleChara[] FriendlyNPCMembers
         get
         {
             // Check if the configuration setting is true
-            if (!Service.Config.FriendlyBattleNpcHeal && !Service.Config.FriendlyPartyNpcHealRaise)
+            if (!Service.Config.FriendlyBattleNpcHeal && !Service.Config.FriendlyPartyNpcHealRaise2)
             {
                 return Array.Empty<IBattleChara>();
             }
@@ -449,7 +449,7 @@ public static IBattleChara? DeathTarget
                 }
 
                 // Check death in friendly NPC members
-                if (deathNPC.Any() && Service.Config.FriendlyPartyNpcHealRaise)
+                if (deathNPC.Any() && Service.Config.FriendlyPartyNpcHealRaise2)
                 {
                     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
@@ -243,7 +243,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.FriendlyPartyNpcHealRaise && gameObject.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember) return true;
+            if (Service.Config.FriendlyPartyNpcHealRaise2 && gameObject.GetBattleNPCSubKind() == BattleNpcSubKind.NpcPartyMember) return true;
             if (Service.Config.ChocoboPartyMember && gameObject.GetNameplateKind() == NameplateKind.PlayerCharacterChocobo) return true;
             if (Service.Config.FriendlyBattleNpcHeal && gameObject.GetNameplateKind() == NameplateKind.FriendlyBattleNPC) return true;
 

diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs
@@ -963,10 +963,10 @@ private void DrawAutoduty()
         }
 
         // Display the current NPC Heal/Raise Support status
-        ImGui.TextWrapped($"NPC Heal/Raise Support Enabled: {Service.Config.FriendlyPartyNpcHealRaise}");
+        ImGui.TextWrapped($"NPC Heal/Raise Support Enabled: {Service.Config.FriendlyPartyNpcHealRaise2}");
         if (ImGui.Button("Enable NPC Heal/Raise Support"))
         {
-            Service.Config.FriendlyPartyNpcHealRaise.Value = true;
+            Service.Config.FriendlyPartyNpcHealRaise2.Value = true;
         }
         ImGui.Spacing();
         // Display the Auto Load Rotations status