diff --git a/Dalamud/Game/ClientState/Objects/Types/Character.cs b/Dalamud/Game/ClientState/Objects/Types/Character.cs
index 67f8c8b62..72f6a9950 100644
--- a/Dalamud/Game/ClientState/Objects/Types/Character.cs
+++ b/Dalamud/Game/ClientState/Objects/Types/Character.cs
@@ -93,6 +93,18 @@ public interface ICharacter : IGameObject
/// Gets the status flags.
///
public StatusFlags StatusFlags { get; }
+
+ ///
+ /// Gets the current mount for this character. Will be null if the character doesn't have a mount.
+ ///
+ public ExcelResolver? CurrentMount { get; }
+
+ ///
+ /// Gets the current minion summoned for this character. Will be null if the character doesn't have a minion.
+ /// This method *will* return information about a spawned (but invisible) minion, e.g. if the character is riding a
+ /// mount.
+ ///
+ public ExcelResolver? CurrentMinion { get; }
}
///
@@ -172,6 +184,32 @@ internal unsafe class Character : GameObject, ICharacter
(this.Struct->IsAllianceMember ? StatusFlags.AllianceMember : StatusFlags.None) |
(this.Struct->IsFriend ? StatusFlags.Friend : StatusFlags.None) |
(this.Struct->IsCasting ? StatusFlags.IsCasting : StatusFlags.None);
+
+ ///
+ public ExcelResolver? CurrentMount
+ {
+ get
+ {
+ if (this.Struct->IsNotMounted()) return null; // just for safety.
+
+ var mountId = this.Struct->Mount.MountId;
+ return mountId == 0 ? null : new ExcelResolver(mountId);
+ }
+ }
+
+ ///
+ public ExcelResolver? CurrentMinion
+ {
+ get
+ {
+ if (this.Struct->CompanionObject != null)
+ return new ExcelResolver(this.Struct->CompanionObject->BaseId);
+
+ // this is only present if a minion is summoned but hidden (e.g. the player's on a mount).
+ var hiddenCompanionId = this.Struct->CompanionData.CompanionId;
+ return hiddenCompanionId == 0 ? null : new ExcelResolver(hiddenCompanionId);
+ }
+ }
///
/// Gets the underlying structure.