diff --git a/campaign/Readme.md b/campaign/Readme.md index e8b9700b3..5c562a0dc 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -57,6 +57,7 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20251016 | war archives 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | 飓風與青春之泉 | | 20251106 | war archives 20220915 cn | Violet Tempest Blooming Lycoris | 紫绛槿岚 | Violet Tempest Blooming Lycoris | 赫の涙月 菫の暁風 | 紫絳槿嵐 | | 20251218 | war archives 20221222 cn | Parallel Superimposition | 定向折叠 | Parallel Superimposition | 積重なる事象の幻界 | 定向折疊 | +| 20260129 | war archives 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | 湮燼塵墟 | | 20200227 | event 20200227 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | - | | 20200312 | event 20200312 cn | The Solomon Ranger | 复刻斯图尔特的硝烟 | The Solomon Ranger Rerun | 南洋に靡く硝煙(復刻) | - | | 20200326 | event 20200326 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | - | @@ -277,3 +278,10 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260115 | event 20231221 cn | Light-Chasing Sea of Stars Rerun | 复刻星海逐光 | Light-Chasing Sea of Stars Rerun | 光追う星の海(復刻) | - | | 20260122 | coalition 20260122 | Light & Shadow Fashion Shoot! | 光影风尚-拍摄进行时 | Light & Shadow Fashion Shoot! | 特集写真-撮影進行中 | - | | 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 | +| 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 | +| 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐(復刻) | - | +| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 | +| 20260226 | event 20260226 cn | Springtide Inn Online | 春满客栈Online | Springtide Inn Online | 春色旅籠Online | 春滿客棧Online | +| 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 | ワンダラー募集計画 | - | diff --git a/campaign/event_20260326_cn/sp.py b/campaign/event_20260326_cn/sp.py new file mode 100644 index 000000000..5102d0ebf --- /dev/null +++ b/campaign/event_20260326_cn/sp.py @@ -0,0 +1,120 @@ +from module.campaign.campaign_base import CampaignBase +from module.map.map_base import CampaignMap +from module.map.map_grids import SelectedGrids, RoadGrids +from module.logger import logger + +MAP = CampaignMap('SP') +MAP.shape = 'G8' +MAP.camera_data = ['D2', 'D6'] +MAP.camera_data_spawn_point = ['D2'] +MAP.map_data = """ + ++ ++ MS -- MS ++ ++ + ++ ME -- MS -- ME ++ + ME -- -- -- -- -- ME + ME -- SP __ SP -- ME + ME -- -- -- -- -- ME + ++ ME ME -- ME ME ++ + -- ++ ++ -- ++ ++ -- + -- ++ ++ MB ++ ++ -- +""" +MAP.weight_data = """ + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 + 50 50 50 50 50 50 50 +""" +MAP.spawn_data = [ + {'battle': 0, 'enemy': 12, 'siren': 3}, + {'battle': 1}, + {'battle': 2}, + {'battle': 3}, + {'battle': 4}, + {'battle': 5}, + {'battle': 6}, + {'battle': 7, 'boss': 1}, +] +A1, B1, C1, D1, E1, F1, G1, \ +A2, B2, C2, D2, E2, F2, G2, \ +A3, B3, C3, D3, E3, F3, G3, \ +A4, B4, C4, D4, E4, F4, G4, \ +A5, B5, C5, D5, E5, F5, G5, \ +A6, B6, C6, D6, E6, F6, G6, \ +A7, B7, C7, D7, E7, F7, G7, \ +A8, B8, C8, D8, E8, F8, G8, \ + = MAP.flatten() + + +class Config: + # ===== Start of generated config ===== + MAP_SIREN_TEMPLATE = [] + MOVABLE_ENEMY_TURN = (2,) + MAP_HAS_SIREN = True + MAP_HAS_MOVABLE_ENEMY = True + MAP_HAS_MAP_STORY = False + MAP_HAS_FLEET_STEP = False + MAP_HAS_AMBUSH = False + MAP_HAS_MYSTERY = False + STAR_REQUIRE_1 = 0 + STAR_REQUIRE_2 = 0 + STAR_REQUIRE_3 = 0 + # ===== End of generated config ===== + + MAP_CHAPTER_SWITCH_20241219_SP = True + STAGE_ENTRANCE = ['half', '20240725'] + MAP_WALK_USE_CURRENT_FLEET = True + MAP_SIREN_HAS_BOSS_ICON_SMALL = True + INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (120, 255 - 33), + 'width': (1.5, 10), + 'prominence': 10, + 'distance': 35, + } + EDGE_LINES_FIND_PEAKS_PARAMETERS = { + 'height': (255 - 33, 255), + 'prominence': 10, + 'distance': 50, + 'wlen': 1000 + } + HOMO_EDGE_COLOR_RANGE = (0, 33) + HOMO_EDGE_HOUGHLINES_THRESHOLD = 210 + HOMO_STORAGE = ((7, 6), [(135.178, 83.137), (919.07, 83.137), (-16.807, 613.173), (1000.053, 613.173)]) + MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' + MAP_IS_ONE_TIME_STAGE = True + + MAP_SWIPE_MULTIPLY = (1.127, 1.148) + MAP_SWIPE_MULTIPLY_MINITOUCH = (1.090, 1.110) + MAP_SWIPE_MULTIPLY_MAATOUCH = (1.058, 1.077) + + +class Campaign(CampaignBase): + MAP = MAP + ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' + + def map_data_init(self, map_): + super().map_data_init(map_) + C1.is_siren = True + D2.is_siren = True + E1.is_siren = True + + def battle_0(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=2): + return True + + return self.battle_default() + + def battle_5(self): + if self.clear_siren(): + return True + if self.clear_filter_enemy(self.ENEMY_FILTER, preserve=0): + return True + + return self.battle_default() + + def battle_7(self): + return self.fleet_boss.clear_boss() diff --git a/config/template.json b/config/template.json index ae131b6a3..8dea0553b 100644 --- a/config/template.json +++ b/config/template.json @@ -1960,7 +1960,7 @@ }, "Campaign": { "Name": "D3", - "Event": "war_archives_20221222_cn", + "Event": "war_archives_20230223_cn", "Mode": "normal", "UseClearMode": true, "UseFleetLock": true, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 9a8962588..e79acdc0e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3870,10 +3870,15 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "display": "hide", "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -3906,7 +3911,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -3942,6 +3946,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -3974,7 +3981,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -4014,6 +4020,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -4046,7 +4055,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -4082,6 +4090,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -4122,7 +4132,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -7300,9 +7309,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -7335,7 +7349,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -7371,6 +7384,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -7403,7 +7419,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -7443,6 +7458,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -7475,7 +7493,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -7511,6 +7528,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -7551,7 +7570,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -8041,9 +8059,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8076,7 +8099,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8112,6 +8134,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8144,7 +8169,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8184,6 +8208,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8216,7 +8243,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8252,6 +8278,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -8292,7 +8320,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -8782,9 +8809,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8817,7 +8849,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8853,6 +8884,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8885,7 +8919,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8925,6 +8958,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -8957,7 +8993,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -8993,6 +9028,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -9033,7 +9070,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -9523,9 +9559,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -9558,7 +9599,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -9594,6 +9634,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -9626,7 +9669,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -9666,6 +9708,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -9698,7 +9743,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -9734,6 +9778,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -9774,7 +9820,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -10264,9 +10309,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -10299,7 +10349,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -10335,6 +10384,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -10367,7 +10419,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -10407,6 +10458,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -10439,7 +10493,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -10475,6 +10528,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -10515,7 +10570,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -11005,9 +11059,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -11040,7 +11099,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -11076,6 +11134,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -11108,7 +11169,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -11148,6 +11208,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -11180,7 +11243,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -11216,6 +11278,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -11256,7 +11320,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -11693,11 +11756,13 @@ "raid_20230629", "raid_20240130", "raid_20240328", - "raid_20250116" + "raid_20250116", + "raid_20260212" ], "option_cn": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -11708,8 +11773,9 @@ "raid_20200624" ], "option_en": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -11720,8 +11786,9 @@ "raid_20200624" ], "option_jp": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -11732,6 +11799,7 @@ "raid_20200624" ], "option_tw": [ + "raid_20260212", "raid_20250116", "raid_20240130", "raid_20240328", @@ -11984,6 +12052,7 @@ "coalition_20240627" ], "option_tw": [ + "coalition_20260122", "coalition_20251120", "coalition_20250626", "coalition_20240627", @@ -12314,9 +12383,11 @@ "war_archives_20220728_cn", "war_archives_20220915_cn", "war_archives_20221222_cn", + "war_archives_20230223_cn", "war_archives_20231026_cn" ], "option_cn": [ + "war_archives_20230223_cn", "war_archives_20221222_cn", "war_archives_20220915_cn", "war_archives_20231026_cn", @@ -12362,6 +12433,7 @@ "war_archives_20181020_en" ], "option_en": [ + "war_archives_20230223_cn", "war_archives_20221222_cn", "war_archives_20220915_cn", "war_archives_20231026_cn", @@ -12407,6 +12479,7 @@ "war_archives_20181020_en" ], "option_jp": [ + "war_archives_20230223_cn", "war_archives_20221222_cn", "war_archives_20220915_cn", "war_archives_20231026_cn", @@ -12452,6 +12525,7 @@ "war_archives_20181020_en" ], "option_tw": [ + "war_archives_20230223_cn", "war_archives_20221222_cn", "war_archives_20220915_cn", "war_archives_20231026_cn", @@ -12966,9 +13040,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13001,7 +13080,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13037,6 +13115,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13069,7 +13150,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13109,6 +13189,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13141,7 +13224,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13177,6 +13259,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -13217,7 +13301,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -13724,9 +13807,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13759,7 +13847,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13795,6 +13882,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13827,7 +13917,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13867,6 +13956,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -13899,7 +13991,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -13935,6 +14026,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -13975,7 +14068,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -14482,9 +14574,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -14517,7 +14614,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -14553,6 +14649,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -14585,7 +14684,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -14625,6 +14723,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -14657,7 +14758,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -14693,6 +14793,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -14733,7 +14835,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -15240,9 +15341,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -15275,7 +15381,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -15311,6 +15416,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -15343,7 +15451,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -15383,6 +15490,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -15415,7 +15525,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -15451,6 +15560,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -15491,7 +15602,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -15988,9 +16098,14 @@ "event_20250814_cn", "event_20250912_cn", "event_20251023_cn", - "event_20251218_cn" + "event_20251218_cn", + "event_20260226_cn", + "event_20260326_cn" ], "option_cn": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -16023,7 +16138,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -16059,6 +16173,9 @@ "event_20200227_cn" ], "option_en": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -16091,7 +16208,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -16131,6 +16247,9 @@ "event_20200227_cn" ], "option_jp": [ + "event_20260326_cn", + "event_20240229_cn", + "event_20260226_cn", "event_20231221_cn", "event_20251218_cn", "event_20230914_cn", @@ -16163,7 +16282,6 @@ "event_20240425_cn", "event_20220224_cn", "event_20220324_cn", - "event_20240229_cn", "event_20211229_cn", "event_20231123_cn", "event_20210916_cn", @@ -16199,6 +16317,8 @@ "event_20200227_cn" ], "option_tw": [ + "event_20220728_cn", + "event_20260226_cn", "event_20220526_cn", "event_20251218_cn", "event_20251023_cn", @@ -16239,7 +16359,6 @@ "event_20221222_cn", "event_20231123_cn", "event_20220210_cn", - "event_20220728_cn", "event_20201229_cn", "event_20220915_cn", "event_20220414_cn", @@ -16673,11 +16792,13 @@ "raid_20230629", "raid_20240130", "raid_20240328", - "raid_20250116" + "raid_20250116", + "raid_20260212" ], "option_cn": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -16688,8 +16809,9 @@ "raid_20200624" ], "option_en": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -16700,8 +16822,9 @@ "raid_20200624" ], "option_jp": [ - "raid_20250116", + "raid_20260212", "raid_20240328", + "raid_20250116", "raid_20240130", "raid_20230629", "raid_20230118", @@ -16712,6 +16835,7 @@ "raid_20200624" ], "option_tw": [ + "raid_20260212", "raid_20250116", "raid_20240130", "raid_20240328", @@ -16965,6 +17089,7 @@ "coalition_20240627" ], "option_tw": [ + "coalition_20260122", "coalition_20251120", "coalition_20250626", "coalition_20240627", diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 73dd1624d..5534154fc 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -1211,7 +1211,7 @@ "event_20231026_cn": "Tempesta and the Fountain of Youth", "event_20231123_cn": "The Ninja Scrolls: Azur Flash", "event_20231221_cn": "Light-Chasing Sea of Stars Rerun", - "event_20240229_cn": "Snowrealm Peregrination", + "event_20240229_cn": "Snowrealm Peregrination Rerun", "event_20240425_cn": "Heart-Linking Harmony", "event_20240521_cn": "Light of the Martyrium", "event_20240725_cn": "Interlude of Illusions", @@ -1229,6 +1229,8 @@ "event_20250912_cn": "A Dance for Amahara Above", "event_20251023_cn": "Tempesta and Islas de Libertád", "event_20251218_cn": "A Note Through the Firmament", + "event_20260226_cn": "Springtide Inn Online", + "event_20260326_cn": "The Vagabond’s Recruitment Plan", "raid_20200624": "Air Raid Drills with Essex Rerun", "raid_20210708": "Cross Wave rerun", "raid_20220127": "Mystery Investigation", @@ -1237,8 +1239,9 @@ "raid_20230118": "Winter Pathfinder", "raid_20230629": "Reflections of the Oasis", "raid_20240130": "Spring Festive Fiasco", - "raid_20240328": "From Zero to Hero", + "raid_20240328": "From Zero to Hero Rerun", "raid_20250116": "Spring Fashion Festa", + "raid_20260212": "Spring Auction Adventure", "war_archives_20180607_cn": "archives Ink Stained Steel Sakura", "war_archives_20180726_cn": "archives Iris of Light and Dark", "war_archives_20181020_en": "archives Strive Wish and Strategize", @@ -1281,6 +1284,7 @@ "war_archives_20220728_cn": "archives Aquilifers Ballade", "war_archives_20220915_cn": "archives Violet Tempest Blooming Lycoris", "war_archives_20221222_cn": "archives Parallel Superimposition", + "war_archives_20230223_cn": "archives Revelations of Dust", "war_archives_20231026_cn": "archives Tempesta and the Fountain of Youth" }, "Mode": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 88d639170..bdc5eb58d 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -1211,7 +1211,7 @@ "event_20231026_cn": "テンペスタと若返りの泉", "event_20231123_cn": "蒼閃忍法帖", "event_20231221_cn": "光追う星の海(復刻)", - "event_20240229_cn": "銀界遊廻", + "event_20240229_cn": "銀界遊廻(復刻)", "event_20240425_cn": "共鳴のパッション", "event_20240521_cn": "赫輝のマルティリウム", "event_20240725_cn": "夢幻の間奏曲", @@ -1229,6 +1229,8 @@ "event_20250912_cn": "アマハラに舞い奉れ", "event_20251023_cn": "テンペスタと自由群島", "event_20251218_cn": "天穹に響く音謡", + "event_20260226_cn": "春色旅籠Online", + "event_20260326_cn": "ワンダラー募集計画", "raid_20200624": "特別演習超空強襲波(復刻)", "raid_20210708": "交錯する新たな波 (復刻)", "raid_20220127": "秘密事件調査", @@ -1237,8 +1239,9 @@ "raid_20230118": "冬の案内人", "raid_20230629": "緑地伽話", "raid_20240130": "新春宴会狂騒曲", - "raid_20240328": "ゼロから頑張る魔王討伐", + "raid_20240328": "ゼロから頑張る魔王討伐(復刻)", "raid_20250116": "新春華裳協奏曲", + "raid_20260212": "新春玉逸品会", "war_archives_20180607_cn": "檔案 墨染まりし鋼の桜", "war_archives_20180726_cn": "檔案 光と影のアイリス", "war_archives_20181020_en": "檔案 努力希望と計画", @@ -1281,6 +1284,7 @@ "war_archives_20220728_cn": "檔案 鋼鷲の冒険譚", "war_archives_20220915_cn": "檔案 赫の涙月 菫の暁風", "war_archives_20221222_cn": "檔案 積重なる事象の幻界", + "war_archives_20230223_cn": "檔案 黙示の遺構", "war_archives_20231026_cn": "檔案 テンペスタと若返りの泉" }, "Mode": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index a2a131109..faa04681d 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -1211,7 +1211,7 @@ "event_20231026_cn": "飓风与青春之泉", "event_20231123_cn": "苍闪忍法帖", "event_20231221_cn": "复刻星海逐光", - "event_20240229_cn": "雪境迷踪", + "event_20240229_cn": "复刻雪境迷踪", "event_20240425_cn": "共鸣的PASSION", "event_20240521_cn": "绽放于辉光之城", "event_20240725_cn": "幻梦间奏曲", @@ -1229,6 +1229,8 @@ "event_20250912_cn": "起舞于天原之上", "event_20251023_cn": "飓风与自由群岛", "event_20251218_cn": "响彻于天穹之音", + "event_20260226_cn": "春满客栈Online", + "event_20260326_cn": "漫游者招募计划", "raid_20200624": "复刻特别演习埃塞克斯级", "raid_20210708": "复刻穿越彼方的水线", "raid_20220127": "演习神秘事件调查", @@ -1237,8 +1239,9 @@ "raid_20230118": "冬日的寻路人", "raid_20230629": "绿洲往事", "raid_20240130": "寰昌宇定家事忙", - "raid_20240328": "从零开始的魔王讨伐之旅", + "raid_20240328": "复刻从零开始的魔王讨伐之旅", "raid_20250116": "华裳巧展喜事长", + "raid_20260212": "春宴怀玉香满庭", "war_archives_20180607_cn": "档案 墨染的钢铁之花", "war_archives_20180726_cn": "档案 光与影的鸢尾之华", "war_archives_20181020_en": "档案 努力希望和计划", @@ -1281,6 +1284,7 @@ "war_archives_20220728_cn": "档案 雄鹰的叙事歌", "war_archives_20220915_cn": "档案 紫绛槿岚", "war_archives_20221222_cn": "档案 定向折叠", + "war_archives_20230223_cn": "档案 湮烬尘墟", "war_archives_20231026_cn": "档案 飓风与青春之泉" }, "Mode": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 65d8dcbd3..87f1ecead 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -1148,7 +1148,7 @@ "coalition_20240627": "歡迎來到童心學院", "coalition_20250626": "迷彩都市的尋蹤者", "coalition_20251120": "DATE A LANE", - "coalition_20260122": "Light & Shadow Fashion Shoot!", + "coalition_20260122": "光影風尚-拍攝進行時", "event_20200227_cn": "Northern Overture", "event_20200312_cn": "斯圖爾特的硝煙", "event_20200326_cn": "Microlayer Medley", @@ -1198,7 +1198,7 @@ "event_20220414_cn": "復刻-永夜幻光", "event_20220428_cn": "復刻虹彩的終幕曲", "event_20220526_cn": "泠誓光庭", - "event_20220728_cn": "雄鷹的敘事歌", + "event_20220728_cn": "復刻雄鷹的敘事歌", "event_20220818_cn": "遠匯點作戰", "event_20220915_cn": "紫絳槿嵐", "event_20221124_cn": "復刻鍊金術士與秘密遺跡群島", @@ -1229,6 +1229,8 @@ "event_20250912_cn": "起舞於天原之上", "event_20251023_cn": "颶風與自由群島", "event_20251218_cn": "響徹於天穹之音", + "event_20260226_cn": "春滿客棧Online", + "event_20260326_cn": "The Vagabond’s Recruitment Plan", "raid_20200624": "特別演習埃塞克斯級(復刻)", "raid_20210708": "復刻穿越彼方的水線", "raid_20220127": "演習神秘事件調查", @@ -1239,6 +1241,7 @@ "raid_20240130": "寰昌宇定家事忙", "raid_20240328": "從零開始的魔王討伐之旅", "raid_20250116": "華裳巧展喜事長", + "raid_20260212": "春宴懷玉香滿庭", "war_archives_20180607_cn": "檔案 墨染的鋼鐵之花", "war_archives_20180726_cn": "檔案 光與影的鳶尾之華", "war_archives_20181020_en": "檔案 努力希望和計劃", @@ -1281,6 +1284,7 @@ "war_archives_20220728_cn": "檔案 雄鷹的敘事歌", "war_archives_20220915_cn": "檔案 紫絳槿嵐", "war_archives_20221222_cn": "檔案 定向折疊", + "war_archives_20230223_cn": "檔案 湮燼塵墟", "war_archives_20231026_cn": "檔案 飓風與青春之泉" }, "Mode": {