From b077bf971930c51b05ddf7c6db91b5eab88167fe Mon Sep 17 00:00:00 2001 From: LA-DI-DA <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Fri, 29 Sep 2023 17:13:44 +0800 Subject: [PATCH] Add: change ship type for GemsFarming when set C or D map --- assets/cn/campaign/REMOVE_SHIP.png | Bin 0 -> 8027 bytes bin/Lua/ShipChanger.lua | 52 +++++++++++++ config/template.json | 6 ++ module/campaign/assets.py | 1 + module/campaign/gems_farming.py | 20 ++++- module/config/argument/args.json | 22 ++++++ module/config/argument/argument.yaml | 15 ++++ module/config/argument/default.yaml | 10 +++ module/config/argument/task.yaml | 1 + module/config/config_generated.py | 6 ++ module/config/i18n/en-US.json | 24 ++++++ module/config/i18n/ja-JP.json | 24 ++++++ module/config/i18n/zh-CN.json | 24 ++++++ module/config/i18n/zh-TW.json | 24 ++++++ module/gg_handler/change_ship.py | 107 +++++++++++++++++++++++++++ module/gg_handler/gg_u2.py | 11 +++ module/retire/assets.py | 2 +- 17 files changed, 345 insertions(+), 4 deletions(-) create mode 100644 assets/cn/campaign/REMOVE_SHIP.png create mode 100644 bin/Lua/ShipChanger.lua create mode 100644 module/gg_handler/change_ship.py diff --git a/assets/cn/campaign/REMOVE_SHIP.png b/assets/cn/campaign/REMOVE_SHIP.png new file mode 100644 index 0000000000000000000000000000000000000000..151fdf567f8d3f11b174cced9b0b4b88da782ced GIT binary patch literal 8027 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