Merge pull request #1094 from AsgardXIV/gameobjectx

Dalamud/Game/ClientState/Objects/Enums/ObjectKind.cs

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

Dalamud/Game/ClientState/Objects/ObjectTable.cs

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

Dalamud/Game/ClientState/Objects/Types/GameObject.cs

@@ -113,6 +113,11 @@ public unsafe partial class GameObject
     /// </summary>
     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>
     /// Gets the entity kind of this <see cref="GameObject" />.
     /// See <see cref="ObjectKind">the ObjectKind enum</see> for possible values.