ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-13 12:14:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1094 from AsgardXIV/gameobjectx

Browse source
This commit is contained in:
goat 2023-01-23 23:55:29 +01:00 • committed by GitHub
commit e7eb4f433b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs
View file

@ -79,4 +79,9 @@ public enum ObjectKind : byte
/// Objects representing card stand objects. /// Objects representing card stand objects.
/// </summary> /// </summary>
CardStand = 0x0E, CardStand = 0x0E,
/// <summary>
/// Objects representing ornament (Fashion Accessories) objects.
/// </summary>
Ornament = 0x0F,
} }

4
Dalamud/Game/ClientState/Objects/ObjectTable.cs
View file

@ -111,8 +111,12 @@ public sealed partial class ObjectTable : IServiceType
{ {
ObjectKind.Player => new PlayerCharacter(address), ObjectKind.Player => new PlayerCharacter(address),
ObjectKind.BattleNpc => new BattleNpc(address), ObjectKind.BattleNpc => new BattleNpc(address),
ObjectKind.EventNpc => new Npc(address),
ObjectKind.Retainer => new Npc(address),
ObjectKind.EventObj => new EventObj(address), ObjectKind.EventObj => new EventObj(address),
ObjectKind.Companion => new Npc(address), ObjectKind.Companion => new Npc(address),
ObjectKind.MountType => new Npc(address),
ObjectKind.Ornament => new Npc(address),
_ => new GameObject(address), _ => new GameObject(address),
}; };
} }

5
Dalamud/Game/ClientState/Objects/Types/GameObject.cs
View file

@ -113,6 +113,11 @@ public unsafe partial class GameObject
/// </summary> /// </summary>
public uint OwnerId => this.Struct->OwnerID; public uint OwnerId => this.Struct->OwnerID;
/// <summary>
/// Gets the index of this object in the object table.
/// </summary>
public ushort ObjectIndex => this.Struct->ObjectIndex;
/// <summary> /// <summary>
/// Gets the entity kind of this <see cref="GameObject" />. /// Gets the entity kind of this <see cref="GameObject" />.
/// See <see cref="ObjectKind">the ObjectKind enum</see> for possible values. /// See <see cref="ObjectKind">the ObjectKind enum</see> for possible values.