diff --git a/campaign/Readme.md b/campaign/Readme.md index 21a734c55..84bc76355 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -22,28 +22,33 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20180119 | war archives 20191010 en | Encircling Graf Spee | 围剿斯佩伯爵 | Encircling Graf Spee | アドミラル・グラーフ・シュペー追撃戦 | 圍剿斯佩伯爵 | | 20180226 | war archives 20190221 en | Winter\'s Crown | 凛冬王冠 | Winter\'s Crown | 凛冽なりし冬の王冠 | 凜冬王冠 | | 20180607 | war archives 20180607 cn | Ink Stained Steel Sakura | 墨染的钢铁之花 | Ink Stained Steel Sakura | 墨染まりし鋼の桜 | 墨染的鋼鐵之花 | -| 20180717 | war archives 20190314 en | Prelude under the Moon | 月光下的序曲 | Prelude under the Moon | 月夜の開幕曲 | 月光下的序曲 | +| 20180717 | war archives 20190314 en | Prelude under the Moon | 月光下的序曲 | Prelude under the Moon | 月夜の開幕曲 | 月光下的序曲 | | 20180726 | war archives 20180726 cn | Iris of Light and Dark | 光与影的鸢尾之华 | Iris of Light and Dark | 光と影のアイリス | 光與影的鳶尾之華 | | 20200312 | war archives 20200312 cn | The Solomon Ranger | 斯图尔特的硝烟 | The Solomon Ranger | 南洋に靡く硝煙 | 斯圖爾特的硝煙 | | 20210121 | war archives 20181227 cn | Crimson Echoes | 苍红的回响 | Crimson Echoes | 縹映る深緋の残響 | 蒼紅的迴響 | -| 20210513 | war archives 20200820 cn | Scherzo of Iron and Blood | 铁血音符誓言 | Scherzo of Iron and Blood | 黒鉄の楽章 誓いの海 | 鐵血音符誓言 | -| 20211014 | war archives 20211014 cn | Crescendo of Polaris | 激奏的Polaris | Crescendo of Polaris | 激奏のポラリス | 激奏的Polaris | -| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | 神聖的悲喜劇 | -| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | 箱庭療法 | -| 20220721 | war archives 20210624 cn | Swirling Cherry Blossoms | 浮樱影华 | Swirling Cherry Blossoms | 翳りし満ちる影の華 | 浮櫻影華 | -| 20220901 | war archives 20200806 cn | The Enigma and the Shark | 最重要的宝物 | The Enigma and the Shark | 鉄血鮫とエニグマ | 最重要的寶物 | -| 20221013 | war archives 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | 激唱的UNIVERSE | -| 20221117 | war archives 20200903 cn | Stars of the Shimmering Fjord | 峡湾间的星辰 | Stars of the Shimmering Fjord | 輝ける峡湾の星 | 峽灣間的星辰 | -| 20221117 | war archives 20210819 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | 微層混合 | +| 20210513 | war archives 20200820 cn | Scherzo of Iron and Blood | 铁血音符誓言 | Scherzo of Iron and Blood | 黒鉄の楽章 誓いの海 | 鐵血音符誓言 | +| 20211014 | war archives 20211014 cn | Crescendo of Polaris | 激奏的Polaris | Crescendo of Polaris | 激奏のポラリス | 激奏的Polaris | +| 20220113 | war archives 20190911 cn | Empyreal Tragicomedy | 神圣的悲喜剧 | Empyreal Tragicomedy | 悲歎せし焔海の詩 | 神聖的悲喜劇 | +| 20220407 | war archives 20210325 cn | Ashen Simulacrum | 箱庭疗法 | Ashen Simulacrum | 開かれし紺碧の砂箱 | 箱庭療法 | +| 20220721 | war archives 20210624 cn | Swirling Cherry Blossoms | 浮樱影华 | Swirling Cherry Blossoms | 翳りし満ちる影の華 | 浮櫻影華 | +| 20220901 | war archives 20200806 cn | The Enigma and the Shark | 最重要的宝物 | The Enigma and the Shark | 鉄血鮫とエニグマ | 最重要的寶物 | +| 20221013 | war archives 20201029 cn | Universe in Unison | 激唱的UNIVERSE | Universe in Unison | 激唱のユニバース | 激唱的UNIVERSE | +| 20221117 | war archives 20200903 cn | Stars of the Shimmering Fjord | 峡湾间的星辰 | Stars of the Shimmering Fjord | 輝ける峡湾の星 | 峽灣間的星辰 | +| 20221117 | war archives 20210819 cn | Microlayer Medley | 微层混合 | Microlayer Medley | 闇靄払う銀翼 | 微層混合 | | 20211028 | war archives 20211028 cn | Skybound Oratorio | 穹顶下的圣咏曲 | Skybound Oratorio | 神穹を衝く聖歌 | 穹頂下的聖詠曲 | -| 20230309 | war archives 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | 夜幕下的歸途 | -| 20230420 | war archives 20220210 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | 北境序曲 | -| 20230511 | war archives 20220414 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | 永夜幻光 | -| 20230713 | war archives 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | Counterattack Within the Fjord | 峡湾間の反撃 | 峽灣間的反擊 | -| 20230831 | war archives 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | 負象限作戰 | -| 20240118 | war archives 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | 蝶海夢花 | -| 20240118 | war archives 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | 鏡位螺旋 | -| 20240222 | war archives 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | 破曉冰華 | +| 20230309 | war archives 20200507 cn | The Way Home in the Night | 夜幕下的归途 | The Way Home in the Night | 帰路は海色の陰りへと | 夜幕下的歸途 | +| 20230420 | war archives 20220210 cn | Northern Overture | 北境序曲 | Northern Overture | 凍絶の北海 | 北境序曲 | +| 20230511 | war archives 20220414 cn | Aurora Noctis | 永夜幻光 | Aurora Noctis | 極夜照らす幻光 | 永夜幻光 | +| 20230713 | war archives 20200603 cn | Counterattack Within the Fjord | 峡湾间的反击 | Counterattack Within the Fjord | 峡湾間の反撃 | 峽灣間的反擊 | +| 20230831 | war archives 20201229 cn | Inverted Orthant | 负象限作战 | Inverted Orthant | 虚畳なりし限象 | 負象限作戰 | +| 20240118 | war archives 20200917 cn | Dreamwaker's Butterfly | 蝶海梦花 | Dreamwaker's Butterfly | 刹那觀る胡蝶の夢 | 蝶海夢花 | +| 20240118 | war archives 20210527 cn | Mirror Involution | 镜位螺旋 | Mirror Involution | 照らす螺旋の鏡海 | 鏡位螺旋 | +| 20240222 | war archives 20210225 cn | Khorovod of Dawn's Rime | 破晓冰华 | Khorovod of Dawn's Rime | 暁射す氷華の嵐 | 破曉冰華 | +| 20240321 | war archives 20201012 cn | Sundered Blue | 划破海空之翼 | Sundered Blue | 奔る彩帆の青 | 劃破海空之翼 | +| 20240613 | war archives 20211111 cn | The Flame-Touched Dagger | 杰诺瓦的焰火 | The Flame-Touched Dagger | 燈火のシニエ | 杰諾瓦的焰火 | +| 20240718 | war archives 20210916 cn | Upon the Shimmering Blue | 碧海光粼 | Upon the Shimmering Blue | 駆けよ 碧海の吹き風 | 碧海光粼 | +| 20240829 | war archives 20210422 cn | Daedalian Hymn | 复兴的赞美诗 | Daedalian Hymn | 讃える復興の迷路 | 復興的讚美詩 | +| 20241017 | war archives 20211229 cn | Tower of Transcendence | 逆转彩虹之塔 | Tower of Transcendence | 遡望せし虹彩の塔 | 逆轉彩虹之塔 | | 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 | 闇靄払う銀翼 | - | @@ -143,70 +148,70 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20230118 | raid 20220127 | - | - | - | - | 演習神秘事件調查 | | 20230202 | event 20200806 cn | The Enigma and the Shark | - | - | - | 復刻最重要的寶物 | | 20230216 | event 20220224 cn | Abyssal Refrain | - | - | - | 深度回音 | -| 20230223 | event 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | - | +| 20230223 | event 20230223 cn | Revelations of Dust | 湮烬尘墟 | Revelations of Dust | 黙示の遺構 | - | | 20230309 | event 20210624 cn | Swirling Cherry Blossoms | - | - | - | 復刻-浮櫻影華 | -| 20230309 | event 20210422 cn | Daedalian Hymn | 复刻复兴的赞美诗 | Daedalian Hymn Rerun | 讃える復興の迷路（復刻） | - | +| 20230309 | event 20210422 cn | Daedalian Hymn | 复刻复兴的赞美诗 | Daedalian Hymn Rerun | 讃える復興の迷路（復刻） | - | | 20230323 | raid 20220630 | Angel of Iris | - | - | - | 來自鳶尾的天使 | -| 20230323 | coalition 20230323 | Frostfall | 极地风暴 | Frostfall | 星霜海嵐 | - | -| 20230413 | event 20211111 cn | The Flame-Touched Dagger | 复刻杰诺瓦的焰火 | The Flame-Touched Dagger Rerun | 復刻-燈火のシニエ | - | +| 20230323 | coalition 20230323 | Frostfall | 极地风暴 | Frostfall | 星霜海嵐 | - | +| 20230413 | event 20211111 cn | The Flame-Touched Dagger | 复刻杰诺瓦的焰火 | The Flame-Touched Dagger Rerun | 復刻-燈火のシニエ | - | | 20230413 | event 20210819 cn | Microlayer Medley | - | - | - | 復刻-微層混合 | -| 20230427 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | 假日航線 | +| 20230427 | event 20201126 cn | Vacation Lane | 假日航线 | Vacation Lane | バケーションレーン | 假日航線 | | 20230525 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 | -| 20230525 | event 20230525 cn | Confluence of Nothingness | 空相交汇点 | Confluence of Nothingness | 覆天せし万象の塵 | - | -| 20230615 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 復刻峽灣間的反擊 | -| 20230621 | event 20210527 cn | Mirror Involution Rerun | 复刻镜位螺旋 | Mirror Involution Rerun | 照らす螺旋の鏡海（復刻） | - | -| 20230629 | event 20220428 cn | Rondo at Rainbow's End | - | - | - | 虹彩的終幕曲 | -| 20230629 | raid 20230629 | Reflections of the Oasis | 绿洲往事 | Reflections of the Oasis | 緑地伽話 | - | -| 20230713 | event 20220818 cn | Operation Convergence | - | - | 結像点作戦 | 遠匯點作戰 | -| 20230720 | event 20211125 cn | World-spanning Arclight | 复刻交汇世界的弧光 | World-spanning Arclight Rerun | 弧光は交わる世界にて（復刻） | - | -| 20230727 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 復刻-蝶海夢花 | -| 20230803 | event 20211125 cn | World-spanning Arclight | - | - | - | 復刻-交匯世界的弧光 | -| 20230803 | event 20230803 cn | Anthem of Remembrance | 奏响鸢尾之歌 | Anthem of Remembrance | 燃ゆる聖都の回想曲 | - | -| 20230817 | event 20230817 cn | The Fool's Scales | 愚者的天平 | The Fool's Scales | 愚者の天秤 | - | -| 20230817 | event 20220414 cn | Aurora Noctis | - | - | - | 復刻-永夜幻光 | -| 20230824 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | -| 20230914 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 紫絳槿嵐 | -| 20230914 | event 20230914 cn | Effulgence Before Eclipse | 须臾望月抄 | Effulgence Before Eclipse | 須臾望月抄 | - | -| 20231012 | event 20201229 cn | Inverted Orthant | - | - | - | 復刻-負象限作戰 | -| 20231019 | raid 20221027 | Fight! Royal Maid | - | - | - | 戰鬥！皇家女僕隊3rd | -| 20231026 | event 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | - | -| 20231109 | event 20210916 cn | Upon the Shimmering Blue | 复刻碧海光粼 | Upon the Shimmering Blue Rerun | 駆けよ 碧海の吹き風（復刻） | - | -| 20231109 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 雄鷹的敘事歌 | -| 20231123 | event 20220210 cn | Northern Overture Rerun | - | - | - | 復刻北境序曲 | -| 20231123 | event 20231123 cn | The Ninja Scrolls: Azur Flash | 苍闪忍法帖 | The Ninja Scrolls: Azur Flash | 蒼閃忍法帖 | - | -| 20231130 | event 20231123 cn | The Ninja Scrolls: Azur Flash | - | - | - | 蒼閃忍法帖 | -| 20221222 | event 20221222 cn | Parallel Superimposition | - | - | - | 定向折疊 | -| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - | -| 20240104 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 復刻破曉冰華 | -| 20240111 | event 20211229 cn | Tower of Transcendence Rerun | 复刻逆转彩虹之塔 | Tower of Transcendence Rerun | 遡望せし虹彩の塔（復刻） 　　 | - | -| 20240111 | event 20230803 cn | Anthem of Remembrance | - | - | - | 奏響鳶尾之歌 | -| 20240125 | event 20210527 cn | Mirror Involution Rerun | - | - | - | 復刻鏡位螺旋 | -| 20240130 | raid 20240130 | Spring Festive Fiasco | 寰昌宇定家事忙 | Spring Festive Fiasco | 新春宴会狂騒曲 | - | -| 20240206 | raid 20230118 | Winter Pathfinder | - | - | - | 冬日的尋路人 | -| 20240229 | event 20230223 cn | Revelations of Dust | - | - | - | 湮燼塵墟 | -| 20240229 | event 20240229 cn | Snowrealm Peregrination | 雪境迷踪 | Snowrealm Peregrination | 銀界遊廻 | - | -| 20240314 | event 20210422 cn | Daedalian Hymn | - | - | - | 復刻復興的讚美詩 | -| 20240314 | event 20220324 cn | Virtual Tower Rerun | 复刻虚像构筑之塔 | Virtual Tower Rerun | 幻像の塔（復刻） | - | -| 20240321 | raid 20230629 | Reflections of the Oasis | - | - | - | 綠洲往事 | -| 20240328 | raid 20240328 | From Zero to Hero | 从零开始的魔王讨伐之旅 | From Zero to Hero | ゼロから頑張る魔王討伐 | - | -| 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | -| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | -| 20240425 | event 20230817 cn | The Fool's Scales | - | - | - | 愚者的天平 | -| 20240425 | event 20240425 cn | Heart-Linking Harmony | 共鸣的PASSION | Heart-Linking Harmony | 共鳴のパッション | - | -| 20240509 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 復刻碧海光粼 | -| 20240521 | event 20240521 cn | Light of the Martyrium | 绽放于辉光之城 | Light of the Martyrium | 赫輝のマルティリウム | - | -| 20240523 | event 20230525 cn | Confluence of Nothingness | - | - | - | 空相交會點 | -| 20240613 | event 20201012 cn | Sundered Blue | - | - | - | 復刻劃破海空之翼 | -| 20240620 | event 20220428 cn | Rondo at Rainbow's End Rerun | 复刻虹彩的终幕曲 | Rondo at Rainbow's End Rerun | 吟ずる瑠璃の楽章（復刻） | - | -| 20240627 | event 20231026 cn | Tempesta and the Fountain of Youth | - | - | - | 飓風與青春之泉 | -| 20240627 | coalition 20240627 | Welcome to Little Academy | 欢迎来到童心学院 | Welcome to Little Academy | リトル学園へようこそ | - | -| 20240711 | event 20211229 cn | Tower of Transcendence Rerun | - | - | -　 | 復刻逆轉彩虹之塔 | -| 20240718 | event 20220526 cn | Pledge of the Radiant Court Rerun | 复刻泠誓光庭 | Pledge of the Radiant Court Rerun | 復刻诚閃の剣 搖光の城 | - | -| 20240725 | event 20240725 cn | Interlude of Illusions | 幻梦间奏曲 | Interlude of Illusions | 夢幻の間奏曲 | - | -| 20240725 | raid 20240328 | From Zero to Hero | - | - | - | 從零開始的魔王討伐之旅 | -| 20240815 | event 20240815 cn | Windborne Steel Wings | 铁翼擎风 | Windborne Steel Wings | 錬翼空翔 | - | -| 20240815 | event 20240425 cn | Heart-Linking Harmony | - | - | - | 共鳴的PASSION | -| 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - | -| 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 | -| 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - | -| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | \ No newline at end of file +| 20230525 | event 20230525 cn | Confluence of Nothingness | 空相交汇点 | Confluence of Nothingness | 覆天せし万象の塵 | - | +| 20230615 | event 20200603 cn | Counterattack Within the Fjord | - | - | - | 復刻峽灣間的反擊 | +| 20230621 | event 20210527 cn | Mirror Involution Rerun | 复刻镜位螺旋 | Mirror Involution Rerun | 照らす螺旋の鏡海（復刻） | - | +| 20230629 | event 20220428 cn | Rondo at Rainbow's End | - | - | - | 虹彩的終幕曲 | +| 20230629 | raid 20230629 | Reflections of the Oasis | 绿洲往事 | Reflections of the Oasis | 緑地伽話 | - | +| 20230713 | event 20220818 cn | Operation Convergence | - | - | 結像点作戦 | 遠匯點作戰 | +| 20230720 | event 20211125 cn | World-spanning Arclight | 复刻交汇世界的弧光 | World-spanning Arclight Rerun | 弧光は交わる世界にて（復刻） | - | +| 20230727 | event 20200917 cn | Dreamwaker's Butterfly | - | - | - | 復刻-蝶海夢花 | +| 20230803 | event 20211125 cn | World-spanning Arclight | - | - | - | 復刻-交匯世界的弧光 | +| 20230803 | event 20230803 cn | Anthem of Remembrance | 奏响鸢尾之歌 | Anthem of Remembrance | 燃ゆる聖都の回想曲 | - | +| 20230817 | event 20230817 cn | The Fool's Scales | 愚者的天平 | The Fool's Scales | 愚者の天秤 | - | +| 20230817 | event 20220414 cn | Aurora Noctis | - | - | - | 復刻-永夜幻光 | +| 20230824 | coalition 20230323 | Frostfall | - | - | - | 極地風暴 | +| 20230914 | event 20220915 cn | Violet Tempest Blooming Lycoris | - | - | - | 紫絳槿嵐 | +| 20230914 | event 20230914 cn | Effulgence Before Eclipse | 须臾望月抄 | Effulgence Before Eclipse | 須臾望月抄 | - | +| 20231012 | event 20201229 cn | Inverted Orthant | - | - | - | 復刻-負象限作戰 | +| 20231019 | raid 20221027 | Fight! Royal Maid | - | - | - | 戰鬥！皇家女僕隊3rd | +| 20231026 | event 20231026 cn | Tempesta and the Fountain of Youth | 飓风与青春之泉 | Tempesta and the Fountain of Youth | テンペスタと若返りの泉 | - | +| 20231109 | event 20210916 cn | Upon the Shimmering Blue | 复刻碧海光粼 | Upon the Shimmering Blue Rerun | 駆けよ 碧海の吹き風（復刻） | - | +| 20231109 | event 20220728 cn | Aquilifer's Ballade | - | - | - | 雄鷹的敘事歌 | +| 20231123 | event 20220210 cn | Northern Overture Rerun | - | - | - | 復刻北境序曲 | +| 20231123 | event 20231123 cn | The Ninja Scrolls: Azur Flash | 苍闪忍法帖 | The Ninja Scrolls: Azur Flash | 蒼閃忍法帖 | - | +| 20231130 | event 20231123 cn | The Ninja Scrolls: Azur Flash | - | - | - | 蒼閃忍法帖 | +| 20221222 | event 20221222 cn | Parallel Superimposition | - | - | - | 定向折疊 | +| 20231221 | event 20231221 cn | Light-Chasing Sea of Stars | 星海逐光 | Light-Chasing Sea of Stars | 光追う星の海 | - | +| 20240104 | event 20210225 cn | Khorovod of Dawn's Rime | - | - | - | 復刻破曉冰華 | +| 20240111 | event 20211229 cn | Tower of Transcendence Rerun | 复刻逆转彩虹之塔 | Tower of Transcendence Rerun | 遡望せし虹彩の塔（復刻） | - | +| 20240111 | event 20230803 cn | Anthem of Remembrance | - | - | - | 奏響鳶尾之歌 | +| 20240125 | event 20210527 cn | Mirror Involution Rerun | - | - | - | 復刻鏡位螺旋 | +| 20240130 | raid 20240130 | Spring Festive Fiasco | 寰昌宇定家事忙 | Spring Festive Fiasco | 新春宴会狂騒曲 | - | +| 20240206 | raid 20230118 | Winter Pathfinder | - | - | - | 冬日的尋路人 | +| 20240229 | event 20230223 cn | Revelations of Dust | - | - | - | 湮燼塵墟 | +| 20240229 | event 20240229 cn | Snowrealm Peregrination | 雪境迷踪 | Snowrealm Peregrination | 銀界遊廻 | - | +| 20240314 | event 20210422 cn | Daedalian Hymn | - | - | - | 復刻復興的讚美詩 | +| 20240314 | event 20220324 cn | Virtual Tower Rerun | 复刻虚像构筑之塔 | Virtual Tower Rerun | 幻像の塔（復刻） | - | +| 20240321 | raid 20230629 | Reflections of the Oasis | - | - | - | 綠洲往事 | +| 20240328 | raid 20240328 | From Zero to Hero | 从零开始的魔王讨伐之旅 | From Zero to Hero | ゼロから頑張る魔王討伐 | - | +| 20240403 | event 20211111 cn | The Flame-Touched Dagger | - | - | - | 復刻杰諾瓦的焰火 | +| 20240411 | event 20220224 cn | Abyssal Refrain Rerun | 复刻深度回音 | Abyssal Refrain Rerun | 鳴動せし星霜の淵（復刻） | - | +| 20240425 | event 20230817 cn | The Fool's Scales | - | - | - | 愚者的天平 | +| 20240425 | event 20240425 cn | Heart-Linking Harmony | 共鸣的PASSION | Heart-Linking Harmony | 共鳴のパッション | - | +| 20240509 | event 20210916 cn | Upon the Shimmering Blue | - | - | - | 復刻碧海光粼 | +| 20240521 | event 20240521 cn | Light of the Martyrium | 绽放于辉光之城 | Light of the Martyrium | 赫輝のマルティリウム | - | +| 20240523 | event 20230525 cn | Confluence of Nothingness | - | - | - | 空相交會點 | +| 20240613 | event 20201012 cn | Sundered Blue | - | - | - | 復刻劃破海空之翼 | +| 20240620 | event 20220428 cn | Rondo at Rainbow's End Rerun | 复刻虹彩的终幕曲 | Rondo at Rainbow's End Rerun | 吟ずる瑠璃の楽章（復刻） | - | +| 20240627 | event 20231026 cn | Tempesta and the Fountain of Youth | - | - | - | 飓風與青春之泉 | +| 20240627 | coalition 20240627 | Welcome to Little Academy | 欢迎来到童心学院 | Welcome to Little Academy | リトル学園へようこそ | - | +| 20240711 | event 20211229 cn | Tower of Transcendence Rerun | - | - | - | 復刻逆轉彩虹之塔 | +| 20240718 | event 20220526 cn | Pledge of the Radiant Court Rerun | 复刻泠誓光庭 | Pledge of the Radiant Court Rerun | 復刻诚閃の剣 搖光の城 | - | +| 20240725 | event 20240725 cn | Interlude of Illusions | 幻梦间奏曲 | Interlude of Illusions | 夢幻の間奏曲 | - | +| 20240725 | raid 20240328 | From Zero to Hero | - | - | - | 從零開始的魔王討伐之旅 | +| 20240815 | event 20240815 cn | Windborne Steel Wings | 铁翼擎风 | Windborne Steel Wings | 錬翼空翔 | - | +| 20240815 | event 20240425 cn | Heart-Linking Harmony | - | - | - | 共鳴的PASSION | +| 20240829 | event 20240829 cn | Whence Flowers Bear No Fruit | 埋葬于彼岸之花 | Whence Flowers Bear No Fruit | 徒花咲かす彼岸 | - | +| 20240829 | event 20220324 cn | Virtual Tower | - | - | - | 復刻虛像構築之塔 | +| 20240912 | event 20240912 cn | Ode of Everblooming Crimson | 唤醒苍红之炎 | Ode of Everblooming Crimson | 絳染む丹華の詠歌 | - | +| 20240919 | event 20230914 cn | Effulgence Before Eclipse | - | - | - | 須臾望月抄 | \ No newline at end of file diff --git a/campaign/event_20210422_cn/sp.py b/campaign/event_20210422_cn/sp.py deleted file mode 100644 index 1205a0310..000000000 --- a/campaign/event_20210422_cn/sp.py +++ /dev/null @@ -1,126 +0,0 @@ -from module.campaign.campaign_base import CampaignBase -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -MAP = CampaignMap('SP') -MAP.shape = 'G10' -MAP.camera_data = ['D2', 'D6', 'D8'] -MAP.camera_data_spawn_point = ['D8'] -MAP.map_data = """ - -- ++ ++ MB ++ ++ -- - ++ ++ ++ -- ++ ++ ++ - ME -- -- -- -- -- ME - ++ ++ ++ -- ++ ++ ++ - ME -- -- -- -- -- ME - ++ ++ ++ -- ++ ++ ++ - MS -- ++ MS ++ -- MS - ++ -- ++ -- ++ -- ++ - -- -- -- __ -- -- -- - -- -- SP -- SP -- -- -""" -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 - 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 -""" -# MAP.maze_data = [('D6', 'B8', 'F8'), ('D4', 'C5', 'E5'), ('D2', 'C3', 'E3', 'D8')] -MAP.spawn_data = [ - {'battle': 0, 'enemy': 4, '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, \ -A9, B9, C9, D9, E9, F9, G9, \ -A10, B10, C10, D10, E10, F10, G10, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = False - MAP_HAS_AMBUSH = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - # MAP_HAS_MAZE = True - MAP_HAS_SIREN = True - MAP_SIREN_TEMPLATE = ['Warspite', 'Formidable', 'Illustrious'] - MAP_SWIPE_MULTIPLY = (0.963, 0.981) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.932, 0.949) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.904, 0.921) - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - # EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - self.clear_chosen_enemy(D7, expected='siren') - return True - - def battle_1(self): - self.goto(C9) - self.goto(B9) - self.clear_chosen_enemy(A7, expected='siren') - return True - - def battle_2(self): - self.clear_chosen_enemy(G7, expected='siren') - return True - - def battle_3(self): - self.goto(D5) - self.clear_chosen_enemy(A5) - return True - - def battle_4(self): - self.clear_chosen_enemy(G5) - return True - - def battle_5(self): - self.goto(D3) - self.clear_chosen_enemy(A3) - return True - - def battle_6(self): - self.clear_chosen_enemy(G3) - return True - - def battle_7(self): - if self.fleet_boss_index == 2: - self.fleet_boss.switch_to() - self.goto(D7) - self.goto(D5) - self.goto(D6) - self.goto(D5) - self.goto(D3) - self.goto(D4) - self.goto(D3) - self.clear_chosen_enemy(D1, expected='boss') - else: - self.clear_chosen_enemy(D1, expected='boss') - return True diff --git a/campaign/event_20210916_cn/sp.py b/campaign/event_20210916_cn/sp.py deleted file mode 100644 index 0cef4a53b..000000000 --- a/campaign/event_20210916_cn/sp.py +++ /dev/null @@ -1,109 +0,0 @@ -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -from .campaign_base import CampaignBase - -MAP = CampaignMap('SP') -MAP.shape = 'H8' -MAP.camera_data = ['C4', 'C5'] -MAP.camera_data_spawn_point = ['C5'] -MAP.map_data = """ - ++ ++ ++ -- -- ++ ++ ++ - ++ ++ -- -- ++ -- ++ ++ - ++ -- -- ++ -- MB -- ++ - -- -- ME -- -- -- ++ -- - -- -- -- ME -- ++ -- -- - -- SP __ -- ME -- -- ++ - ++ -- SP -- -- -- ++ ++ - ++ ++ -- -- -- ++ ++ ++ -""" -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 - 50 50 50 50 50 50 50 50 -""" -MAP.fortress_data = [('D4', 'D6', 'C5', 'E5'), 'E4'] -MAP.spawn_data = [ - {'battle': 0, 'enemy': 3}, - {'battle': 1}, - {'battle': 2}, - {'battle': 3}, - {'battle': 4}, - {'battle': 5}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, \ -A2, B2, C2, D2, E2, F2, G2, H2, \ -A3, B3, C3, D3, E3, F3, G3, H3, \ -A4, B4, C4, D4, E4, F4, G4, H4, \ -A5, B5, C5, D5, E5, F5, G5, H5, \ -A6, B6, C6, D6, E6, F6, G6, H6, \ -A7, B7, C7, D7, E7, F7, G7, H7, \ -A8, B8, C8, D8, E8, F8, G8, H8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - # MAP_SIREN_TEMPLATE = ['1564301', '1564302', '1564303'] - # 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_IS_ONE_TIME_STAGE = True - MAP_HAS_FORTRESS = True - MAP_SWIPE_PREDICT = False - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (80, 255 - 40), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 24, 255), - 'prominence': 10, - 'distance': 50, - # 'width': (0, 7), - 'wlen': 1000 - } - HOMO_CANNY_THRESHOLD = (60, 60) - # MAP_ENEMY_GENRE_DETECTION_SCALING = { - # 'DD': 1.111, - # 'CL': (1, 1.111), - # 'CA': (1, 1.111), - # 'CV': 1.111, - # 'BB': 1.111, - # } - MAP_SWIPE_MULTIPLY = (0.999, 1.018) - MAP_SWIPE_MULTIPLY_MINITOUCH = (0.966, 0.984) - MAP_SWIPE_MULTIPLY_MAATOUCH = (0.938, 0.955) - - -class Campaign(CampaignBase): - MAP = MAP - - def battle_0(self): - if self.clear_siren(): - return True - - return self.battle_default() - - def battle_7(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20211229_cn/sp.py b/campaign/event_20211229_cn/sp.py deleted file mode 100644 index 9b5770f4e..000000000 --- a/campaign/event_20211229_cn/sp.py +++ /dev/null @@ -1,107 +0,0 @@ -from module.logger import logger -from module.map.map_base import CampaignMap -from module.map.map_grids import RoadGrids, SelectedGrids - -from .campaign_base import CampaignBase - -MAP = CampaignMap('SP') -MAP.shape = 'I8' -MAP.camera_data = ['E3', 'E5'] -MAP.camera_data_spawn_point = ['E5'] -MAP.map_data = """ - ++ ++ ++ -- -- -- ++ ++ ++ - -- -- -- ++ MB ++ -- -- -- - ++ MS -- ME -- ME -- MS ++ - ++ ++ -- ++ MS ++ -- ++ ++ - ++ ME -- ++ __ ++ -- ME ++ - -- -- -- -- -- -- -- -- -- - ++ ++ -- SP ++ SP -- ++ ++ - ++ ++ -- ++ ++ ++ -- ++ ++ -""" -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 50 50 50 50 50 50 50 - 50 50 50 50 50 50 50 50 50 -""" -MAP.spawn_data = [ - {'battle': 0, 'enemy': 2, 'siren': 2}, - {'battle': 1, 'enemy': 1}, - {'battle': 2, 'enemy': 2, 'siren': 1}, - {'battle': 3, 'enemy': 1}, - {'battle': 4, 'enemy': 2}, - {'battle': 5, 'enemy': 1}, - {'battle': 6}, - {'battle': 7, 'boss': 1}, -] -A1, B1, C1, D1, E1, F1, G1, H1, I1, \ -A2, B2, C2, D2, E2, F2, G2, H2, I2, \ -A3, B3, C3, D3, E3, F3, G3, H3, I3, \ -A4, B4, C4, D4, E4, F4, G4, H4, I4, \ -A5, B5, C5, D5, E5, F5, G5, H5, I5, \ -A6, B6, C6, D6, E6, F6, G6, H6, I6, \ -A7, B7, C7, D7, E7, F7, G7, H7, I7, \ -A8, B8, C8, D8, E8, F8, G8, H8, I8, \ - = MAP.flatten() - - -class Config: - # ===== Start of generated config ===== - MAP_SIREN_TEMPLATE = ['Lover'] - MOVABLE_ENEMY_TURN = (2,) - MAP_HAS_SIREN = True - MAP_HAS_MOVABLE_ENEMY = True - MAP_HAS_MAP_STORY = False - MAP_HAS_FLEET_STEP = True - MAP_HAS_AMBUSH = False - MAP_HAS_MYSTERY = False - STAR_REQUIRE_1 = 0 - STAR_REQUIRE_2 = 0 - STAR_REQUIRE_3 = 0 - # ===== End of generated config ===== - - INTERNAL_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (150, 255 - 17), - 'width': (0.9, 10), - 'prominence': 10, - 'distance': 35, - } - EDGE_LINES_FIND_PEAKS_PARAMETERS = { - 'height': (255 - 17, 255), - 'prominence': 10, - 'distance': 50, - 'wlen': 1000 - } - HOMO_EDGE_COLOR_RANGE = (0, 17) - INTERNAL_LINES_HOUGHLINES_THRESHOLD = 40 - EDGE_LINES_HOUGHLINES_THRESHOLD = 40 - MAP_ENSURE_EDGE_INSIGHT_CORNER = 'bottom' - - MAP_IS_ONE_TIME_STAGE = True - MAP_HAS_MOVABLE_NORMAL_ENEMY = True - MOVABLE_NORMAL_ENEMY_TURN = (2,) - MAP_SIREN_MOVE_WAIT = 1.0 - - -class Campaign(CampaignBase): - MAP = MAP - ENEMY_FILTER = '1L > 1M > 1E > 1C > 2L > 2M > 2E > 2C > 3L > 3M > 3E > 3C' - - def battle_0(self): - if self.clear_any_enemy(sort=('cost_2',)): - return True - - return self.battle_default() - - def battle_5(self): - if self.clear_any_enemy(sort=('cost_2',)): - return True - - return self.battle_default() - - def battle_7(self): - return self.fleet_boss.clear_boss() diff --git a/campaign/event_20201012_cn/sp1.py b/campaign/war_archives_20201012_cn/sp1.py similarity index 97% rename from campaign/event_20201012_cn/sp1.py rename to campaign/war_archives_20201012_cn/sp1.py index d0f4ee190..1954a8cc2 100644 --- a/campaign/event_20201012_cn/sp1.py +++ b/campaign/war_archives_20201012_cn/sp1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20201012_cn/sp2.py b/campaign/war_archives_20201012_cn/sp2.py similarity index 96% rename from campaign/event_20201012_cn/sp2.py rename to campaign/war_archives_20201012_cn/sp2.py index 20d5f422b..7637bd53b 100644 --- a/campaign/event_20201012_cn/sp2.py +++ b/campaign/war_archives_20201012_cn/sp2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20201012_cn/sp3.py b/campaign/war_archives_20201012_cn/sp3.py similarity index 96% rename from campaign/event_20201012_cn/sp3.py rename to campaign/war_archives_20201012_cn/sp3.py index f1bab999e..4066b3756 100644 --- a/campaign/event_20201012_cn/sp3.py +++ b/campaign/war_archives_20201012_cn/sp3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a1.py b/campaign/war_archives_20210422_cn/a1.py similarity index 97% rename from campaign/event_20210422_cn/a1.py rename to campaign/war_archives_20210422_cn/a1.py index a3110952d..270acfde7 100644 --- a/campaign/event_20210422_cn/a1.py +++ b/campaign/war_archives_20210422_cn/a1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a2.py b/campaign/war_archives_20210422_cn/a2.py similarity index 96% rename from campaign/event_20210422_cn/a2.py rename to campaign/war_archives_20210422_cn/a2.py index f69d82311..a9d2ad7be 100644 --- a/campaign/event_20210422_cn/a2.py +++ b/campaign/war_archives_20210422_cn/a2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/a3.py b/campaign/war_archives_20210422_cn/a3.py similarity index 96% rename from campaign/event_20210422_cn/a3.py rename to campaign/war_archives_20210422_cn/a3.py index df7535581..2e9db9586 100644 --- a/campaign/event_20210422_cn/a3.py +++ b/campaign/war_archives_20210422_cn/a3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b1.py b/campaign/war_archives_20210422_cn/b1.py similarity index 97% rename from campaign/event_20210422_cn/b1.py rename to campaign/war_archives_20210422_cn/b1.py index 6f6bc775a..8c9613590 100644 --- a/campaign/event_20210422_cn/b1.py +++ b/campaign/war_archives_20210422_cn/b1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b2.py b/campaign/war_archives_20210422_cn/b2.py similarity index 97% rename from campaign/event_20210422_cn/b2.py rename to campaign/war_archives_20210422_cn/b2.py index e839b064c..5d7785afe 100644 --- a/campaign/event_20210422_cn/b2.py +++ b/campaign/war_archives_20210422_cn/b2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/b3.py b/campaign/war_archives_20210422_cn/b3.py similarity index 97% rename from campaign/event_20210422_cn/b3.py rename to campaign/war_archives_20210422_cn/b3.py index 6d48473b5..b8283ccff 100644 --- a/campaign/event_20210422_cn/b3.py +++ b/campaign/war_archives_20210422_cn/b3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c1.py b/campaign/war_archives_20210422_cn/c1.py similarity index 97% rename from campaign/event_20210422_cn/c1.py rename to campaign/war_archives_20210422_cn/c1.py index c1811ba10..0bbc6649d 100644 --- a/campaign/event_20210422_cn/c1.py +++ b/campaign/war_archives_20210422_cn/c1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c2.py b/campaign/war_archives_20210422_cn/c2.py similarity index 96% rename from campaign/event_20210422_cn/c2.py rename to campaign/war_archives_20210422_cn/c2.py index 86e8b078c..c40fc1961 100644 --- a/campaign/event_20210422_cn/c2.py +++ b/campaign/war_archives_20210422_cn/c2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/c3.py b/campaign/war_archives_20210422_cn/c3.py similarity index 96% rename from campaign/event_20210422_cn/c3.py rename to campaign/war_archives_20210422_cn/c3.py index b5b7b3074..c8cf85dba 100644 --- a/campaign/event_20210422_cn/c3.py +++ b/campaign/war_archives_20210422_cn/c3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d1.py b/campaign/war_archives_20210422_cn/d1.py similarity index 97% rename from campaign/event_20210422_cn/d1.py rename to campaign/war_archives_20210422_cn/d1.py index 32a7541de..50edac244 100644 --- a/campaign/event_20210422_cn/d1.py +++ b/campaign/war_archives_20210422_cn/d1.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d2.py b/campaign/war_archives_20210422_cn/d2.py similarity index 97% rename from campaign/event_20210422_cn/d2.py rename to campaign/war_archives_20210422_cn/d2.py index 05ca78fd9..a5a413ddf 100644 --- a/campaign/event_20210422_cn/d2.py +++ b/campaign/war_archives_20210422_cn/d2.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210422_cn/d3.py b/campaign/war_archives_20210422_cn/d3.py similarity index 97% rename from campaign/event_20210422_cn/d3.py rename to campaign/war_archives_20210422_cn/d3.py index 94cc4d234..c20e7ae8e 100644 --- a/campaign/event_20210422_cn/d3.py +++ b/campaign/war_archives_20210422_cn/d3.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids diff --git a/campaign/event_20210916_cn/a1.py b/campaign/war_archives_20210916_cn/a1.py similarity index 100% rename from campaign/event_20210916_cn/a1.py rename to campaign/war_archives_20210916_cn/a1.py diff --git a/campaign/event_20210916_cn/a2.py b/campaign/war_archives_20210916_cn/a2.py similarity index 100% rename from campaign/event_20210916_cn/a2.py rename to campaign/war_archives_20210916_cn/a2.py diff --git a/campaign/event_20210916_cn/a3.py b/campaign/war_archives_20210916_cn/a3.py similarity index 100% rename from campaign/event_20210916_cn/a3.py rename to campaign/war_archives_20210916_cn/a3.py diff --git a/campaign/event_20210916_cn/b1.py b/campaign/war_archives_20210916_cn/b1.py similarity index 100% rename from campaign/event_20210916_cn/b1.py rename to campaign/war_archives_20210916_cn/b1.py diff --git a/campaign/event_20210916_cn/b2.py b/campaign/war_archives_20210916_cn/b2.py similarity index 100% rename from campaign/event_20210916_cn/b2.py rename to campaign/war_archives_20210916_cn/b2.py diff --git a/campaign/event_20210916_cn/b3.py b/campaign/war_archives_20210916_cn/b3.py similarity index 100% rename from campaign/event_20210916_cn/b3.py rename to campaign/war_archives_20210916_cn/b3.py diff --git a/campaign/event_20210916_cn/c1.py b/campaign/war_archives_20210916_cn/c1.py similarity index 100% rename from campaign/event_20210916_cn/c1.py rename to campaign/war_archives_20210916_cn/c1.py diff --git a/campaign/event_20210916_cn/c2.py b/campaign/war_archives_20210916_cn/c2.py similarity index 100% rename from campaign/event_20210916_cn/c2.py rename to campaign/war_archives_20210916_cn/c2.py diff --git a/campaign/event_20210916_cn/c3.py b/campaign/war_archives_20210916_cn/c3.py similarity index 100% rename from campaign/event_20210916_cn/c3.py rename to campaign/war_archives_20210916_cn/c3.py diff --git a/campaign/event_20210916_cn/campaign_base.py b/campaign/war_archives_20210916_cn/campaign_base.py similarity index 90% rename from campaign/event_20210916_cn/campaign_base.py rename to campaign/war_archives_20210916_cn/campaign_base.py index 7c4649edf..b965041aa 100644 --- a/campaign/event_20210916_cn/campaign_base.py +++ b/campaign/war_archives_20210916_cn/campaign_base.py @@ -1,6 +1,6 @@ from typing import List -from module.campaign.campaign_base import CampaignBase as CampaignBase_ +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger from module.map_detection.grid import GridInfo diff --git a/campaign/event_20210916_cn/d1.py b/campaign/war_archives_20210916_cn/d1.py similarity index 100% rename from campaign/event_20210916_cn/d1.py rename to campaign/war_archives_20210916_cn/d1.py diff --git a/campaign/event_20210916_cn/d2.py b/campaign/war_archives_20210916_cn/d2.py similarity index 100% rename from campaign/event_20210916_cn/d2.py rename to campaign/war_archives_20210916_cn/d2.py diff --git a/campaign/event_20210916_cn/d3.py b/campaign/war_archives_20210916_cn/d3.py similarity index 100% rename from campaign/event_20210916_cn/d3.py rename to campaign/war_archives_20210916_cn/d3.py diff --git a/campaign/event_20211111_cn/sp1.py b/campaign/war_archives_20211111_cn/sp1.py similarity index 97% rename from campaign/event_20211111_cn/sp1.py rename to campaign/war_archives_20211111_cn/sp1.py index d17cdb26a..2e522efab 100644 --- a/campaign/event_20211111_cn/sp1.py +++ b/campaign/war_archives_20211111_cn/sp1.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase MAP = CampaignMap('SP1') MAP.shape = 'H7' diff --git a/campaign/event_20211111_cn/sp2.py b/campaign/war_archives_20211111_cn/sp2.py similarity index 96% rename from campaign/event_20211111_cn/sp2.py rename to campaign/war_archives_20211111_cn/sp2.py index 3f503c1b3..516632faf 100644 --- a/campaign/event_20211111_cn/sp2.py +++ b/campaign/war_archives_20211111_cn/sp2.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP2') diff --git a/campaign/event_20211111_cn/sp3.py b/campaign/war_archives_20211111_cn/sp3.py similarity index 97% rename from campaign/event_20211111_cn/sp3.py rename to campaign/war_archives_20211111_cn/sp3.py index c45ed4aeb..ab77e5820 100644 --- a/campaign/event_20211111_cn/sp3.py +++ b/campaign/war_archives_20211111_cn/sp3.py @@ -2,7 +2,7 @@ from module.logger import logger from module.map.map_base import CampaignMap from module.map.map_grids import RoadGrids, SelectedGrids -from module.campaign.campaign_base import CampaignBase +from ..campaign_war_archives.campaign_base import CampaignBase from .sp1 import Config as ConfigBase MAP = CampaignMap('SP3') diff --git a/campaign/event_20211229_cn/a1.py b/campaign/war_archives_20211229_cn/a1.py similarity index 100% rename from campaign/event_20211229_cn/a1.py rename to campaign/war_archives_20211229_cn/a1.py diff --git a/campaign/event_20211229_cn/a2.py b/campaign/war_archives_20211229_cn/a2.py similarity index 100% rename from campaign/event_20211229_cn/a2.py rename to campaign/war_archives_20211229_cn/a2.py diff --git a/campaign/event_20211229_cn/a3.py b/campaign/war_archives_20211229_cn/a3.py similarity index 100% rename from campaign/event_20211229_cn/a3.py rename to campaign/war_archives_20211229_cn/a3.py diff --git a/campaign/event_20211229_cn/b1.py b/campaign/war_archives_20211229_cn/b1.py similarity index 100% rename from campaign/event_20211229_cn/b1.py rename to campaign/war_archives_20211229_cn/b1.py diff --git a/campaign/event_20211229_cn/b2.py b/campaign/war_archives_20211229_cn/b2.py similarity index 100% rename from campaign/event_20211229_cn/b2.py rename to campaign/war_archives_20211229_cn/b2.py diff --git a/campaign/event_20211229_cn/b3.py b/campaign/war_archives_20211229_cn/b3.py similarity index 100% rename from campaign/event_20211229_cn/b3.py rename to campaign/war_archives_20211229_cn/b3.py diff --git a/campaign/event_20211229_cn/bs1.py b/campaign/war_archives_20211229_cn/bs1.py similarity index 100% rename from campaign/event_20211229_cn/bs1.py rename to campaign/war_archives_20211229_cn/bs1.py diff --git a/campaign/event_20211229_cn/c1.py b/campaign/war_archives_20211229_cn/c1.py similarity index 100% rename from campaign/event_20211229_cn/c1.py rename to campaign/war_archives_20211229_cn/c1.py diff --git a/campaign/event_20211229_cn/c2.py b/campaign/war_archives_20211229_cn/c2.py similarity index 100% rename from campaign/event_20211229_cn/c2.py rename to campaign/war_archives_20211229_cn/c2.py diff --git a/campaign/event_20211229_cn/c3.py b/campaign/war_archives_20211229_cn/c3.py similarity index 100% rename from campaign/event_20211229_cn/c3.py rename to campaign/war_archives_20211229_cn/c3.py diff --git a/campaign/event_20211229_cn/campaign_base.py b/campaign/war_archives_20211229_cn/campaign_base.py similarity index 91% rename from campaign/event_20211229_cn/campaign_base.py rename to campaign/war_archives_20211229_cn/campaign_base.py index 26d2e84a8..a552caaa5 100644 --- a/campaign/event_20211229_cn/campaign_base.py +++ b/campaign/war_archives_20211229_cn/campaign_base.py @@ -1,4 +1,4 @@ -from module.campaign.campaign_base import CampaignBase as CampaignBase_ +from ..campaign_war_archives.campaign_base import CampaignBase as CampaignBase_ from module.logger import logger diff --git a/campaign/event_20211229_cn/d1.py b/campaign/war_archives_20211229_cn/d1.py similarity index 100% rename from campaign/event_20211229_cn/d1.py rename to campaign/war_archives_20211229_cn/d1.py diff --git a/campaign/event_20211229_cn/d2.py b/campaign/war_archives_20211229_cn/d2.py similarity index 100% rename from campaign/event_20211229_cn/d2.py rename to campaign/war_archives_20211229_cn/d2.py diff --git a/campaign/event_20211229_cn/d3.py b/campaign/war_archives_20211229_cn/d3.py similarity index 100% rename from campaign/event_20211229_cn/d3.py rename to campaign/war_archives_20211229_cn/d3.py diff --git a/campaign/event_20211229_cn/ds1.py b/campaign/war_archives_20211229_cn/ds1.py similarity index 100% rename from campaign/event_20211229_cn/ds1.py rename to campaign/war_archives_20211229_cn/ds1.py diff --git a/config/template.json b/config/template.json index 7dae1bcc3..112004c49 100644 --- a/config/template.json +++ b/config/template.json @@ -633,7 +633,7 @@ }, "Campaign": { "Name": "D3", - "Event": "war_archives_20210225_cn", + "Event": "war_archives_20211229_cn", "Mode": "normal", "UseClearMode": true, "UseFleetLock": true, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index c2f357b33..e15766f3e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -3441,25 +3441,30 @@ "war_archives_20200820_cn", "war_archives_20200903_cn", "war_archives_20200917_cn", + "war_archives_20201012_cn", "war_archives_20201029_cn", "war_archives_20201229_cn", "war_archives_20210225_cn", "war_archives_20210325_cn", + "war_archives_20210422_cn", "war_archives_20210527_cn", "war_archives_20210624_cn", "war_archives_20210819_cn", + "war_archives_20210916_cn", "war_archives_20211014_cn", "war_archives_20211028_cn", + "war_archives_20211111_cn", + "war_archives_20211229_cn", "war_archives_20220210_cn", "war_archives_20220414_cn" ], "option_bold": [ - "war_archives_20210225_cn" + "war_archives_20211229_cn" ], - "cn": "war_archives_20210225_cn", - "en": "war_archives_20210225_cn", - "jp": "war_archives_20210225_cn", - "tw": "war_archives_20210225_cn" + "cn": "war_archives_20211229_cn", + "en": "war_archives_20211229_cn", + "jp": "war_archives_20211229_cn", + "tw": "war_archives_20211229_cn" }, "Mode": { "type": "select", diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 31cc14958..f139edd9b 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "archives Scherzo of Iron and Blood", "war_archives_20200903_cn": "archives Stars of the Shimmering Fjord", "war_archives_20200917_cn": "archives Dreamwakers Butterfly", + "war_archives_20201012_cn": "archives Sundered Blue", "war_archives_20201029_cn": "archives Universe in Unison", "war_archives_20201229_cn": "archives Inverted Orthant", "war_archives_20210225_cn": "archives Khorovod of Dawns Rime", "war_archives_20210325_cn": "archives Ashen Simulacrum", + "war_archives_20210422_cn": "archives Daedalian Hymn", "war_archives_20210527_cn": "archives Mirror Involution", "war_archives_20210624_cn": "archives Swirling Cherry Blossoms", "war_archives_20210819_cn": "archives Microlayer Medley", + "war_archives_20210916_cn": "archives Upon the Shimmering Blue", "war_archives_20211014_cn": "archives Crescendo of Polaris", "war_archives_20211028_cn": "archives Skybound Oratorio", + "war_archives_20211111_cn": "archives The Flame-Touched Dagger", + "war_archives_20211229_cn": "archives Tower of Transcendence", "war_archives_20220210_cn": "archives Northern Overture", "war_archives_20220414_cn": "archives Aurora Noctis" }, diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f44e45207..7cfe40448 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "檔案 黒鉄の楽章 誓いの海", "war_archives_20200903_cn": "檔案 輝ける峡湾の星", "war_archives_20200917_cn": "檔案 刹那觀る胡蝶の夢", + "war_archives_20201012_cn": "檔案 奔る彩帆の青", "war_archives_20201029_cn": "檔案 激唱のユニバース", "war_archives_20201229_cn": "檔案 虚畳なりし限象", "war_archives_20210225_cn": "檔案 暁射す氷華の嵐", "war_archives_20210325_cn": "檔案 開かれし紺碧の砂箱", + "war_archives_20210422_cn": "檔案 讃える復興の迷路", "war_archives_20210527_cn": "檔案 照らす螺旋の鏡海", "war_archives_20210624_cn": "檔案 翳りし満ちる影の華", "war_archives_20210819_cn": "檔案 闇靄払う銀翼", + "war_archives_20210916_cn": "檔案 駆けよ 碧海の吹き風", "war_archives_20211014_cn": "檔案 激奏のポラリス", "war_archives_20211028_cn": "檔案 神穹を衝く聖歌", + "war_archives_20211111_cn": "檔案 燈火のシニエ", + "war_archives_20211229_cn": "檔案 遡望せし虹彩の塔", "war_archives_20220210_cn": "檔案 凍絶の北海", "war_archives_20220414_cn": "檔案 極夜照らす幻光" }, diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 02445b35e..d2f78197d 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "档案 铁血音符誓言", "war_archives_20200903_cn": "档案 峡湾间的星辰", "war_archives_20200917_cn": "档案 蝶海梦花", + "war_archives_20201012_cn": "档案 划破海空之翼", "war_archives_20201029_cn": "档案 激唱的UNIVERSE", "war_archives_20201229_cn": "档案 负象限作战", "war_archives_20210225_cn": "档案 破晓冰华", "war_archives_20210325_cn": "档案 箱庭疗法", + "war_archives_20210422_cn": "档案 复兴的赞美诗", "war_archives_20210527_cn": "档案 镜位螺旋", "war_archives_20210624_cn": "档案 浮樱影华", "war_archives_20210819_cn": "档案 微层混合", + "war_archives_20210916_cn": "档案 碧海光粼", "war_archives_20211014_cn": "档案 激奏的Polaris", "war_archives_20211028_cn": "档案 穹顶下的圣咏曲", + "war_archives_20211111_cn": "档案 杰诺瓦的焰火", + "war_archives_20211229_cn": "档案 逆转彩虹之塔", "war_archives_20220210_cn": "档案 北境序曲", "war_archives_20220414_cn": "档案 永夜幻光" }, diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index e6b5cfb4c..11da72d3b 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -761,15 +761,20 @@ "war_archives_20200820_cn": "檔案 鐵血音符誓言", "war_archives_20200903_cn": "檔案 峽灣間的星辰", "war_archives_20200917_cn": "檔案 蝶海夢花", + "war_archives_20201012_cn": "檔案 劃破海空之翼", "war_archives_20201029_cn": "檔案 激唱的UNIVERSE", "war_archives_20201229_cn": "檔案 負象限作戰", "war_archives_20210225_cn": "檔案 破曉冰華", "war_archives_20210325_cn": "檔案 箱庭療法", + "war_archives_20210422_cn": "檔案 復興的讚美詩", "war_archives_20210527_cn": "檔案 鏡位螺旋", "war_archives_20210624_cn": "檔案 浮櫻影華", "war_archives_20210819_cn": "檔案 微層混合", + "war_archives_20210916_cn": "檔案 碧海光粼", "war_archives_20211014_cn": "檔案 激奏的Polaris", "war_archives_20211028_cn": "檔案 穹頂下的聖詠曲", + "war_archives_20211111_cn": "檔案 杰諾瓦的焰火", + "war_archives_20211229_cn": "檔案 逆轉彩虹之塔", "war_archives_20220210_cn": "檔案 北境序曲", "war_archives_20220414_cn": "檔案 永夜幻光" },