Upd: add dd combination z20_or_z21

LmeSzinc · May 23, 2024 · d46d58e · d46d58e
1 parent d208861
commit d46d58e
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 14 deletions.
diff --git a/assets/cn/retire/TEMPLATE_Z20.png b/assets/cn/retire/TEMPLATE_Z20.png
diff --git a/assets/cn/retire/TEMPLATE_Z21.png b/assets/cn/retire/TEMPLATE_Z21.png
diff --git a/assets/en/retire/TEMPLATE_Z20.png b/assets/en/retire/TEMPLATE_Z20.png
diff --git a/assets/en/retire/TEMPLATE_Z21.png b/assets/en/retire/TEMPLATE_Z21.png
diff --git a/assets/jp/retire/TEMPLATE_Z20.png b/assets/jp/retire/TEMPLATE_Z20.png
diff --git a/assets/jp/retire/TEMPLATE_Z21.png b/assets/jp/retire/TEMPLATE_Z21.png
diff --git a/assets/tw/retire/TEMPLATE_Z20.png b/assets/tw/retire/TEMPLATE_Z20.png
diff --git a/assets/tw/retire/TEMPLATE_Z21.png b/assets/tw/retire/TEMPLATE_Z21.png
diff --git a/module/campaign/gems_farming.py b/module/campaign/gems_farming.py
@@ -11,7 +11,7 @@
     DOCK_CHECK,
     TEMPLATE_BOGUE, TEMPLATE_HERMES, TEMPLATE_LANGLEY, TEMPLATE_RANGER,
     TEMPLATE_CASSIN_1, TEMPLATE_CASSIN_2, TEMPLATE_DOWNES_1, TEMPLATE_DOWNES_2,
-    TEMPLATE_AULICK, TEMPLATE_FOOTE
+    TEMPLATE_AULICK, TEMPLATE_FOOTE, TEMPLATE_Z20, TEMPLATE_Z21
 )
 
 from module.retire.dock import Dock
@@ -306,6 +306,11 @@ def get_templates(common_dd):
                 TEMPLATE_CASSIN_1, TEMPLATE_CASSIN_2,
                 TEMPLATE_DOWNES_1, TEMPLATE_DOWNES_2
             ]
+        elif common_dd == 'z20_or_z21':
+            return [
+                TEMPLATE_Z20,
+                TEMPLATE_Z21
+            ]
         else:
             logger.error(f'Invalid CommonDD setting: {common_dd}')
             raise ScriptError(f'Invalid CommonDD setting: {common_dd}')
@@ -349,7 +354,7 @@ def vanguard_change_execute(self):
         self.ui_click(FLEET_ENTER,
                       appear_button=page_fleet.check_button, check_button=DOCK_CHECK, skip_first_screenshot=True)
         self.dock_filter_set(
-            index='dd', rarity='common', faction='eagle', extra='can_limit_break')
+            index='dd', rarity='common', faction=['eagle', 'iron'], extra='can_limit_break')
         self.dock_favourite_set(False)
 
         ship = self.get_common_rarity_dd()

diff --git a/module/config/argument/args.json b/module/config/argument/args.json
@@ -1619,7 +1619,8 @@
         "option": [
           "any",
           "aulick_or_foote",
-          "cassin_or_downes"
+          "cassin_or_downes",
+          "z20_or_z21"
         ]
       },
       "CommissionLimit": {

diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml
@@ -276,7 +276,7 @@ GemsFarming:
     option: [ disabled, ship, ship_equip ]
   CommonDD:
     value: any
-    option: [ any, aulick_or_foote , cassin_or_downes ]
+    option: [ any, aulick_or_foote , cassin_or_downes, z20_or_z21 ]
   CommissionLimit: true
 
 # ==================== Event ====================

diff --git a/module/config/config_generated.py b/module/config/config_generated.py
@@ -151,7 +151,7 @@ class GeneratedConfig:
     GemsFarming_ChangeFlagship = 'ship'  # ship, ship_equip
     GemsFarming_CommonCV = 'any'  # any, langley, bogue, ranger, hermes
     GemsFarming_ChangeVanguard = 'ship'  # disabled, ship, ship_equip
-    GemsFarming_CommonDD = 'any'  # any, aulick_or_foote, cassin_or_downes
+    GemsFarming_CommonDD = 'any'  # any, aulick_or_foote, cassin_or_downes, z20_or_z21
     GemsFarming_CommissionLimit = True
 
     # Group `EventGeneral`

diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json
@@ -1155,8 +1155,9 @@
       "name": "Flagship Common DD Preference",
       "help": "",
       "any": "any",
-      "aulick_or_foote": "aulick or foote",
-      "cassin_or_downes": "cassin or downes"
+      "aulick_or_foote": "Aulick or Foote",
+      "cassin_or_downes": "Cassin or Downes",
+      "z20_or_z21": "Z20 or Z21"
     },
     "CommissionLimit": {
       "name": "Prevent Too Many Urgent Commissions",

diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json
@@ -1154,9 +1154,10 @@
     "CommonDD": {
       "name": "GemsFarming.CommonDD.name",
       "help": "GemsFarming.CommonDD.help",
-      "any": "any",
-      "aulick_or_foote": "aulick or foote",
-      "cassin_or_downes": "cassin or downes"
+      "any": "GemsFarming.CommonDD.any",
+      "aulick_or_foote": "GemsFarming.CommonDD.aulick_or_foote",
+      "cassin_or_downes": "GemsFarming.CommonDD.cassin_or_downes",
+      "z20_or_z21": "GemsFarming.CommonDD.z20_or_z21"
     },
     "CommissionLimit": {
       "name": "GemsFarming.CommissionLimit.name",

diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json
@@ -1146,7 +1146,7 @@
     },
     "ChangeVanguard": {
       "name": "更换前排",
-      "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于10、等级100的白鹰白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。前排会更换全部5个装备。",
+      "help": "当前排红脸时更换前排，选择不更换则会强制红脸出击\n换前排通过找一艘心情不低于10、等级100的白鹰或铁血的白皮驱逐完成，所以尽量保证有足够多的驱逐。国服以外则为等级70的白鹰白船驱逐。\n\n换装备只会更换正在装备中的栏位，即使是白装也会更换。前排会更换全部5个装备。",
       "disabled": "不更换",
       "ship": "更换舰船",
       "ship_equip": "更换舰船 + 装备"
@@ -1156,7 +1156,8 @@
       "help": "",
       "any": "任意",
       "aulick_or_foote": "奥利克或富特",
-      "cassin_or_downes": "卡辛或唐斯"
+      "cassin_or_downes": "卡辛或唐斯",
+      "z20_or_z21": "Z20或Z21"
     },
     "CommissionLimit": {
       "name": "防止紧急委托数量过多",

diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json
@@ -1146,7 +1146,7 @@
     },
     "ChangeVanguard": {
       "name": "更換前排",
-      "help": "當前排紅臉時更換前排，選擇不更換則會強制紅臉出擊\n換前排通過找一艘心情不低於10、等級70的白鷹白船驅逐完成，所以盡量保證有足夠多的驅逐。國服則為等級100的白鷹白船驅逐。\n\n換裝備只會更換正在裝備中的欄位，即使是白裝也會更換。前排會更換全部5個裝備。",
+      "help": "當前排紅臉時更換前排，選擇不更換則會強制紅臉出擊\n換前排通過找一艘心情不低於10、等級70的白鷹或鐵血的白船驅逐完成，所以盡量保證有足夠多的驅逐。國服則為等級100的白鷹白船驅逐。\n\n換裝備只會更換正在裝備中的欄位，即使是白裝也會更換。前排會更換全部5個裝備。",
       "disabled": "不更换",
       "ship": "更換艦船",
       "ship_equip": "更換艦船 + 裝備"
@@ -1156,7 +1156,8 @@
       "help": "",
       "any": "任意",
       "aulick_or_foote": "奧利克或富特",
-      "cassin_or_downes": "卡辛或唐斯"
+      "cassin_or_downes": "卡辛或唐斯",
+      "z20_or_z21": "Z20或Z21"
     },
     "CommissionLimit": {
       "name": "防止緊急委託數量過多",

diff --git a/module/retire/assets.py b/module/retire/assets.py
@@ -61,3 +61,5 @@
 TEMPLATE_IN_EVENT_FLEET = Template(file={'cn': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'en': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'jp': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png', 'tw': './assets/cn/retire/TEMPLATE_IN_EVENT_FLEET.png'})
 TEMPLATE_LANGLEY = Template(file={'cn': './assets/cn/retire/TEMPLATE_LANGLEY.png', 'en': './assets/en/retire/TEMPLATE_LANGLEY.png', 'jp': './assets/jp/retire/TEMPLATE_LANGLEY.png', 'tw': './assets/tw/retire/TEMPLATE_LANGLEY.png'})
 TEMPLATE_RANGER = Template(file={'cn': './assets/cn/retire/TEMPLATE_RANGER.png', 'en': './assets/en/retire/TEMPLATE_RANGER.png', 'jp': './assets/jp/retire/TEMPLATE_RANGER.png', 'tw': './assets/tw/retire/TEMPLATE_RANGER.png'})
+TEMPLATE_Z20 = Template(file={'cn': './assets/cn/retire/TEMPLATE_Z20.png', 'en': './assets/en/retire/TEMPLATE_Z20.png', 'jp': './assets/jp/retire/TEMPLATE_Z20.png', 'tw': './assets/tw/retire/TEMPLATE_Z20.png'})
+TEMPLATE_Z21 = Template(file={'cn': './assets/cn/retire/TEMPLATE_Z21.png', 'en': './assets/en/retire/TEMPLATE_Z21.png', 'jp': './assets/jp/retire/TEMPLATE_Z21.png', 'tw': './assets/tw/retire/TEMPLATE_Z21.png'})