ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 16:27:44 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update addresses and signatures for 5.1.

Browse source
This commit is contained in:
attick 2019-10-29 20:08:29 -04:00
parent 2828d096a7
commit 4ad5bee0c6
5 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud/Game/ClientState/ClientStateAddressResolver.cs
View file

@ -15,7 +15,7 @@ namespace Dalamud.Game.ClientState
protected override void Setup64Bit(SigScanner sig) { protected override void Setup64Bit(SigScanner sig) {
ActorTable = sig.Module.BaseAddress + 0x1B29B40; ActorTable = sig.Module.BaseAddress + 0x1B29B40;
LocalContentId = sig.Module.BaseAddress + 0x1B58B60; LocalContentId = sig.Module.BaseAddress + 0x1B58B60;
JobGaugeData = sig.Module.BaseAddress + 0x1B2D4C0; JobGaugeData = sig.Module.BaseAddress + 0x1BFD110;
} }
} }
} }

2
Dalamud/Game/ClientState/Structs/JobGauge/DRKGauge.cs
View file

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Dalamud.Game.ClientState.Structs.JobGauge { namespace Dalamud.Game.ClientState.Structs.JobGauge {
[StructLayout(LayoutKind.Explicit)] [StructLayout(LayoutKind.Explicit)]
public struct DRKGauge { public struct DRKGauge {
[FieldOffset(0)] public short Blood; [FieldOffset(0)] public byte Blood;
[FieldOffset(2)] public short DarksideTimeRemaining; [FieldOffset(2)] public short DarksideTimeRemaining;
[FieldOffset(4)] private byte DarkArtsState; [FieldOffset(4)] private byte DarkArtsState;
[FieldOffset(6)] public short ShadowTimeRemaining; [FieldOffset(6)] public short ShadowTimeRemaining;

15
Dalamud/Game/Internal/Gui/IconReplacer.cs
View file

@ -32,8 +32,8 @@ namespace Dalamud.Game.Internal.Gui {
this.Address.Setup(scanner); this.Address.Setup(scanner);
this.byteBase = scanner.Module.BaseAddress; this.byteBase = scanner.Module.BaseAddress;
this.comboTimer = byteBase + 0x1AE1B10; this.comboTimer = byteBase + 0x1BB5B50;
this.lastComboMove = byteBase + 0x1AE1B14; this.lastComboMove = byteBase + 0x1BB5B54;
Log.Verbose("===== H O T B A R S ====="); Log.Verbose("===== H O T B A R S =====");
Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable); Log.Verbose("IsIconReplaceable address {IsIconReplaceable}", Address.IsIconReplaceable);
@ -85,8 +85,9 @@ namespace Dalamud.Game.Internal.Gui {
} }
} }
// TODO: Update localCharacter without destroying the log with debug messages // TODO: this is currently broken
// As it stands, don't rely on localCharacter.level for anything. // As it stands, don't rely on localCharacter.level for anything.
/*
if (localCharacter == null) { if (localCharacter == null) {
try { try {
localCharacter = dalamud.ClientState.LocalPlayer; localCharacter = dalamud.ClientState.LocalPlayer;
@ -96,12 +97,14 @@ namespace Dalamud.Game.Internal.Gui {
return this.iconHook.Original(self, actionID); return this.iconHook.Original(self, actionID);
} }
} }
*/
// Don't clutter the spaghetti any worse than it already is. // Don't clutter the spaghetti any worse than it already is.
int lastMove = Marshal.ReadInt32(lastComboMove); int lastMove = Marshal.ReadInt32(lastComboMove);
float comboTime = (float)Marshal.ReadInt32(comboTimer); float comboTime = (float)Marshal.ReadInt32(comboTimer);
localCharacter = dalamud.ClientState.LocalPlayer; //localCharacter = dalamud.ClientState.LocalPlayer;
byte level = localCharacter.Level; //byte level = localCharacter.Level;
byte level = 80;
// DRAGOON // DRAGOON
// TODO: Jump/High Jump into Mirage Dive // TODO: Jump/High Jump into Mirage Dive
@ -848,7 +851,7 @@ namespace Dalamud.Game.Internal.Gui {
private unsafe delegate int* getArray(long* address); private unsafe delegate int* getArray(long* address);
private unsafe IntPtr FindBuffAddress() { private unsafe IntPtr FindBuffAddress() {
IntPtr randomAddress = byteBase + 0x1b2c970; IntPtr randomAddress = byteBase + 0x1c04be0;
IntPtr num = Marshal.ReadIntPtr(randomAddress); IntPtr num = Marshal.ReadIntPtr(randomAddress);
IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248); IntPtr step2 = (IntPtr)(Marshal.ReadInt64(num) + 0x248);
IntPtr step3 = Marshal.ReadIntPtr(step2); IntPtr step3 = Marshal.ReadIntPtr(step2);

4
Dalamud/Game/Internal/Gui/IconReplacerAddressResolver.cs
View file

@ -10,8 +10,8 @@ namespace Dalamud.Game.Internal.Gui {
public IntPtr IsIconReplaceable { get; private set; } public IntPtr IsIconReplaceable { get; private set; }
protected override void Setup64Bit(SigScanner sig) { protected override void Setup64Bit(SigScanner sig) {
this.GetIcon = sig.ScanText("81 fa d4 08 00 00 7f 4b 74 44 8d 42 eb 3d a3 00 00 00"); this.GetIcon = sig.ScanText("48 89 5c 24 08 48 89 6c 24 10 48 89 74 24 18 57 48 83 ec 30 8b da be dd 1c 00 00 bd d3 0d 00 00");
this.IsIconReplaceable = sig.ScanText("81 f9 d4 08 00 00 7f 33 0f 84 fa 01 00 00 83 c1 eb 81 f9 a3 00 00 00"); this.IsIconReplaceable = sig.ScanText("81 f9 2e 01 00 00 7f 39 81 f9 2d 01 00 00 0f 8d 11 02 00 00 83 c1 eb");
} }
} }
} }