ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Add CurrentMinion to Character

Browse source
This commit is contained in:
Kaz Wolfe 2024-07-24 13:36:33 -07:00
parent 56f7da5e0c
commit 35520fab8c
No known key found for this signature in database
GPG key ID: 258813F53A16EBB4
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Dalamud/Game/ClientState/Objects/Types/Character.cs
View file

@ -98,6 +98,13 @@ public interface ICharacter : IGameObject
/// Gets the current mount for this character. Will be <c>null</c> if the character doesn't have a mount.
/// </summary>
public ExcelResolver<Mount>? CurrentMount { get; }
/// <summary>
/// Gets the current minion summoned for this character. Will be <c>null</c> 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.
/// </summary>
public ExcelResolver<Companion>? CurrentMinion { get; }
}
/// <summary>
@ -183,13 +190,27 @@ internal unsafe class Character : GameObject, ICharacter
{
get
{
if (this.Struct->IsNotMounted()) return null; // safety i guess?
if (this.Struct->IsNotMounted()) return null; // just for safety.
var mountId = this.Struct->Mount.MountId;
return mountId == 0 ? null : new ExcelResolver<Mount>(mountId);
}
}
/// <inheritdoc />
public ExcelResolver<Companion>? CurrentMinion
{
get
{
if (this.Struct->CompanionObject != null)
return new ExcelResolver<Companion>(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<Companion>(hiddenCompanionId);
}
}
/// <summary>
/// Gets the underlying structure.
/// </summary>