Skip to content

Commit a2c178b

Browse files
sandtechnologysandtechnology
committed
cn 7.3 with cactbot 0.35.3.0, bump to 25.9.19.0
1 parent 6bb3d6f commit a2c178b

7 files changed

Lines changed: 32 additions & 31 deletions

File tree

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<Copyright>Copyright © RainbowMage 2015, Kuriyama hibiya 2016, ngld 2019, OverlayPlugin Team 2022</Copyright>
66
<RunCodeAnalysis>false</RunCodeAnalysis>
77
<EnableNETAnalyzers>true</EnableNETAnalyzers>
8-
<AssemblyVersion>25.8.15.0</AssemblyVersion>
9-
<FileVersion>25.8.15.0</FileVersion>
8+
<AssemblyVersion>25.9.19.0</AssemblyVersion>
9+
<FileVersion>25.9.19.0</FileVersion>
1010
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
1111
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
1212
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>

‎OverlayPlugin.Core/EventSources/CactbotEventSource.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ public override void Start()
218218
pc_locale_ = System.Globalization.CultureInfo.CurrentUICulture.Name;
219219
var repository = container.Resolve<FFXIVRepository>();
220220

221-
cactbot_version_ = new Version(0, 35, 0, 0);
221+
cactbot_version_ = new Version(0, 35, 3, 0);
222222
overlay_plugin_version_ = typeof(IOverlay).Assembly.GetName().Version;
223223
ffxiv_plugin_version_ = repository.GetPluginVersion();
224224
act_version_ = typeof(ActGlobals).Assembly.GetName().Version;
@@ -745,7 +745,7 @@ private JObject FetchUserFiles(JObject msg)
745745
result["language"] = language_;
746746

747747
//It's unknown for ffcafe, but leave stub here should be better incase some overlays using that
748-
result["cactbotVersion"] = "0.35.0.0";
748+
result["cactbotVersion"] = "0.35.3.0";
749749
result["overlayPluginVersion"] = overlay_plugin_version_.ToString();
750750
result["ffxivPluginVersion"] = ffxiv_plugin_version_.ToString();
751751
result["actVersion"] = act_version_.ToString();

‎OverlayPlugin.Core/GameRepoInfo.cs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ namespace RainbowMage.OverlayPlugin
88
{
99
public class GameRepoInfo
1010
{
11-
//CN 7.25
12-
public static readonly Version version = new Version(7, 2);
13-
public static readonly int ActorMoveOpcode = 0x031A;
14-
public static readonly int ActorSetPosOpcode = 0x0277;
15-
public static readonly int BattleTalk2Opcode = 0x00E9;
16-
public static readonly int CountdownOpcode = 0x027B;
17-
public static readonly int CountdownCancelOpcode = 0x03A7;
18-
public static readonly int CEDirectorOpcode = 0x014E;
19-
public static readonly int MapEffectOpcode = 0x0384;
20-
public static readonly int MapEffect4Opcode = 0x00E1;
21-
public static readonly int MapEffect8Opcode = 0x0315;
22-
public static readonly int MapEffect12Opcode = 0x0362;
23-
public static readonly int RSVDataOpcode = 0x0182;
24-
public static readonly int NpcYellOpcode = 0x029C;
11+
//CN 7.3
12+
public static readonly Version version = new Version(7, 3);
13+
public static readonly int ActorMoveOpcode = 0x012F;
14+
public static readonly int ActorSetPosOpcode = 0x015F;
15+
public static readonly int BattleTalk2Opcode = 0x026B;
16+
public static readonly int CountdownOpcode = 0x0388;
17+
public static readonly int CountdownCancelOpcode = 0x00EC;
18+
public static readonly int CEDirectorOpcode = 0x026D;
19+
public static readonly int MapEffectOpcode = 0x021E;
20+
public static readonly int MapEffect4Opcode = 0x020A;
21+
public static readonly int MapEffect8Opcode = 0x00CA;
22+
public static readonly int MapEffect12Opcode = 0x010D;
23+
public static readonly int RSVDataOpcode = 0x0224;
24+
public static readonly int NpcYellOpcode = 0x03D1;
2525
}
2626
}

‎OverlayPlugin.Core/MemoryProcessors/FFXIVProcessCn.cs‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace RainbowMage.OverlayPlugin.MemoryProcessors
88
{
99
public class FFXIVProcessCn : FFXIVProcess
1010
{
11-
// Last updated for FFXIV 7.2
11+
// Last updated for FFXIV 7.3
1212
// Per aers/FFXIVClientStructs, what we call EntityMemory is actually:
1313
// Client::Game::Character::Character (0x22E0)
1414
// Client::Game::Object::GameObject (0x190)
@@ -26,28 +26,28 @@ public unsafe struct EntityMemory
2626
[FieldOffset(0x30)]
2727
public fixed byte Name[nameBytes];
2828

29-
[FieldOffset(0x74)]
29+
[FieldOffset(0x78)]
3030
public uint id;
3131

32-
[FieldOffset(0x8C)]
32+
[FieldOffset(0x90)]
3333
public EntityType type;
3434

35-
[FieldOffset(0x92)]
35+
[FieldOffset(0x96)]
3636
public ushort distance;
3737

38-
[FieldOffset(0xA0)]
38+
[FieldOffset(0xB0)]
3939
public Single pos_x;
4040

41-
[FieldOffset(0xA4)]
41+
[FieldOffset(0xB4)]
4242
public Single pos_z;
4343

44-
[FieldOffset(0xA8)]
44+
[FieldOffset(0xB8)]
4545
public Single pos_y;
4646

47-
[FieldOffset(0xB0)]
47+
[FieldOffset(0xC0)]
4848
public Single rotation;
4949

50-
[FieldOffset(0x190)]
50+
[FieldOffset(0x1A0)]
5151
public CharacterDetails charDetails;
5252
}
5353

@@ -107,7 +107,8 @@ public FFXIVProcessCn(TinyIoCContainer container) : base(container) { }
107107
// In combat boolean.
108108
// This address is written to by "mov [rax+rcx],bl" and has three readers.
109109
// This reader is "cmp byte ptr [ffxiv_dx11.exe+????????],00 { (0),0 }"
110-
private static String kInCombatSignature = "803D??????????74??488B03488BCBFF50";
110+
// Updated in 7.3, signature was no longer unique, include the preceeding "jz LAB_?????????"
111+
private static String kInCombatSignature = "74??803D??????????74??488B03488BCBFF50";
111112
private static int kInCombatSignatureOffset = -15;
112113
private static bool kInCombatSignatureRIP = true;
113114
// Because this line is a cmp byte line, the signature is not at the end of the line.

‎OverlayPlugin.Core/NetworkProcessors/LineCountdown.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace RainbowMage.OverlayPlugin.NetworkProcessors
66
{
77
class LineCountdown : LineBaseCustom<
88
Server_MessageHeader_Global, LineCountdown.Countdown_v730,
9-
Server_MessageHeader_CN, LineCountdown.Countdown_v655,
9+
Server_MessageHeader_CN, LineCountdown.Countdown_v730,
1010
Server_MessageHeader_KR, LineCountdown.Countdown_v655>
1111
{
1212
[StructLayout(LayoutKind.Explicit, Size = structSize, Pack = 1)]

‎OverlayPlugin.Core/NetworkProcessors/LineCountdownCancel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace RainbowMage.OverlayPlugin.NetworkProcessors
66
{
77
class LineCountdownCancel : LineBaseCustom<
88
Server_MessageHeader_Global, LineCountdownCancel.CountdownCancel_v730,
9-
Server_MessageHeader_CN, LineCountdownCancel.CountdownCancel_v655,
9+
Server_MessageHeader_CN, LineCountdownCancel.CountdownCancel_v730,
1010
Server_MessageHeader_KR, LineCountdownCancel.CountdownCancel_v655>
1111
{
1212
[StructLayout(LayoutKind.Explicit, Size = structSize, Pack = 1)]

‎OverlayPlugin.Core/NetworkProcessors/LineRSV.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace RainbowMage.OverlayPlugin.NetworkProcessors
77
{
88
class LineRSV : LineBaseCustom<
99
Server_MessageHeader_Global, LineRSV.RSV_v70,
10-
Server_MessageHeader_CN, LineRSV.RSV_v62,
10+
Server_MessageHeader_CN, LineRSV.RSV_v70,
1111
Server_MessageHeader_KR, LineRSV.RSV_v62>
1212
{
1313
[StructLayout(LayoutKind.Explicit, Size = structSize, Pack = 1)]

0 commit comments

Comments
 (0)