Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename and update default for friendly NPC heal config for Autoduty users #405

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Rename and update default for friendly NPC heal config for Autoduty users #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Configuration/Configs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/DataCenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Helpers/ObjectHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down