update 1.20.3

lmintlcx · Sep 3, 2022 · f2c6fe8 · f2c6fe8
1 parent 52e18a7
commit f2c6fe8
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 
 更新日志: (记录每一版的主要改动.)
 
+### [1.20.3] - 2022/09/03
+
+- Redesigned English UI.
+- 立即装填对大嘴花磁力菇有效.
+
 ### [1.20.2] - 2022/08/27
 
 - 修复了重复的隐藏小推车问题.

diff --git a/README.md b/README.md
@@ -11,13 +11,17 @@ PvZ Toolkit 是一个适用于植物大战僵尸一代电脑版的辅助工具.
 
 > For non-Chinese users, English tooltips will be displayed with mouse hovers.
 
+### English
+
+![PvZ Toolkit](https://github.com/lmintlcx/pvztoolkit/raw/master/img/pvztoolkit_en.gif)
+
 ## 下载链接
 
 PvZ Toolkit 官方网站: [https://pvz.lmintlcx.com/toolkit/](https://pvz.lmintlcx.com/toolkit/)
 
 ## 更新日志
 
-最新版本: 1.20.2 (2022-08-27)
+最新版本: 1.20.3 (2022-09-03)
 
 [点击查看 CHANGELOG.md](https://github.com/lmintlcx/pvztoolkit/blob/master/CHANGELOG.md)
 

diff --git a/build.bat b/build.bat
@@ -57,7 +57,7 @@ signtool.exe sign /v ^
 
 goto :end
 
-file="PvZ_Toolkit_v1.20.2.exe"
+file="PvZ_Toolkit_v1.20.3.exe"
 rm $file.hash
 echo $file >> $file.hash
 echo "MD5" >> $file.hash

diff --git a/img/pvztoolkit_en.gif b/img/pvztoolkit_en.gif
diff --git a/res/version.h b/res/version.h
@@ -4,7 +4,7 @@
 
 #define VERSION_MAJOR 1
 #define VERSION_MINOR 20
-#define VERSION_PATCH 2
+#define VERSION_PATCH 3
 #define VERSION_BUILD 65536
 
 #define VERSION_VER VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_BUILD

diff --git a/src/data.cpp b/src/data.cpp
@@ -154,6 +154,7 @@ Data::Data()
 
             {0x00452d23, {0x80}, {0x85}},                                 // reload_instantly
             {{0x004583c8, {0x80}, {0x85}}, {0x004528ff, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00458b09, {0x70}, {0x75}}, {0x00452e9c, {0x80}, {0x85}}}, // no_cooldown
             {0x00454dc2, {0xeb}, {0x75}},                                 // mushrooms_awake
             {0x0041fe2f, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x005132ee, {0x54}, {0x64}}, {0x00513259, {0x54}, {0x44}}}, // stop_zombies
@@ -354,6 +355,7 @@ Data::Data()
 
             {0x0045ceb3, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00462878, {0x80}, {0x85}}, {0x0045ca6f, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00462fde, {0x70}, {0x75}}, {0x0045d14c, {0x80}, {0x85}}}, // no_cooldown
             {0x0045f3ed, {0xeb}, {0x75}},                                 // mushrooms_awake
             {0x00421f1f, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x00520c64, {0x54}, {0x64}}, {0x00520c6d, {0x54}, {0x44}}}, // stop_zombies
@@ -554,6 +556,7 @@ Data::Data()
 
             {0x0046103b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x0045fe54, {0x80}, {0x85}}, {0x0045fba3, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00461565, {0x70}, {0x75}}, {0x00461e37, {0x80}, {0x85}}}, // no_cooldown
             {0x0045de8e, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x004265dc, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0052ab2b, {0x54}, {0x64}}, {0x0052ab34, {0x54}, {0x44}}}, // stop_zombies
@@ -754,6 +757,7 @@ Data::Data()
 
             {0x004611bb, {0x80}, {0x85}},                                 // reload_instantly
             {{0x0045ffd4, {0x80}, {0x85}}, {0x0045fd23, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x004616e5, {0x70}, {0x75}}, {0x00461fb7, {0x80}, {0x85}}}, // no_cooldown
             {0x0045df8e, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0042663c, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0052ae7b, {0x54}, {0x64}}, {0x0052ae84, {0x54}, {0x44}}}, // stop_zombies
@@ -954,6 +958,7 @@ Data::Data()
 
             {0x0046488b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x004636a4, {0x80}, {0x85}}, {0x004633f3, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00464db5, {0x70}, {0x75}}, {0x00465687, {0x80}, {0x85}}}, // no_cooldown
             {0x0046165e, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0042826c, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0052ef9b, {0x54}, {0x64}}, {0x0052efa4, {0x54}, {0x44}}}, // stop_zombies
@@ -1154,6 +1159,7 @@ Data::Data()
 
             {0x0046493b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00463754, {0x80}, {0x85}}, {0x004634a3, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00464e65, {0x70}, {0x75}}, {0x00465737, {0x80}, {0x85}}}, // no_cooldown
             {0x0046170e, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x004281bc, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0052f02b, {0x54}, {0x64}}, {0x0052f034, {0x54}, {0x44}}}, // stop_zombies
@@ -1354,6 +1360,7 @@ Data::Data()
 
             {0x00464b3b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00463944, {0x80}, {0x85}}, {0x00463693, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00465065, {0x70}, {0x75}}, {0x00465938, {0x80}, {0x85}}}, // no_cooldown
             {0x00461900, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x004283ac, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0052f5ab, {0x54}, {0x64}}, {0x0052f5b4, {0x54}, {0x44}}}, // stop_zombies
@@ -1554,6 +1561,7 @@ Data::Data()
 
             {0x00464a0b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00463824, {0x80}, {0x85}}, {0x00463573, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00464f25, {0x70}, {0x75}}, {0x00465817, {0x80}, {0x85}}}, // no_cooldown
             {0x004617c2, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x004290dc, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0053b433, {0x54}, {0x64}}, {0x0053b43c, {0x54}, {0x44}}}, // stop_zombies
@@ -1754,6 +1762,7 @@ Data::Data()
 
             {0x004673eb, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00466204, {0x80}, {0x85}}, {0x00465f53, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00467905, {0x70}, {0x75}}, {0x004681f7, {0x80}, {0x85}}}, // no_cooldown
             {0x004641a2, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0042a12c, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0053f533, {0x54}, {0x64}}, {0x0053f53c, {0x54}, {0x44}}}, // stop_zombies
@@ -1954,6 +1963,7 @@ Data::Data()
 
             {0x0046848b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x004672a4, {0x80}, {0x85}}, {0x00466ff3, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x004689a5, {0x70}, {0x75}}, {0x00469297, {0x80}, {0x85}}}, // no_cooldown
             {0x00465242, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0042b0dc, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0053f863, {0x54}, {0x64}}, {0x0053f86c, {0x54}, {0x44}}}, // stop_zombies
@@ -2154,6 +2164,7 @@ Data::Data()
 
             {0x0048517c, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00483ed3, {0x80}, {0x85}}, {0x00483bfb, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x004855f5, {0x70}, {0x75}}, {0x00485ec7, {0x80}, {0x85}}}, // no_cooldown
             {0x00481c44, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0043f17e, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x005604d7, {0x54}, {0x64}}, {0x005604e0, {0x54}, {0x44}}}, // stop_zombies
@@ -2354,6 +2365,7 @@ Data::Data()
 
             {0x00473a2c, {0x80}, {0x85}},                                 // reload_instantly
             {{0x00472783, {0x80}, {0x85}}, {0x004724ab, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00473ea5, {0x70}, {0x75}}, {0x00474777, {0x80}, {0x85}}}, // no_cooldown
             {0x004704f4, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0042dd5e, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x0054ec57, {0x54}, {0x64}}, {0x0054ec60, {0x54}, {0x44}}}, // stop_zombies
@@ -2554,6 +2566,7 @@ Data::Data()
 
             {0x0046f40b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x0046e224, {0x80}, {0x85}}, {0x0046df73, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x0046f925, {0x70}, {0x75}}, {0x00470217, {0x80}, {0x85}}}, // no_cooldown
             {0x0046c1c2, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x004318bc, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x00546823, {0x54}, {0x64}}, {0x0054682c, {0x54}, {0x44}}}, // stop_zombies
@@ -2754,6 +2767,7 @@ Data::Data()
 
             {0x0047025b, {0x80}, {0x85}},                                 // reload_instantly
             {{0x0046f074, {0x80}, {0x85}}, {0x0046edc3, {0x70}, {0x75}}}, // grow_up_quickly
+            {{0x00470775, {0x70}, {0x75}}, {0x00471067, {0x80}, {0x85}}}, // no_cooldown
             {0x0046d012, {0xeb}, {0x74}},                                 // mushrooms_awake
             {0x0043252c, {0xeb}, {0x74}},                                 // stop_spawning
             {{0x00547433, {0x54}, {0x64}}, {0x0054743c, {0x54}, {0x44}}}, // stop_zombies

diff --git a/src/data.h b/src/data.h
@@ -190,6 +190,7 @@ struct PVZ_DATA
 
     HACK<uint8_t, 1> reload_instantly;
     std::vector<HACK<uint8_t, 1>> grow_up_quickly;
+    std::vector<HACK<uint8_t, 1>> no_cooldown;
     HACK<uint8_t, 1> mushrooms_awake;
     HACK<uint8_t, 1> stop_spawning;
     std::vector<HACK<uint8_t, 1>> stop_zombies;

diff --git a/src/pvz.cpp b/src/pvz.cpp
@@ -1581,6 +1581,7 @@ void PvZ::ReloadInstantly(bool on)
 
     enable_hack(data().reload_instantly, on);
     enable_hack(data().grow_up_quickly, on);
+    enable_hack(data().no_cooldown, on);
 }
 
 void PvZ::MushroomsAwake(bool on)

diff --git a/src/window.cpp b/src/window.cpp
@@ -1908,7 +1908,7 @@ void Window::import_lineup_list_file(std::wstring file)
 
     if (err_lst.size() > 0)
     {
-        std::wstring title = file + L" " + L"阵型列表格式错误";
+        std::wstring title = file + L" " + L"阵型列表文件格式错误";
         std::wstring text;
         for (size_t i = 0; i < err_lst.size(); i++)
         {
@@ -2441,8 +2441,8 @@ void Window::cb_tooltips()
                         + " " + zombies[spawn_type[i]];
         check_zombie[i]->copy_tooltip(on ? z.c_str() : nullptr);
     }
-    choice_giga_weight->copy_tooltip(on ? "GigaGargantuar\'s weight in non-huge waves."
-                                        : "非旗帜波的红眼僵尸随机权重。");
+    choice_giga_weight->copy_tooltip(on ? "GigaGargantuar\'s weight in non-huge waves.\nOriginal: 1000 (non-huge waves), 6000 (huge waves)."
+                                        : "非旗帜波的红眼僵尸随机权重。\n原始值：普通波 1000，旗帜波 6000。");
     check_giga_limit->copy_tooltip(on ? "No GigaGargantuar in 11th ~ 19th waves."
                                       : "第 11 ~ 19 波不出红眼僵尸。");
     button_set_spawn->copy_tooltip(on ? "Right click to change spawning mode."