From ae3b379b7f0edd1e6706879d07d3dc0cf3261c67 Mon Sep 17 00:00:00 2001 From: LTS-FFXIV <127939494+LTS-FFXIV@users.noreply.github.com> Date: Mon, 23 Sep 2024 19:29:22 -0500 Subject: [PATCH] Rename and update default for friendly NPC heal config for Autoduty users Renamed `_friendlyPartyNPCHeal` to `_friendlyPartyNPCHealRaise` in the `Configs` class and changed its default value from `false` to `true`. Updated condition checks in `DataCenter` and `ObjectHelper` classes to use the new variable name `FriendlyPartyNpcHealRaise`. --- RotationSolver.Basic/Configuration/Configs.cs | 2 +- RotationSolver.Basic/DataCenter.cs | 2 +- RotationSolver.Basic/Helpers/ObjectHelper.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs index d404c7839..f525fb545 100644 --- 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 index df450658b..2c66f20c5 100644 --- 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 index cdeaa069c..0cc86f700 100644 --- 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)