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

feat: make actor table log nicer

Browse source
This commit is contained in:
goat 2020-04-21 02:30:28 +02:00
parent 69859fa2dc
commit dd3fd27f4d
7 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Dalamud/Game/ClientState/Actors/ActorTable.cs
View file

@ -109,9 +109,9 @@ namespace Dalamud.Game.ClientState.Actors {
switch (actorStruct.ObjectKind) switch (actorStruct.ObjectKind)
{ {
case ObjectKind.Player: return new PlayerCharacter(actorStruct, this.dalamud); case ObjectKind.Player: return new PlayerCharacter(offset, actorStruct, this.dalamud);
case ObjectKind.BattleNpc: return new BattleNpc(actorStruct, this.dalamud); case ObjectKind.BattleNpc: return new BattleNpc(offset, actorStruct, this.dalamud);
default: return new Actor(actorStruct, this.dalamud); default: return new Actor(offset, actorStruct, this.dalamud);
} }
} }
} }

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

@ -1,3 +1,5 @@
using System;
namespace Dalamud.Game.ClientState.Actors.Types { namespace Dalamud.Game.ClientState.Actors.Types {
/// <summary> /// <summary>
/// This class represents a basic FFXIV actor. /// This class represents a basic FFXIV actor.
@ -10,14 +12,21 @@ namespace Dalamud.Game.ClientState.Actors.Types {
protected Dalamud dalamud; protected Dalamud dalamud;
/// <summary>
/// The address of this actor in memory.
/// </summary>
public readonly IntPtr Address;
/// <summary> /// <summary>
/// Initialize a representation of a basic FFXIV actor. /// Initialize a representation of a basic FFXIV actor.
/// </summary> /// </summary>
/// <param name="actorStruct">The memory representation of the base actor.</param> /// <param name="actorStruct">The memory representation of the base actor.</param>
/// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param> /// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param>
public Actor(Structs.Actor actorStruct, Dalamud dalamud) { /// <param name="address">The address of this actor in memory.</param>
public Actor(IntPtr address, Structs.Actor actorStruct, Dalamud dalamud) {
this.actorStruct = actorStruct; this.actorStruct = actorStruct;
this.dalamud = dalamud; this.dalamud = dalamud;
this.Address = address;
} }
/// <summary> /// <summary>

4
Dalamud/Game/ClientState/Actors/Types/Chara.cs
View file

@ -1,3 +1,4 @@
using System;
using Dalamud.Game.ClientState.Actors.Resolvers; using Dalamud.Game.ClientState.Actors.Resolvers;
namespace Dalamud.Game.ClientState.Actors.Types { namespace Dalamud.Game.ClientState.Actors.Types {
@ -10,7 +11,8 @@ namespace Dalamud.Game.ClientState.Actors.Types {
/// </summary> /// </summary>
/// <param name="actorStruct">The memory representation of the base actor.</param> /// <param name="actorStruct">The memory representation of the base actor.</param>
/// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param> /// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param>
protected Chara(Structs.Actor actorStruct, Dalamud dalamud) : base(actorStruct, dalamud) { } /// <param name="address">The address of this actor in memory.</param>
protected Chara(IntPtr address, Structs.Actor actorStruct, Dalamud dalamud) : base(address, actorStruct, dalamud) { }
/// <summary> /// <summary>
/// The level of this Chara. /// The level of this Chara.

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

@ -1,3 +1,5 @@
using System;
namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer { namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer {
/// <summary> /// <summary>
/// This class represents a battle NPC. /// This class represents a battle NPC.
@ -8,7 +10,8 @@ namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer {
/// </summary> /// </summary>
/// <param name="actorStruct">The memory representation of the base actor.</param> /// <param name="actorStruct">The memory representation of the base actor.</param>
/// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param> /// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param>
public BattleNpc(Structs.Actor actorStruct, Dalamud dalamud) : base(actorStruct, dalamud) { } /// <param name="address">The address of this actor in memory.</param>
public BattleNpc(IntPtr address, Structs.Actor actorStruct, Dalamud dalamud) : base(address, actorStruct, dalamud) { }
/// <summary> /// <summary>
/// The BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc. /// The BattleNpc <see cref="BattleNpcSubKind" /> of this BattleNpc.

5
Dalamud/Game/ClientState/Actors/Types/NonPlayer/Npc.cs
View file

@ -1,3 +1,5 @@
using System;
namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer { namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer {
/// <summary> /// <summary>
/// This class represents a NPC. /// This class represents a NPC.
@ -8,7 +10,8 @@ namespace Dalamud.Game.ClientState.Actors.Types.NonPlayer {
/// </summary> /// </summary>
/// <param name="actorStruct">The memory representation of the base actor.</param> /// <param name="actorStruct">The memory representation of the base actor.</param>
/// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param> /// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param>
protected Npc(Structs.Actor actorStruct, Dalamud dalamud) : base(actorStruct, dalamud) { } /// <param name="address">The address of this actor in memory.</param>
protected Npc(IntPtr address, Structs.Actor actorStruct, Dalamud dalamud) : base(address, actorStruct, dalamud) { }
/// <summary> /// <summary>
/// The data ID of the NPC linking to their respective game data. /// The data ID of the NPC linking to their respective game data.

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

@ -1,3 +1,4 @@
using System;
using Dalamud.Game.ClientState.Actors.Resolvers; using Dalamud.Game.ClientState.Actors.Resolvers;
using SharpDX.Text; using SharpDX.Text;
@ -11,7 +12,8 @@ namespace Dalamud.Game.ClientState.Actors.Types {
/// </summary> /// </summary>
/// <param name="actorStruct">The memory representation of the base actor.</param> /// <param name="actorStruct">The memory representation of the base actor.</param>
/// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param> /// <param name="dalamud">A dalamud reference needed to access game data in Resolvers.</param>
public PlayerCharacter(Structs.Actor actorStruct, Dalamud dalamud) : base(actorStruct, dalamud) { } /// <param name="address">The address of this actor in memory.</param>
public PlayerCharacter(IntPtr address, Structs.Actor actorStruct, Dalamud dalamud) : base(address, actorStruct, dalamud) { }
/// <summary> /// <summary>
/// The current <see cref="World">world</see> of the character. /// The current <see cref="World">world</see> of the character.

4
Dalamud/Interface/DalamudDataWindow.cs
View file

@ -81,13 +81,13 @@ namespace Dalamud.Interface
stateString += $"HomeWorldName: {this.dalamud.ClientState.LocalPlayer.HomeWorld.GameData.Name}\n"; stateString += $"HomeWorldName: {this.dalamud.ClientState.LocalPlayer.HomeWorld.GameData.Name}\n";
stateString += $"LocalCID: {this.dalamud.ClientState.LocalContentId:X}\n"; stateString += $"LocalCID: {this.dalamud.ClientState.LocalContentId:X}\n";
stateString += $"LastLinkedItem: {this.dalamud.Framework.Gui.Chat.LastLinkedItemId.ToString()}\n"; stateString += $"LastLinkedItem: {this.dalamud.Framework.Gui.Chat.LastLinkedItemId.ToString()}\n";
stateString += $"TerritoryType: {this.dalamud.ClientState.TerritoryType}\n"; stateString += $"TerritoryType: {this.dalamud.ClientState.TerritoryType}\n\n";
for (var i = 0; i < this.dalamud.ClientState.Actors.Length; i++) { for (var i = 0; i < this.dalamud.ClientState.Actors.Length; i++) {
var actor = this.dalamud.ClientState.Actors[i]; var actor = this.dalamud.ClientState.Actors[i];
stateString += stateString +=
$" -> {actor.ActorId:X}[{i}] - {actor.ObjectKind} - {actor.Name} - {actor.Position.X} {actor.Position.Y} {actor.Position.Z}\n"; $"{actor.Address.ToInt64():X}:{actor.ActorId:X}[{i}] - {actor.ObjectKind} - {actor.Name} - {actor.Position.X} {actor.Position.Y} {actor.Position.Z}\n";
if (actor is Npc npc) if (actor is Npc npc)
stateString += $" DataId: {npc.DataId} NameId:{npc.NameId}\n"; stateString += $" DataId: {npc.DataId} NameId:{npc.NameId}\n";