From 3de33785b9f30072b8ca2d0b61c1eacf3b5cb519 Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Sat, 11 Apr 2020 18:15:35 +1000 Subject: [PATCH 1/6] Update Chinese plugin name and button text --- Plugins/GameTitlebar/GameTitlebar.cs | 8 +++++++- Plugins/SeleCR/SeleCR.cs | 10 +++++++++- Plugins/WhatLog/WhatLog.cs | 10 ++++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/Plugins/GameTitlebar/GameTitlebar.cs b/Plugins/GameTitlebar/GameTitlebar.cs index f31dada..6bf588f 100644 --- a/Plugins/GameTitlebar/GameTitlebar.cs +++ b/Plugins/GameTitlebar/GameTitlebar.cs @@ -7,7 +7,14 @@ public class GameTitlebar : BotPlugin { +#if RB_CN + private const string OriginalTitle = @"最终幻想XIV"; + public override string Name => @"游戏标题自定义"; +#else private const string OriginalTitle = @"FINAL FANTASY XIV"; + public override string Name => @"Custom Game Titlebar"; +#endif + private const uint WM_SETTEXT = 0x000C; [DllImport("user32.dll", CharSet = CharSet.Auto)] @@ -15,7 +22,6 @@ public class GameTitlebar : BotPlugin public override string Author => @"Freiheit"; public override Version Version => new Version(0, 0, 0, 1); - public override string Name => @"Custom Game Titlebar"; private string _characterName = string.Empty; private uint _ticks; diff --git a/Plugins/SeleCR/SeleCR.cs b/Plugins/SeleCR/SeleCR.cs index 8cf8805..8cb7874 100644 --- a/Plugins/SeleCR/SeleCR.cs +++ b/Plugins/SeleCR/SeleCR.cs @@ -12,12 +12,20 @@ public class SeleCR : BotPlugin { #region Plugin Metadata + +#if RB_CN + public override string Name => "职业战斗模块选择"; + public override string ButtonText => "设置"; +#else + public override string Name => "SeleCR"; + public override string ButtonText => "Configure"; +#endif + public override string Author => "Freiheit"; public override Version Version => new Version(0, 0, 0, 1); public override string Name => "SeleCR"; public override string Description => "Automatically select a combat routine"; public override bool WantButton => true; - public override string ButtonText => "Configure"; #endregion private SettingsWindow _settingsWindow; diff --git a/Plugins/WhatLog/WhatLog.cs b/Plugins/WhatLog/WhatLog.cs index 06d263b..d902c53 100644 --- a/Plugins/WhatLog/WhatLog.cs +++ b/Plugins/WhatLog/WhatLog.cs @@ -6,10 +6,16 @@ public class WhatLog : BotPlugin { - public override string Author => @"Freiheit"; - public override Version Version => new Version(0, 0, 0, 1); +#if RB_CN + public override string Name => "啥，日志？"; + public override string ButtonText => "选择日志文件"; +#else public override string Name => "What Log?"; public override string ButtonText => "Select Log"; +#endif + + public override string Author => @"Freiheit"; + public override Version Version => new Version(0, 0, 0, 1); public override bool WantButton => true; public override void OnButtonPress() From 1caa809102dab78780c1e2df383e09df7ac40a9f Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Sat, 11 Apr 2020 18:17:18 +1000 Subject: [PATCH 2/6] Update SeleCR.cs --- Plugins/SeleCR/SeleCR.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Plugins/SeleCR/SeleCR.cs b/Plugins/SeleCR/SeleCR.cs index 8cb7874..b2bb330 100644 --- a/Plugins/SeleCR/SeleCR.cs +++ b/Plugins/SeleCR/SeleCR.cs @@ -23,7 +23,6 @@ public class SeleCR : BotPlugin public override string Author => "Freiheit"; public override Version Version => new Version(0, 0, 0, 1); - public override string Name => "SeleCR"; public override string Description => "Automatically select a combat routine"; public override bool WantButton => true; #endregion From 03d770e656af189116247184a0a9ec0b2f56c9e2 Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Mon, 20 Apr 2020 02:29:19 +1000 Subject: [PATCH 3/6] Update CN address --- Plugins/ZoomHack/ZoomHack.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Plugins/ZoomHack/ZoomHack.cs b/Plugins/ZoomHack/ZoomHack.cs index bc9981a..0e0f806 100644 --- a/Plugins/ZoomHack/ZoomHack.cs +++ b/Plugins/ZoomHack/ZoomHack.cs @@ -55,6 +55,10 @@ private bool LoadOffsetsFromWeb() var xPathNavigator = xPathDocument.CreateNavigator(); var structAddressStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/StructureAddress")?.Value; + +#if RB_CN + structAddressStr = "1BF9B20"; +#endif var zoomMaxStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/ZoomMax")?.Value; _structAddress = Convert.ToInt32(structAddressStr, 16); From c7f446edecb5b003c17e9d953e99196bdb5d0e0c Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Mon, 20 Apr 2020 02:39:45 +1000 Subject: [PATCH 4/6] Update ZoomHack.cs --- Plugins/ZoomHack/ZoomHack.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/ZoomHack/ZoomHack.cs b/Plugins/ZoomHack/ZoomHack.cs index 0e0f806..d936ae3 100644 --- a/Plugins/ZoomHack/ZoomHack.cs +++ b/Plugins/ZoomHack/ZoomHack.cs @@ -57,7 +57,9 @@ private bool LoadOffsetsFromWeb() var structAddressStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/StructureAddress")?.Value; #if RB_CN + Logger.Log(Name, $@"INT Address: {structAddressStr}", LogColor); structAddressStr = "1BF9B20"; + Logger.Log(Name, $@"Update CN Address: {structAddressStr}", LogColor); #endif var zoomMaxStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/ZoomMax")?.Value; From 6f79b0a6b7e1b1b18651da36a5a6fd6bba0b00f4 Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Mon, 20 Apr 2020 02:54:50 +1000 Subject: [PATCH 5/6] Update ZoomHack.cs --- Plugins/ZoomHack/ZoomHack.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Plugins/ZoomHack/ZoomHack.cs b/Plugins/ZoomHack/ZoomHack.cs index d936ae3..9c921e5 100644 --- a/Plugins/ZoomHack/ZoomHack.cs +++ b/Plugins/ZoomHack/ZoomHack.cs @@ -55,13 +55,17 @@ private bool LoadOffsetsFromWeb() var xPathNavigator = xPathDocument.CreateNavigator(); var structAddressStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/StructureAddress")?.Value; + var zoomMaxStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/ZoomMax")?.Value; #if RB_CN Logger.Log(Name, $@"INT Address: {structAddressStr}", LogColor); + Logger.Log(Name, $@"INT zoomMax: {zoomMaxStr}", LogColor); structAddressStr = "1BF9B20"; + zoomMaxStr = "120"; + Logger.Log(Name, $@"Update CN Address: {structAddressStr}", LogColor); + Logger.Log(Name, $@"Update CN zoomMax: {zoomMaxStr}", LogColor); #endif - var zoomMaxStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/ZoomMax")?.Value; _structAddress = Convert.ToInt32(structAddressStr, 16); if (_structAddress > 0) @@ -93,4 +97,4 @@ private void SetMaxZoom(float maxZoom = 20f) Logger.Log(Name, $@"No offsets available, {Name} will not work.", LogColor); } } -} \ No newline at end of file +} From 07e341bc220704a4c10248b580c450b4bc4836e1 Mon Sep 17 00:00:00 2001 From: Lycorisrda Date: Mon, 20 Apr 2020 03:05:01 +1000 Subject: [PATCH 6/6] Update ZoomHack.cs use xml data instead --- Plugins/ZoomHack/ZoomHack.cs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/Plugins/ZoomHack/ZoomHack.cs b/Plugins/ZoomHack/ZoomHack.cs index 9c921e5..ebf278c 100644 --- a/Plugins/ZoomHack/ZoomHack.cs +++ b/Plugins/ZoomHack/ZoomHack.cs @@ -24,7 +24,11 @@ public class ZoomHack : BotPlugin private readonly Color LogColor = Color.FromRgb(51, 204, 255); private const string ZoomHackOffsetUrl = +#if RB_CN + @"https://github.com/Lycorisrda/FFXIV-Zoom-Hack/raw/master/Offsets.xml"; +#else @"https://github.com/jayotterbein/FFXIV-Zoom-Hack/raw/master/Offsets.xml"; +#endif #region Overrides public override void OnInitialize() @@ -57,16 +61,6 @@ private bool LoadOffsetsFromWeb() var structAddressStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/StructureAddress")?.Value; var zoomMaxStr = xPathNavigator.SelectSingleNode(@"/Root/DX11/ZoomMax")?.Value; -#if RB_CN - Logger.Log(Name, $@"INT Address: {structAddressStr}", LogColor); - Logger.Log(Name, $@"INT zoomMax: {zoomMaxStr}", LogColor); - structAddressStr = "1BF9B20"; - zoomMaxStr = "120"; - - Logger.Log(Name, $@"Update CN Address: {structAddressStr}", LogColor); - Logger.Log(Name, $@"Update CN zoomMax: {zoomMaxStr}", LogColor); -#endif - _structAddress = Convert.ToInt32(structAddressStr, 16); if (_structAddress > 0) Logger.Log(Name, $@"Determined 0x{_structAddress:X} to be the StructAddress", LogColor);