From bdd4cdc1a6a300522090aee23ed041a49cbfc80c Mon Sep 17 00:00:00 2001
From: meli <57847713+ff-meli@users.noreply.github.com>
Date: Tue, 24 Dec 2019 14:41:10 -0800
Subject: [PATCH 1/3] Raise assembly versions to 4.4.0
---
Dalamud.Injector/Dalamud.Injector.csproj | 6 +++---
Dalamud/Dalamud.csproj | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Dalamud.Injector/Dalamud.Injector.csproj b/Dalamud.Injector/Dalamud.Injector.csproj
index c1313a741..36d311259 100644
--- a/Dalamud.Injector/Dalamud.Injector.csproj
+++ b/Dalamud.Injector/Dalamud.Injector.csproj
@@ -14,10 +14,10 @@
true
- 4.1.0.8
- 4.1.0.8
+ 4.4.0.0
+ 4.4.0.0
XIVLauncher addon injection
- 4.1.0.8
+ 4.4.0.0
diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj
index 871526d55..7d61e5c75 100644
--- a/Dalamud/Dalamud.csproj
+++ b/Dalamud/Dalamud.csproj
@@ -1,4 +1,4 @@
-
+
AnyCPU
net471
@@ -14,9 +14,9 @@
true
- 4.3.0.0
- 4.3.0.0
- 4.3.0.0
+ 4.4.0.0
+ 4.4.0.0
+ 4.4.0.0
From 593e35fa234564b80f799a5e766c7fadb0faee9b Mon Sep 17 00:00:00 2001
From: meli <57847713+ff-meli@users.noreply.github.com>
Date: Tue, 24 Dec 2019 14:41:28 -0800
Subject: [PATCH 2/3] Update actor table location to match nhaama updates for
5.18
---
Dalamud/Game/ClientState/ClientStateAddressResolver.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
index 04838b2c9..cd6d0e726 100644
--- a/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
+++ b/Dalamud/Game/ClientState/ClientStateAddressResolver.cs
@@ -13,7 +13,7 @@ namespace Dalamud.Game.ClientState
public IntPtr JobGaugeData { get; set; }
protected override void Setup64Bit(SigScanner sig) {
- ActorTable = sig.Module.BaseAddress + 0x1BFBA38;
+ ActorTable = sig.Module.BaseAddress + 0x1BFFD90;
LocalContentId = sig.Module.BaseAddress + 0x1C2E000;
JobGaugeData = sig.Module.BaseAddress + 0x1C00110;
}
From 383c607b35bb5c069ef4f3fdbfe20d1da1f642f7 Mon Sep 17 00:00:00 2001
From: meli <57847713+ff-meli@users.noreply.github.com>
Date: Tue, 24 Dec 2019 17:52:40 -0800
Subject: [PATCH 3/3] opcode updates for 5.18, courtesy of karashiiro
---
Dalamud/Game/Network/NetworkHandlers.cs | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/Dalamud/Game/Network/NetworkHandlers.cs b/Dalamud/Game/Network/NetworkHandlers.cs
index cf71e43c4..4613e03de 100644
--- a/Dalamud/Game/Network/NetworkHandlers.cs
+++ b/Dalamud/Game/Network/NetworkHandlers.cs
@@ -221,12 +221,12 @@ namespace Dalamud.Game.Network {
}
private enum ZoneOpCode {
- CfNotifyPop = 0x135,
- CfPreferredRole = 0x2a2,
- MarketTaxRates = 0x16a,
- MarketBoardItemRequestStart = 0x349,
- MarketBoardOfferings = 0x130,
- MarketBoardHistory = 0x1f7
+ CfNotifyPop = 0x1F8,
+ CfPreferredRole = 0x32A,
+ MarketTaxRates = 0x25E,
+ MarketBoardItemRequestStart = 0x328,
+ MarketBoardOfferings = 0x15F,
+ MarketBoardHistory = 0x113
}
private DalamudConfiguration.PreferredRole RoleKeyToPreferredRole(int key) => key switch