diff --git a/assets/cn/combat_ui/PAUSE_ElvenVine.png b/assets/cn/combat_ui/PAUSE_ElvenVine.png new file mode 100644 index 000000000..8bd0797ed Binary files /dev/null and b/assets/cn/combat_ui/PAUSE_ElvenVine.png differ diff --git a/campaign/Readme.md b/campaign/Readme.md index 90c3bee23..7ae6694f4 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -286,3 +286,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260312 | event 20240229 cn | Snowrealm Peregrination Rerun | 复刻雪境迷踪 | Snowrealm Peregrination Rerun | 銀界遊廻（復刻） | - | | 20260319 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 復刻雄鷹的敘事歌 | | 20260326 | event 20260326 cn | The Vagabond’s Recruitment Plan | 漫游者招募计划 | The Vagabond’s Recruitment Plan | ワンダラー募集計画 | - | +| 20260402 | event 20260326 cn | The Vagabond’s Recruitment Plan | - | - | - | 漫遊者招募計劃 | diff --git a/module/combat/combat.py b/module/combat/combat.py index 342aa9e71..c6f21836b 100644 --- a/module/combat/combat.py +++ b/module/combat/combat.py @@ -128,6 +128,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan return PAUSE_Ancient if PAUSE_SpringInn.match_template_color(self.device.image, offset=(10, 10)): return PAUSE_SpringInn + if PAUSE_ElvenVine.match_template_color(self.device.image, offset=(10, 10)): + return PAUSE_ElvenVine return False def handle_combat_quit(self, offset=(20, 20), interval=3): diff --git a/module/combat_ui/assets.py b/module/combat_ui/assets.py index e8de38bc1..79da853a0 100644 --- a/module/combat_ui/assets.py +++ b/module/combat_ui/assets.py @@ -10,6 +10,7 @@ PAUSE_Christmas = Button(area={'cn': (1234, 35, 1250, 56), 'en': (1234, 35, 1250 PAUSE_Cyber = Button(area={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, color={'cn': (40, 140, 157), 'en': (40, 140, 157), 'jp': (40, 140, 157), 'tw': (40, 140, 157)}, button={'cn': (1231, 32, 1253, 59), 'en': (1231, 32, 1253, 59), 'jp': (1231, 32, 1253, 59), 'tw': (1231, 32, 1253, 59)}, file={'cn': './assets/cn/combat_ui/PAUSE_Cyber.png', 'en': './assets/cn/combat_ui/PAUSE_Cyber.png', 'jp': './assets/cn/combat_ui/PAUSE_Cyber.png', 'tw': './assets/cn/combat_ui/PAUSE_Cyber.png'}) PAUSE_DOUBLE_CHECK = Button(area={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, color={'cn': (96, 104, 136), 'en': (83, 98, 118), 'jp': (97, 102, 120), 'tw': (96, 104, 136)}, button={'cn': (1226, 35, 1231, 60), 'en': (1226, 35, 1231, 61), 'jp': (1226, 35, 1230, 60), 'tw': (1226, 35, 1231, 60)}, file={'cn': './assets/cn/combat_ui/PAUSE_DOUBLE_CHECK.png', 'en': './assets/en/combat_ui/PAUSE_DOUBLE_CHECK.png', 'jp': './assets/jp/combat_ui/PAUSE_DOUBLE_CHECK.png', 'tw': './assets/tw/combat_ui/PAUSE_DOUBLE_CHECK.png'}) PAUSE_Devil = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (193, 98, 108), 'en': (193, 98, 108), 'jp': (193, 98, 108), 'tw': (193, 98, 108)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Devil.png', 'en': './assets/cn/combat_ui/PAUSE_Devil.png', 'jp': './assets/cn/combat_ui/PAUSE_Devil.png', 'tw': './assets/cn/combat_ui/PAUSE_Devil.png'}) +PAUSE_ElvenVine = Button(area={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, color={'cn': (152, 189, 166), 'en': (152, 189, 166), 'jp': (152, 189, 166), 'tw': (152, 189, 166)}, button={'cn': (1229, 32, 1253, 55), 'en': (1229, 32, 1253, 55), 'jp': (1229, 32, 1253, 55), 'tw': (1229, 32, 1253, 55)}, file={'cn': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'en': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'jp': './assets/cn/combat_ui/PAUSE_ElvenVine.png', 'tw': './assets/cn/combat_ui/PAUSE_ElvenVine.png'}) PAUSE_HolyLight = Button(area={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, color={'cn': (54, 40, 27), 'en': (54, 40, 27), 'jp': (54, 40, 27), 'tw': (54, 40, 27)}, button={'cn': (1233, 35, 1250, 57), 'en': (1233, 35, 1250, 57), 'jp': (1233, 35, 1250, 57), 'tw': (1233, 35, 1250, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'en': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'jp': './assets/cn/combat_ui/PAUSE_HolyLight.png', 'tw': './assets/cn/combat_ui/PAUSE_HolyLight.png'}) PAUSE_Iridescent_Fantasy = Button(area={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, color={'cn': (124, 139, 190), 'en': (124, 139, 190), 'jp': (124, 139, 190), 'tw': (124, 139, 190)}, button={'cn': (1232, 33, 1252, 57), 'en': (1232, 33, 1252, 57), 'jp': (1232, 33, 1252, 57), 'tw': (1232, 33, 1252, 57)}, file={'cn': './assets/cn/combat_ui/PAUSE_Iridescent_Fantasy.png', 'en': './assets/en/combat_ui/PAUSE_Iridescent_Fantasy.png', 'jp': './assets/jp/combat_ui/PAUSE_Iridescent_Fantasy.png', 'tw': './assets/tw/combat_ui/PAUSE_Iridescent_Fantasy.png'}) PAUSE_MaidCafe = Button(area={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, color={'cn': (159, 145, 139), 'en': (159, 145, 139), 'jp': (159, 145, 139), 'tw': (159, 145, 139)}, button={'cn': (1230, 35, 1248, 54), 'en': (1230, 35, 1248, 54), 'jp': (1230, 35, 1248, 54), 'tw': (1230, 35, 1248, 54)}, file={'cn': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'en': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'jp': './assets/cn/combat_ui/PAUSE_MaidCafe.png', 'tw': './assets/cn/combat_ui/PAUSE_MaidCafe.png'}) diff --git a/module/config/argument/args.json b/module/config/argument/args.json index cc2e2a37f..46fbe3e2c 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -1967,7 +1967,6 @@ "type": "select", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "display": "hide", @@ -1981,10 +1980,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -2388,7 +2386,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -2401,10 +2398,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -2802,7 +2798,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -2815,10 +2810,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -4609,7 +4603,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -4622,10 +4615,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -5041,7 +5033,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -5054,10 +5045,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -5473,7 +5463,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -5486,10 +5475,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -5905,7 +5893,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -5918,10 +5905,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, @@ -6327,7 +6313,6 @@ "type": "state", "value": "campaign_main", "option": [ - "event_20220728_cn", "event_20260326_cn" ], "option_cn": [ @@ -6340,10 +6325,9 @@ "event_20260326_cn" ], "option_tw": [ - "event_20220728_cn" + "event_20260326_cn" ], "option_bold": [ - "event_20220728_cn", "event_20260326_cn" ] }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 8e567535d..d3dbf5835 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -798,7 +798,7 @@ "event_20251023_cn": "颶風與自由群島", "event_20251218_cn": "響徹於天穹之音", "event_20260226_cn": "春滿客棧Online", - "event_20260326_cn": "The Vagabond’s Recruitment Plan", + "event_20260326_cn": "漫遊者招募計劃", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", diff --git a/module/exercise/hp_daemon.py b/module/exercise/hp_daemon.py index 0170498b4..3320d1fa4 100644 --- a/module/exercise/hp_daemon.py +++ b/module/exercise/hp_daemon.py @@ -78,6 +78,7 @@ class HpDaemon(ModuleBase): PAUSE_MaidCafe, PAUSE_Ancient, PAUSE_SpringInn, + PAUSE_ElvenVine, ]: self.attacker_hp = self._calculate_hp(image, area=ATTACKER_HP_AREA_New.area, reverse=True) self.defender_hp = self._calculate_hp(image, area=DEFENDER_HP_AREA_New.area, reverse=True)