anna/PartyDamage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: check cross realm properly

Browse Source
This commit is contained in:
Anna 2024-08-01 16:12:10 -04:00
parent 74914bef0c
commit 1f85158c68
Signed by: anna
GPG Key ID: D0943384CD9F87D1
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
Plugin.cs
View File

@ -319,33 +319,6 @@ public class Plugin : IDalamudPlugin {
} }
var names = new List<ListInfo>(); var names = new List<ListInfo>();
var crossInfo = InfoProxyCrossRealm.Instance();
if (crossInfo->IsCrossRealm != 0) {
var crossGroup = crossInfo->CrossRealmGroups[crossInfo->LocalPlayerGroupIndex];
for (var i = 0; i < crossGroup.GroupMemberCount && i < list->PartyMembers.Length; i++) {
var member = crossGroup.GroupMembers[i];
var name = member.NameString;
if (string.IsNullOrWhiteSpace(name)) {
continue;
}
if (chara->GetSoftTargetId() == member.EntityId) {
return true;
}
var info = new ListInfo {
Name = name,
IsChocobo = false,
Mana = null,
PartyListIndex = i,
ClassJob = member.ClassJobId,
};
names.Add(info);
}
} else {
var members = AgentHUD.Instance()->PartyMembers; var members = AgentHUD.Instance()->PartyMembers;
for (var i = 0; i < members.Length && i < list->PartyMembers.Length; i++) { for (var i = 0; i < members.Length && i < list->PartyMembers.Length; i++) {
var member = members[i]; var member = members[i];
@ -376,6 +349,38 @@ public class Plugin : IDalamudPlugin {
names.Add(info); names.Add(info);
} }
// check cross realm party for any members we may have missed
var crossInfo = InfoProxyCrossRealm.Instance();
if (crossInfo->IsInCrossRealmParty != 0) {
var crossGroup = crossInfo->CrossRealmGroups[crossInfo->LocalPlayerGroupIndex];
for (var i = 0; i < crossGroup.GroupMemberCount && i < list->PartyMembers.Length; i++) {
var member = crossGroup.GroupMembers[i];
var name = member.NameString;
if (string.IsNullOrWhiteSpace(name)) {
continue;
}
if (chara->GetSoftTargetId() == member.EntityId) {
return true;
}
if (names.FirstOrDefault(info => info.Name == name) is { } info) {
info.PartyListIndex = member.MemberIndex;
continue;
}
info = new ListInfo {
Name = name,
IsChocobo = false,
Mana = null,
PartyListIndex = member.MemberIndex,
ClassJob = member.ClassJobId,
};
names.Add(info);
}
} }
this._ranLastTick = true; this._ranLastTick = true;
@ -385,8 +390,10 @@ public class Plugin : IDalamudPlugin {
this._showDps ^= true; this._showDps ^= true;
} }
names.Sort((a, b) => a.PartyListIndex.CompareTo(b.PartyListIndex));
for (var i = 0; i < names.Count; i++) { for (var i = 0; i < names.Count; i++) {
var info = names[i]; var info = names[i];
Plugin.Log.Info($"{info.Name} at {info.PartyListIndex}");
var lookupName = info.Name == playerName var lookupName = info.Name == playerName
? "YOU" ? "YOU"
: info.Name; : info.Name;
@ -407,7 +414,9 @@ public class Plugin : IDalamudPlugin {
bool includeBar, bool includeBar,
bool includeTargeted bool includeTargeted
) { ) {
var unit = info.IsChocobo ? list->Chocobo : list->PartyMembers[info.PartyListIndex]; var unit = info.IsChocobo
? list->Chocobo
: list->PartyMembers[info.PartyListIndex];
if (includeBar && unit.TargetGlow != null && (includeTargeted || list->TargetedIndex != info.PartyListIndex)) { if (includeBar && unit.TargetGlow != null && (includeTargeted || list->TargetedIndex != info.PartyListIndex)) {
unit.TargetGlow->SetAlpha(255); unit.TargetGlow->SetAlpha(255);
unit.TargetGlow->SetScaleX(0); unit.TargetGlow->SetScaleX(0);
@ -572,7 +581,9 @@ public class Plugin : IDalamudPlugin {
Combatant combatant, Combatant combatant,
IEnumerable<Combatant> combatants IEnumerable<Combatant> combatants
) { ) {
var member = info.IsChocobo ? list->Chocobo : list->PartyMembers[info.PartyListIndex]; var member = info.IsChocobo
? list->Chocobo
: list->PartyMembers[info.PartyListIndex];
if (this.Config.UseDpsBar && member.TargetGlow != null) { if (this.Config.UseDpsBar && member.TargetGlow != null) {
float denominator; float denominator;
switch (this.Config.DpsBarMode) { switch (this.Config.DpsBarMode) {
@ -726,7 +737,7 @@ public class Plugin : IDalamudPlugin {
public class ListInfo { public class ListInfo {
public required string Name { get; init; } public required string Name { get; init; }
public required bool IsChocobo { get; init; } public required bool IsChocobo { get; init; }
public required int PartyListIndex { get; init; } public required int PartyListIndex { get; set; }
public required uint? Mana { get; init; } public required uint? Mana { get; init; }
public required byte? ClassJob { get; init; } public required byte? ClassJob { get; init; }
} }