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

Add TargetActorID

Browse source
This commit is contained in:
Caraxi 2020-05-28 08:28:26 +09:30
parent 4bbcd526e9
commit e8b244feba
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dalamud/Game/ClientState/Actors/Types/Actor.cs
View file

@ -65,5 +65,10 @@ namespace Dalamud.Game.ClientState.Actors.Types {
/// The Y distance from the local player in yalms.
/// </summary>
public byte YalmDistanceY => this.actorStruct.YalmDistanceFromPlayerY;
/// <summary>
/// The target of the actor
/// </summary>
public virtual int TargetActorID => 0;
}
}

6
Dalamud/Game/ClientState/Actors/Types/NonPlayer/BattleNpc.cs
View file

@ -22,5 +22,11 @@ namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer {
/// The ID of this BattleNpc's owner.
/// </summary>
public int OwnerId => this.actorStruct.OwnerId;
/// <summary>
/// Target of the Battle NPC
/// </summary>
public override int TargetActorID => this.actorStruct.BattleNpcTargetActorId;
}
}

6
Dalamud/Game/ClientState/Actors/Types/PlayerCharacter.cs
View file

@ -29,5 +29,11 @@ namespace Dalamud.Game.ClientState.Actors.Types {
/// The Free Company tag of this player.
/// </summary>
public string CompanyTag => Encoding.UTF8.GetString(this.actorStruct.CompanyTag).Substring(2).Replace("\0", "");
/// <summary>
/// Target of the PlayerCharacter
/// </summary>
public override int TargetActorID => this.actorStruct.PlayerCharacterTargetActorId;
}
}

3
Dalamud/Game/ClientState/Structs/Actor.cs
View file

@ -30,7 +30,8 @@ namespace Dalamud.Game.ClientState.Structs
[FieldOffset(0x17B8)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 28)] public byte[] Customize;
[FieldOffset(0x17F8)] public int TargetActorId;
[FieldOffset(0x1F0)] public int PlayerCharacterTargetActorId;
[FieldOffset(0x17F8)] public int BattleNpcTargetActorId;
// This field can't be correctly aligned, so we have to cut it manually.
[FieldOffset(0x17d0)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 7)]