ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-22 00:19:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add Mannequin-Handling for Retainer Individuals

Browse source
This commit is contained in:
Ottermandias 2022-12-03 18:54:06 +01:00
parent c06eb1ad3d
commit a6b3aab61a
2 changed files with 40 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Penumbra.GameData/Actors/ActorManager.Data.cs
View file

@ -234,4 +234,24 @@ public sealed partial class ActorManager : IDisposable
private static unsafe ushort InspectWorldId private static unsafe ushort InspectWorldId
=> *_inspectWorldId; => *_inspectWorldId;
public static readonly IReadOnlySet<uint> MannequinIds = new HashSet<uint>()
{
1026228u,
1026229u,
1026986u,
1026987u,
1026988u,
1026989u,
1032291u,
1032292u,
1032293u,
1032294u,
1033046u,
1033047u,
1033658u,
1033659u,
1007137u,
// TODO: Female Hrothgar
};
} }

23
Penumbra.GameData/Actors/ActorManager.Identifiers.cs
View file

@ -76,7 +76,7 @@ public partial class ActorManager
IdentifierType.Retainer => id.PlayerName.ToString(), IdentifierType.Retainer => id.PlayerName.ToString(),
IdentifierType.Owned => id.HomeWorld != _clientState.LocalPlayer?.HomeWorld.Id IdentifierType.Owned => id.HomeWorld != _clientState.LocalPlayer?.HomeWorld.Id
? $"{id.PlayerName} ({Data.ToWorldName(id.HomeWorld)})'s {Data.ToName(id.Kind, id.DataId)}" ? $"{id.PlayerName} ({Data.ToWorldName(id.HomeWorld)})'s {Data.ToName(id.Kind, id.DataId)}"
: $"{id.PlayerName}s {Data.ToName(id.Kind, id.DataId)}", : $"{id.PlayerName}s {Data.ToName(id.Kind, id.DataId)}",
IdentifierType.Special => id.Special.ToName(), IdentifierType.Special => id.Special.ToName(),
IdentifierType.Npc => IdentifierType.Npc =>
id.Index == ushort.MaxValue id.Index == ushort.MaxValue
@ -150,6 +150,23 @@ public partial class ActorManager
// Special case for squadron that is also in the game functions, cf. E8 ?? ?? ?? ?? 89 87 ?? ?? ?? ?? 4C 89 BF // Special case for squadron that is also in the game functions, cf. E8 ?? ?? ?? ?? 89 87 ?? ?? ?? ?? 4C 89 BF
if (dataId == 0xf845d) if (dataId == 0xf845d)
dataId = actor->GetNpcID(); dataId = actor->GetNpcID();
if (MannequinIds.Contains(dataId))
{
static ByteString Get(byte* ptr)
=> ptr == null ? ByteString.Empty : new ByteString(ptr);
var actualName = Get(actor->GetName());
var retainerName = Get(actor->Name);
if (!actualName.Equals(retainerName))
{
var ident = check
? CreateRetainer(retainerName)
: CreateIndividualUnchecked(IdentifierType.Retainer, retainerName, actor->ObjectIndex, ObjectKind.EventNpc, dataId);
if (ident.IsValid)
return ident;
}
}
return check return check
? CreateNpc(ObjectKind.EventNpc, dataId, actor->ObjectIndex) ? CreateNpc(ObjectKind.EventNpc, dataId, actor->ObjectIndex)
: CreateIndividualUnchecked(IdentifierType.Npc, ByteString.Empty, actor->ObjectIndex, ObjectKind.EventNpc, dataId); : CreateIndividualUnchecked(IdentifierType.Npc, ByteString.Empty, actor->ObjectIndex, ObjectKind.EventNpc, dataId);
@ -182,7 +199,7 @@ public partial class ActorManager
{ {
var name = new ByteString(actor->Name); var name = new ByteString(actor->Name);
var index = actor->ObjectIndex; var index = actor->ObjectIndex;
return CreateIndividualUnchecked(IdentifierType.UnkObject, name, index, ObjectKind.None, 0); return CreateIndividualUnchecked(IdentifierType.UnkObject, name, index, ObjectKind.None, 0);
} }
} }
} }
@ -212,7 +229,7 @@ public partial class ActorManager
IdentifierType.Retainer => CreateRetainer(name), IdentifierType.Retainer => CreateRetainer(name),
IdentifierType.Owned => CreateOwned(name, homeWorld, kind, dataId), IdentifierType.Owned => CreateOwned(name, homeWorld, kind, dataId),
IdentifierType.Special => CreateSpecial((SpecialActor)homeWorld), IdentifierType.Special => CreateSpecial((SpecialActor)homeWorld),
IdentifierType.Npc => CreateNpc(kind, dataId, homeWorld), IdentifierType.Npc => CreateNpc(kind, dataId, homeWorld),
IdentifierType.UnkObject => CreateIndividualUnchecked(IdentifierType.UnkObject, name, homeWorld, ObjectKind.None, 0), IdentifierType.UnkObject => CreateIndividualUnchecked(IdentifierType.UnkObject, name, homeWorld, ObjectKind.None, 0),
_ => ActorIdentifier.Invalid, _ => ActorIdentifier.Invalid,
}; };