Merge pull request #695 from LmeSzinc/dev

Bug fix

module/config/argument/args.json

@@ -699,6 +699,7 @@
           "Feixiao",
           "Firefly",
           "FuXuan",
+          "Fugue",
           "Gallagher",
           "Gepard",
           "Guinaifen",
@@ -731,6 +732,7 @@
           "Serval",
           "SilverWolf",
           "Sparkle",
+          "Sunday",
           "Sushang",
           "Tingyun",
           "TopazNumby",
@@ -900,6 +902,7 @@
           "Feixiao",
           "Firefly",
           "FuXuan",
+          "Fugue",
           "Gallagher",
           "Gepard",
           "Guinaifen",
@@ -932,6 +935,7 @@
           "Serval",
           "SilverWolf",
           "Sparkle",
+          "Sunday",
           "Sushang",
           "Tingyun",
           "TopazNumby",
@@ -1439,6 +1443,7 @@
           "Feixiao",
           "Firefly",
           "FuXuan",
+          "Fugue",
           "Gallagher",
           "Gepard",
           "Guinaifen",
@@ -1471,6 +1476,7 @@
           "Serval",
           "SilverWolf",
           "Sparkle",
+          "Sunday",
           "Sushang",
           "Tingyun",
           "TopazNumby",

module/config/config_generated.py

@@ -54,7 +54,7 @@ class GeneratedConfig:
 
     # Group `DungeonSupport`
     DungeonSupport_Use = 'when_daily'  # always_use, when_daily, do_not_use
-    DungeonSupport_Character = 'FirstCharacter'  # FirstCharacter, Acheron, Argenti, Arlan, Asta, Aventurine, Bailu, BlackSwan, Blade, Boothill, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, Feixiao, Firefly, FuXuan, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, Jade, Jiaoqiu, JingYuan, Jingliu, Kafka, Lingsha, Luka, Luocha, Lynx, March7thPreservation, March7thTheHunt, Misha, Moze, Natasha, Pela, Qingque, Rappa, Robin, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerHarmony, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong, Yunli
+    DungeonSupport_Character = 'FirstCharacter'  # FirstCharacter, Acheron, Argenti, Arlan, Asta, Aventurine, Bailu, BlackSwan, Blade, Boothill, Bronya, Clara, DanHeng, DanHengImbibitorLunae, DrRatio, Feixiao, Firefly, FuXuan, Fugue, Gallagher, Gepard, Guinaifen, Hanya, Herta, Himeko, Hook, Huohuo, Jade, Jiaoqiu, JingYuan, Jingliu, Kafka, Lingsha, Luka, Luocha, Lynx, March7thPreservation, March7thTheHunt, Misha, Moze, Natasha, Pela, Qingque, Rappa, Robin, RuanMei, Sampo, Seele, Serval, SilverWolf, Sparkle, Sunday, Sushang, Tingyun, TopazNumby, TrailblazerDestruction, TrailblazerHarmony, TrailblazerPreservation, Welt, Xueyi, Yanqing, Yukong, Yunli
 
     # Group `DungeonStorage`
     DungeonStorage_TrailblazePower = {}

module/config/config_updater.py

@@ -72,7 +72,7 @@ class ConfigGenerator:
         # calyx_crimson
         from tasks.rogue.keywords import KEYWORDS_ROGUE_PATH as Path
         order = [Path.Destruction, Path.Preservation, Path.The_Hunt, Path.Abundance,
-                 Path.Erudition, Path.The_Harmony, Path.Nihility]
+                 Path.Erudition, Path.Harmony, Path.Nihility]
         calyx_crimson = []
         for path in order:
             calyx_crimson += [dungeon.name for dungeon in DungeonList.instances.values()

module/config/i18n/en-US.json

@@ -262,15 +262,15 @@
       "Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Trace: Abundance (Fyxestroll Garden)",
       "Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
       "Calyx_Crimson_Erudition_Penacony_PenaconyGrandTheater": "Trace: Erudition (Penacony Grand Theater)",
-      "Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: The Harmony (Robot Settlement)",
+      "Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: Harmony (Robot Settlement)",
-      "Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: The Harmony (The Reverie (Dreamscape))",
+      "Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: Harmony (The Reverie (Dreamscape))",
       "Calyx_Crimson_Nihility_Jarilo_GreatMine": "Trace: Nihility (Great Mine)",
       "Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)",
       "Stagnant_Shadow_Spike": "Ascension: Physical (Natasha / Clara / Luka / Sushang)",
       "Stagnant_Shadow_Perdition": "Ascension: Physical (Hanya / Argenti)",
       "Stagnant_Shadow_Duty": "Ascension: Physical (Boothill / Robin / Yunli)",
       "Stagnant_Shadow_Blaze": "Ascension: Fire (Himeko / Asta / Hook)",
-      "Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby)",
+      "Stagnant_Shadow_Scorch": "Ascension: Fire (Guinaifen / Topaz & Numby / Fugue)",
       "Stagnant_Shadow_Ire": "Ascension: Fire (Firefly / Gallagher / Jiaoqiu / Lingsha)",
       "Stagnant_Shadow_Rime": "Ascension: Ice (March 7th / Herta / Gepard / Pela)",
       "Stagnant_Shadow_Icicle": "Ascension: Ice (Yanqing / Jingliu / Ruan Mei)",
@@ -286,7 +286,7 @@
       "Stagnant_Shadow_Roast": "Ascension: Quantum (Jade / Sparkle)",
       "Stagnant_Shadow_Mirage": "Ascension: Imaginary (Welt / Luocha / Yukong)",
       "Stagnant_Shadow_Puppetry": "Ascension: Imaginary (Dan Heng • Imbibitor Lunae / Aventurine / Dr. Ratio)",
-      "Stagnant_Shadow_Timbre": "Ascension: Imaginary (Rappa)",
+      "Stagnant_Shadow_Timbre": "Ascension: Imaginary (Sunday / Rappa)",
       "Cavern_of_Corrosion_Path_of_Uncertainty": "Cavern_of_Corrosion_Path_of_Uncertainty (Path of Uncertainty)",
       "Cavern_of_Corrosion_Path_of_Cavalier": "Relics: Super Break Set & Pursuit Ultimate Set (Path of Cavalier)",
       "Cavern_of_Corrosion_Path_of_Dreamdive": "Relics: Debuff Set & Break Effect Set (Path of Dreamdive)",
@@ -321,8 +321,8 @@
       "Calyx_Crimson_Abundance_Luofu_FyxestrollGarden": "Trace: Abundance (Fyxestroll Garden)",
       "Calyx_Crimson_Erudition_Jarilo_RivetTown": "Trace: Erudition (Rivet Town)",
       "Calyx_Crimson_Erudition_Penacony_PenaconyGrandTheater": "Trace: Erudition (Penacony Grand Theater)",
-      "Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: The Harmony (Robot Settlement)",
+      "Calyx_Crimson_Harmony_Jarilo_RobotSettlement": "Trace: Harmony (Robot Settlement)",
-      "Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: The Harmony (The Reverie (Dreamscape))",
+      "Calyx_Crimson_Harmony_Penacony_TheReverieDreamscape": "Trace: Harmony (The Reverie (Dreamscape))",
       "Calyx_Crimson_Nihility_Jarilo_GreatMine": "Trace: Nihility (Great Mine)",
       "Calyx_Crimson_Nihility_Luofu_AlchemyCommission": "Trace: Nihility (Alchemy Commission)"
     },
@@ -406,6 +406,7 @@
       "Feixiao": "Feixiao",
       "Firefly": "Firefly",
       "FuXuan": "Fu Xuan",
+      "Fugue": "Fugue",
       "Gallagher": "Gallagher",
       "Gepard": "Gepard",
       "Guinaifen": "Guinaifen",
@@ -438,6 +439,7 @@
       "Serval": "Serval",
       "SilverWolf": "Silver Wolf",
       "Sparkle": "Sparkle",
+      "Sunday": "Sunday",
       "Sushang": "Sushang",
       "Tingyun": "Tingyun",
       "TopazNumby": "Topaz & Numby",
@@ -553,7 +555,7 @@
       "help": ""
     },
     "Item_Searing_Steel_Blade": {
-      "name": "Ascension: Fire (Guinaifen / Topaz & Numby)",
+      "name": "Ascension: Fire (Guinaifen / Topaz & Numby / Fugue)",
       "help": ""
     },
     "Item_Gelid_Chitin": {
@@ -601,7 +603,7 @@
       "help": ""
     },
     "Item_Chordal_Mirage": {
-      "name": "Ascension: Imaginary (Rappa)",
+      "name": "Ascension: Imaginary (Sunday / Rappa)",
       "help": ""
     },
     "Item_Worldbreaker_Blade": {
@@ -625,7 +627,7 @@
       "help": ""
     },
     "Item_Stellaris_Symphony": {
-      "name": "Trace: The Harmony (Robot Settlement)",
+      "name": "Trace: Harmony (Robot Settlement)",
       "help": ""
     },
     "Item_Flower_of_Eternity": {
@@ -653,7 +655,7 @@
       "help": ""
     },
     "Item_Heavenly_Melody": {
-      "name": "Trace: The Harmony (The Reverie (Dreamscape))",
+      "name": "Trace: Harmony (The Reverie (Dreamscape))",
       "help": ""
     },
     "Item_Myriad_Fruit": {

module/config/i18n/es-ES.json

@@ -270,7 +270,7 @@
       "Stagnant_Shadow_Perdition": "Ascension: Físico (Hanya / Argenti)",
       "Stagnant_Shadow_Duty": "Ascension: Físico (Boothill / Robin / Yunli)",
       "Stagnant_Shadow_Blaze": "Ascension: Fuego (Himeko / Asta / Hook)",
-      "Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
+      "Stagnant_Shadow_Scorch": "Ascension: Fuego (Guinaifen / Topaz y Conti / Fugue)",
       "Stagnant_Shadow_Ire": "Ascension: Fuego (Luciérnaga / Gallagher / Jiaoqiu / Lingsha)",
       "Stagnant_Shadow_Rime": "Ascension: Hielo (Siete de Marzo / Herta / Gepard / Pela)",
       "Stagnant_Shadow_Icicle": "Ascension: Hielo (Yanqing / Jingliu / Ruan Mei)",
@@ -286,7 +286,7 @@
       "Stagnant_Shadow_Roast": "Ascension: Cuántico (Jade / Sparkle)",
       "Stagnant_Shadow_Mirage": "Ascension: Imaginario (Welt / Luocha / Yukong)",
       "Stagnant_Shadow_Puppetry": "Ascension: Imaginario (Dan Heng - Imbibitor Lunae / Aventurino / Dr. Ratio)",
-      "Stagnant_Shadow_Timbre": "Ascension: Imaginario (Rappa)",
+      "Stagnant_Shadow_Timbre": "Ascension: Imaginario (Sunday / Rappa)",
       "Cavern_of_Corrosion_Path_of_Uncertainty": "Cavern_of_Corrosion_Path_of_Uncertainty (Senda de la incertidumbre)",
       "Cavern_of_Corrosion_Path_of_Cavalier": "Artefactos: Ultrarruptura y Adicional de Definitiva (Caverna de la corrosión: Senda del caballero) (Senda del caballero)",
       "Cavern_of_Corrosion_Path_of_Dreamdive": "Artefactos: Debuff y Efecto de Ruptura (Senda de los sueños)",
@@ -406,6 +406,7 @@
       "Feixiao": "Feixiao",
       "Firefly": "Luciérnaga",
       "FuXuan": "Fu Xuan",
+      "Fugue": "Fugue",
       "Gallagher": "Gallagher",
       "Gepard": "Gepard",
       "Guinaifen": "Guinaifen",
@@ -438,6 +439,7 @@
       "Serval": "Serval",
       "SilverWolf": "Silver Wolf",
       "Sparkle": "Sparkle",
+      "Sunday": "Sunday",
       "Sushang": "Sushang",
       "Tingyun": "Tingyun",
       "TopazNumby": "Topaz y Conti",
@@ -553,7 +555,7 @@
       "help": ""
     },
     "Item_Searing_Steel_Blade": {
-      "name": "Ascension: Fuego (Guinaifen / Topaz y Conti)",
+      "name": "Ascension: Fuego (Guinaifen / Topaz y Conti / Fugue)",
       "help": ""
     },
     "Item_Gelid_Chitin": {
@@ -601,7 +603,7 @@
       "help": ""
     },
     "Item_Chordal_Mirage": {
-      "name": "Ascension: Imaginario (Rappa)",
+      "name": "Ascension: Imaginario (Sunday / Rappa)",
       "help": ""
     },
     "Item_Worldbreaker_Blade": {

module/config/i18n/ja-JP.json

@@ -270,7 +270,7 @@
       "Stagnant_Shadow_Perdition": "キャラクター昇格素材：物理（寒鴉 / アルジェンティ）",
       "Stagnant_Shadow_Duty": "キャラクター昇格素材：物理（ブートヒル / ロビン / 雲璃）",
       "Stagnant_Shadow_Blaze": "キャラクター昇格素材：炎（姫子 / アスター / フック）",
-      "Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
+      "Stagnant_Shadow_Scorch": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ / 帰忘の流離人）",
       "Stagnant_Shadow_Ire": "キャラクター昇格素材：炎（ホタル / ギャラガー / 椒丘 / 霊砂）",
       "Stagnant_Shadow_Rime": "キャラクター昇格素材：氷（三月なのか / ヘルタ / ジェパード / ペラ）",
       "Stagnant_Shadow_Icicle": "キャラクター昇格素材：氷（彦卿 / 鏡流 / ルアン・メェイ）",
@@ -286,7 +286,7 @@
       "Stagnant_Shadow_Roast": "キャラクター昇格素材：量子（ジェイド / 花火）",
       "Stagnant_Shadow_Mirage": "キャラクター昇格素材：虚数（ヴェルト / 羅刹 / 御空）",
       "Stagnant_Shadow_Puppetry": "キャラクター昇格素材：虚数（丹恒・飲月 / アベンチュリン / Dr.レイシオ）",
-      "Stagnant_Shadow_Timbre": "キャラクター昇格素材：虚数（乱破）",
+      "Stagnant_Shadow_Timbre": "キャラクター昇格素材：虚数（サンデー / 乱破）",
       "Cavern_of_Corrosion_Path_of_Uncertainty": "Cavern_of_Corrosion_Path_of_Uncertainty（迷識の路）",
       "Cavern_of_Corrosion_Path_of_Cavalier": "侵蝕トンネル・勇騎の路（勇騎の路）",
       "Cavern_of_Corrosion_Path_of_Dreamdive": "侵蝕トンネル・夢潜の路（夢潜の路）",
@@ -406,6 +406,7 @@
       "Feixiao": "飛霄",
       "Firefly": "ホタル",
       "FuXuan": "符玄",
+      "Fugue": "帰忘の流離人",
       "Gallagher": "ギャラガー",
       "Gepard": "ジェパード",
       "Guinaifen": "桂乃芬",
@@ -438,6 +439,7 @@
       "Serval": "セーバル",
       "SilverWolf": "銀狼",
       "Sparkle": "花火",
+      "Sunday": "サンデー",
       "Sushang": "素裳",
       "Tingyun": "停雲",
       "TopazNumby": "トパーズ&カブ",
@@ -553,7 +555,7 @@
       "help": ""
     },
     "Item_Searing_Steel_Blade": {
-      "name": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）",
+      "name": "キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ / 帰忘の流離人）",
       "help": ""
     },
     "Item_Gelid_Chitin": {
@@ -601,7 +603,7 @@
       "help": ""
     },
     "Item_Chordal_Mirage": {
-      "name": "キャラクター昇格素材：虚数（乱破）",
+      "name": "キャラクター昇格素材：虚数（サンデー / 乱破）",
       "help": ""
     },
     "Item_Worldbreaker_Blade": {

module/config/i18n/zh-CN.json

@@ -270,7 +270,7 @@
       "Stagnant_Shadow_Perdition": "角色晋阶材料：物理（寒鸦 / 银枝）",
       "Stagnant_Shadow_Duty": "角色晋阶材料：物理（波提欧 / 知更鸟 / 云璃）",
       "Stagnant_Shadow_Blaze": "角色晋阶材料：火（姬子 / 艾丝妲 / 虎克）",
-      "Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
+      "Stagnant_Shadow_Scorch": "角色晋阶材料：火（桂乃芬 / 托帕&账账 / 忘归人）",
       "Stagnant_Shadow_Ire": "角色晋阶材料：火（流萤 / 加拉赫 / 椒丘 / 灵砂）",
       "Stagnant_Shadow_Rime": "角色晋阶材料：冰（三月七 / 黑塔 / 杰帕德 / 佩拉）",
       "Stagnant_Shadow_Icicle": "角色晋阶材料：冰（彦卿 / 镜流 / 阮•梅）",
@@ -286,7 +286,7 @@
       "Stagnant_Shadow_Roast": "角色晋阶材料：量子（翡翠 / 花火）",
       "Stagnant_Shadow_Mirage": "角色晋阶材料：虚数（瓦尔特 / 罗刹 / 驭空）",
       "Stagnant_Shadow_Puppetry": "角色晋阶材料：虚数（丹恒•饮月 / 砂金 / 真理医生）",
-      "Stagnant_Shadow_Timbre": "角色晋阶材料：虚数（乱破）",
+      "Stagnant_Shadow_Timbre": "角色晋阶材料：虚数（星期日 / 乱破）",
       "Cavern_of_Corrosion_Path_of_Uncertainty": "Cavern_of_Corrosion_Path_of_Uncertainty（迷识之径）",
       "Cavern_of_Corrosion_Path_of_Cavalier": "遗器：超击破套+终追套（勇骑之径）",
       "Cavern_of_Corrosion_Path_of_Dreamdive": "遗器：负面套+击破套（梦潜之径）",
@@ -406,6 +406,7 @@
       "Feixiao": "飞霄",
       "Firefly": "流萤",
       "FuXuan": "符玄",
+      "Fugue": "忘归人",
       "Gallagher": "加拉赫",
       "Gepard": "杰帕德",
       "Guinaifen": "桂乃芬",
@@ -438,6 +439,7 @@
       "Serval": "希露瓦",
       "SilverWolf": "银狼",
       "Sparkle": "花火",
+      "Sunday": "星期日",
       "Sushang": "素裳",
       "Tingyun": "停云",
       "TopazNumby": "托帕&账账",
@@ -553,7 +555,7 @@
       "help": ""
     },
     "Item_Searing_Steel_Blade": {
-      "name": "角色晋阶材料：火（桂乃芬 / 托帕&账账）",
+      "name": "角色晋阶材料：火（桂乃芬 / 托帕&账账 / 忘归人）",
       "help": ""
     },
     "Item_Gelid_Chitin": {
@@ -601,7 +603,7 @@
       "help": ""
     },
     "Item_Chordal_Mirage": {
-      "name": "角色晋阶材料：虚数（乱破）",
+      "name": "角色晋阶材料：虚数（星期日 / 乱破）",
       "help": ""
     },
     "Item_Worldbreaker_Blade": {

module/config/i18n/zh-TW.json

@@ -270,7 +270,7 @@
       "Stagnant_Shadow_Perdition": "角色晉階材料：物理（寒鴉 / 銀枝）",
       "Stagnant_Shadow_Duty": "角色晉階材料：物理（波提歐 / 知更鳥 / 雲璃）",
       "Stagnant_Shadow_Blaze": "角色晉階材料：火（姬子 / 艾絲妲 / 虎克）",
-      "Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
+      "Stagnant_Shadow_Scorch": "角色晉階材料：火（桂乃芬 / 托帕&帳帳 / 忘歸人）",
       "Stagnant_Shadow_Ire": "角色晉階材料：火（流螢 / 加拉赫 / 椒丘 / 靈砂）",
       "Stagnant_Shadow_Rime": "角色晉階材料：冰（三月七 / 黑塔 / 傑帕德 / 佩拉）",
       "Stagnant_Shadow_Icicle": "角色晉階材料：冰（彥卿 / 鏡流 / 阮•梅）",
@@ -286,7 +286,7 @@
       "Stagnant_Shadow_Roast": "角色晉階材料：量子（翡翠 / 花火）",
       "Stagnant_Shadow_Mirage": "角色晉階材料：虛數（瓦爾特 / 羅剎 / 馭空）",
       "Stagnant_Shadow_Puppetry": "角色晉階材料：虛數（丹恆•飲月 / 砂金 / 真理醫生）",
-      "Stagnant_Shadow_Timbre": "角色晉階材料：虛數（亂破）",
+      "Stagnant_Shadow_Timbre": "角色晉階材料：虛數（星期日 / 亂破）",
       "Cavern_of_Corrosion_Path_of_Uncertainty": "Cavern_of_Corrosion_Path_of_Uncertainty（迷識之徑）",
       "Cavern_of_Corrosion_Path_of_Cavalier": "遺器：超擊破套+終追套（勇騎之徑）",
       "Cavern_of_Corrosion_Path_of_Dreamdive": "遺器：負面套+擊破套（（夢潛之徑）",
@@ -406,6 +406,7 @@
       "Feixiao": "飛霄",
       "Firefly": "流螢",
       "FuXuan": "符玄",
+      "Fugue": "忘歸人",
       "Gallagher": "加拉赫",
       "Gepard": "傑帕德",
       "Guinaifen": "桂乃芬",
@@ -438,6 +439,7 @@
       "Serval": "希露瓦",
       "SilverWolf": "銀狼",
       "Sparkle": "花火",
+      "Sunday": "星期日",
       "Sushang": "素裳",
       "Tingyun": "停雲",
       "TopazNumby": "托帕&帳帳",
@@ -553,7 +555,7 @@
       "help": ""
     },
     "Item_Searing_Steel_Blade": {
-      "name": "角色晉階材料：火（桂乃芬 / 托帕&帳帳）",
+      "name": "角色晉階材料：火（桂乃芬 / 托帕&帳帳 / 忘歸人）",
       "help": ""
     },
     "Item_Gelid_Chitin": {
@@ -601,7 +603,7 @@
       "help": ""
     },
     "Item_Chordal_Mirage": {
-      "name": "角色晉階材料：虛數（亂破）",
+      "name": "角色晉階材料：虛數（星期日 / 亂破）",
       "help": ""
     },
     "Item_Worldbreaker_Blade": {

module/ui/switch.py

@@ -1,5 +1,4 @@
 from module.base.base import ModuleBase
-from module.base.button import Button
 from module.base.timer import Timer
 from module.exception import ScriptError
 from module.logger import logger
@@ -29,16 +28,18 @@ class Switch:
                 For example: | [ON] | -> click -> | [OFF] |
         """
         self.name = name
-        self.is_choice = is_selector
+        self.is_selector = is_selector
         self.state_list = []
 
     def add_state(self, state, check_button, click_button=None):
         """
         Args:
-            state (str):
+            state (str): State name but cannot use 'unknown' as state name
             check_button (ButtonWrapper):
             click_button (ButtonWrapper):
         """
+        if state == 'unknown':
+            raise ScriptError(f'Cannot use "unknown" as state name')
         self.state_list.append({
             'state': state,
             'check_button': check_button,
@@ -97,8 +98,7 @@ class Switch:
             if row['state'] == state:
                 return row
 
-        logger.warning(f'Switch {self.name} received an invalid state {state}')
+        raise ScriptError(f'Switch {self.name} received an invalid state: {state}')
-        raise ScriptError(f'Switch {self.name} received an invalid state {state}')
 
     def handle_additional(self, main):
         """
@@ -123,9 +123,9 @@ class Switch:
         logger.info(f'{self.name} set to {state}')
         self.get_data(state)
 
-        counter = 0
         changed = False
-        warning_show_timer = Timer(5, count=10).start()
+        has_unknown = False
+        unknown_timer = Timer(5, count=10).start()
         click_timer = Timer(1, count=3)
         while 1:
             if skip_first_screenshot:
@@ -147,20 +147,39 @@ class Switch:
 
             # Warning
             if current == 'unknown':
-                if warning_show_timer.reached():
+                if unknown_timer.reached():
-                    logger.warning(f'Unknown {self.name} switch')
+                    logger.warning(f'Switch {self.name} has states evaluated to unknown, '
-                    warning_show_timer.reset()
-                    if counter >= 1:
-                        logger.warning(f'{self.name} switch {state} asset has evaluated to unknown too many times, '
                                    f'asset should be re-verified')
-                    counter += 1
+                    has_unknown = True
+                    unknown_timer.reset()
+                # If unknown_timer never reached, don't click when having an unknown state,
+                # the unknown state is probably the switching animation.
+                # If unknown_timer reached once, click target state ignoring whether state is unknown or not,
+                # the unknown state is probably a new state not yet added.
+                # By ignoring new states, Switch.set() can still switch among known states.
+                if not has_unknown:
+                    continue
+            else:
+                # Known state, reset timer
+                unknown_timer.reset()
 
             # Click
             if click_timer.reached():
-                click_state = state if self.is_choice else current
+                if self.is_selector:
+                    # Click target state to switch
+                    click_state = state
+                else:
+                    # If this is a selector, click on current state to switch to another
+                    # But 'unknown' is not clickable, if it is, click target state instead
+                    # assuming all selector states share the same position.
+                    if current == 'unknown':
+                        click_state = state
+                    else:
+                        click_state = current
                 self.click(click_state, main=main)
-                click_timer.reset()
                 changed = True
+                click_timer.reset()
+                unknown_timer.reset()
 
         return changed
 

route/rogue/Combat/Herta_SupplyZone_F2.py

@@ -177,6 +177,47 @@ class Route(RouteBase):
         )
         self.clear_enemy(enemy3.straight_run())
 
+    def Herta_SupplyZone_F2_X599Y249(self):
+        """
+        | Waypoint | Position                  | Direction | Rotation |
+        | -------- | ------------------------- | --------- | -------- |
+        | spawn    | Waypoint((594.3, 247.5)), | 274.2     | 274      |
+        | item1    | Waypoint((578.9, 258.2)), | 282.8     | 276      |
+        | enemy1   | Waypoint((542.2, 246.2)), | 302.7     | 301      |
+        | enemy2   | Waypoint((542.2, 168.6)), | 11.1      | 177      |
+        | enemy3   | Waypoint((586.5, 128.3)), | 87.7      | 260      |
+        | item3    | Waypoint((560.2, 130.9)), | 67.2      | 66       |
+        | exit_    | Waypoint((586.9, 129.8)), | 266.1     | 1        |
+        | exit1    | Waypoint((580.9, 124.3)), | 354.1     | 350      |
+        | exit2    | Waypoint((594.2, 122.2)), | 12.6      | 6        |
+        """
+        self.map_init(plane=Herta_SupplyZone, floor="F2", position=(599.6, 249.2))
+        self.register_domain_exit(
+            Waypoint((586.9, 129.8)), end_rotation=1,
+            left_door=Waypoint((580.9, 124.3)), right_door=Waypoint((594.2, 122.2)))
+        item1 = Waypoint((578.9, 258.2))
+        enemy1 = Waypoint((542.2, 246.2))
+        enemy2 = Waypoint((542.2, 168.6))
+        enemy3 = Waypoint((586.5, 128.3))
+        item3 = Waypoint((560.2, 130.9))
+        # ===== End of generated waypoints =====
+
+        """
+        Notes
+        Herta_SupplyZone_F2_X599Y249 is the same as Herta_SupplyZone_F2_X594Y247
+        but for wrong spawn point detected
+        """
+        self.clear_item(item1)
+        self.clear_enemy(enemy1)
+        self.clear_enemy(enemy2.straight_run())
+
+        self.clear_item(
+            # Go through enemy2 before turning right
+            enemy2,
+            item3.straight_run(),
+        )
+        self.clear_enemy(enemy3.straight_run())
+
     def Herta_SupplyZone_F2_X657Y247(self):
         """
         | Waypoint | Position                  | Direction | Rotation |

route/rogue/route.json

@@ -142,6 +142,17 @@
     ],
     "domain": "Combat"
   },
+  {
+    "name": "Combat_Herta_SupplyZone_F2_X599Y249",
+    "route": "route.rogue.Combat.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X599Y249",
+    "plane": "Herta_SupplyZone",
+    "floor": "F2",
+    "position": [
+      599.6,
+      249.2
+    ],
+    "domain": "Combat"
+  },
   {
     "name": "Combat_Herta_SupplyZone_F2_X657Y247",
     "route": "route.rogue.Combat.Herta_SupplyZone_F2:Herta_SupplyZone_F2_X657Y247",

tasks/base/assets/assets_base_popup.py

@@ -116,3 +116,13 @@ POPUP_SINGLE = ButtonWrapper(
         button=(578, 451, 705, 489),
     ),
 )
+POPUP_STORY_LATER = ButtonWrapper(
+    name='POPUP_STORY_LATER',
+    share=Button(
+        file='./assets/share/base/popup/POPUP_STORY_LATER.png',
+        area=(392, 534, 416, 558),
+        search=(359, 527, 424, 565),
+        color=(111, 103, 91),
+        button=(392, 534, 416, 558),
+    ),
+)

tasks/base/ui.py

@@ -6,6 +6,7 @@ from module.logger import logger
 from module.ocr.ocr import Ocr
 from tasks.base.assets.assets_base_main_page import ROGUE_LEAVE_FOR_NOW, ROGUE_LEAVE_FOR_NOW_OE
 from tasks.base.assets.assets_base_page import CLOSE, MAIN_GOTO_CHARACTER, MAP_EXIT, MAP_EXIT_OE
+from tasks.base.assets.assets_base_popup import POPUP_STORY_LATER
 from tasks.base.main_page import MainPage
 from tasks.base.page import Page, page_gacha, page_main
 from tasks.combat.assets.assets_combat_finish import COMBAT_EXIT
@@ -395,6 +396,9 @@ class UI(MainPage):
             return True
         if self.appear_then_click(INFO_CLOSE, interval=5):
             return True
+        # Popup story that advice you watch it, but no, later
+        if self.appear_then_click(POPUP_STORY_LATER, interval=5):
+            return True
 
         return False
 

tasks/battle_pass/keywords/quest.py

@@ -64,7 +64,7 @@ Clear_Cavern_of_Corrosion_1_times = BattlePassQuest(
     cht='完成1次「侵蝕隧洞」',
     en='Clear Cavern of Corrosion 1 time(s)',
     jp='「侵蝕トンネル」を1回クリアする',
-    es='Completa Caverna de la corrosión 1 vez',
+    es='Completa Caverna de la corrosión 1 veces',
 )
 Consume_a_total_of_1_Trailblaze_Power_1400_Trailblazer_Power_max = BattlePassQuest(
     id=8,

tasks/character/keywords/character_list.py

@@ -156,8 +156,17 @@ FuXuan = CharacterList(
     jp='符玄',
     es='Fu Xuan',
 )
-Gallagher = CharacterList(
+Fugue = CharacterList(
     id=18,
+    name='Fugue',
+    cn='忘归人',
+    cht='忘歸人',
+    en='Fugue',
+    jp='帰忘の流離人',
+    es='Fugue',
+)
+Gallagher = CharacterList(
+    id=19,
     name='Gallagher',
     cn='加拉赫',
     cht='加拉赫',
@@ -166,7 +175,7 @@ Gallagher = CharacterList(
     es='Gallagher',
 )
 Gepard = CharacterList(
-    id=19,
+    id=20,
     name='Gepard',
     cn='杰帕德',
     cht='傑帕德',
@@ -175,7 +184,7 @@ Gepard = CharacterList(
     es='Gepard',
 )
 Guinaifen = CharacterList(
-    id=20,
+    id=21,
     name='Guinaifen',
     cn='桂乃芬',
     cht='桂乃芬',
@@ -184,7 +193,7 @@ Guinaifen = CharacterList(
     es='Guinaifen',
 )
 Hanya = CharacterList(
-    id=21,
+    id=22,
     name='Hanya',
     cn='寒鸦',
     cht='寒鴉',
@@ -193,7 +202,7 @@ Hanya = CharacterList(
     es='Hanya',
 )
 Herta = CharacterList(
-    id=22,
+    id=23,
     name='Herta',
     cn='黑塔',
     cht='黑塔',
@@ -202,7 +211,7 @@ Herta = CharacterList(
     es='Herta',
 )
 Himeko = CharacterList(
-    id=23,
+    id=24,
     name='Himeko',
     cn='姬子',
     cht='姬子',
@@ -211,7 +220,7 @@ Himeko = CharacterList(
     es='Himeko',
 )
 Hook = CharacterList(
-    id=24,
+    id=25,
     name='Hook',
     cn='虎克',
     cht='虎克',
@@ -220,7 +229,7 @@ Hook = CharacterList(
     es='Hook',
 )
 Huohuo = CharacterList(
-    id=25,
+    id=26,
     name='Huohuo',
     cn='藿藿',
     cht='藿藿',
@@ -229,7 +238,7 @@ Huohuo = CharacterList(
     es='Huohuo',
 )
 Jade = CharacterList(
-    id=26,
+    id=27,
     name='Jade',
     cn='翡翠',
     cht='翡翠',
@@ -238,7 +247,7 @@ Jade = CharacterList(
     es='Jade',
 )
 Jiaoqiu = CharacterList(
-    id=27,
+    id=28,
     name='Jiaoqiu',
     cn='椒丘',
     cht='椒丘',
@@ -247,7 +256,7 @@ Jiaoqiu = CharacterList(
     es='Jiaoqiu',
 )
 JingYuan = CharacterList(
-    id=28,
+    id=29,
     name='JingYuan',
     cn='景元',
     cht='景元',
@@ -256,7 +265,7 @@ JingYuan = CharacterList(
     es='Jing Yuan',
 )
 Jingliu = CharacterList(
-    id=29,
+    id=30,
     name='Jingliu',
     cn='镜流',
     cht='鏡流',
@@ -265,7 +274,7 @@ Jingliu = CharacterList(
     es='Jingliu',
 )
 Kafka = CharacterList(
-    id=30,
+    id=31,
     name='Kafka',
     cn='卡芙卡',
     cht='卡芙卡',
@@ -274,7 +283,7 @@ Kafka = CharacterList(
     es='Kafka',
 )
 Lingsha = CharacterList(
-    id=31,
+    id=32,
     name='Lingsha',
     cn='灵砂',
     cht='靈砂',
@@ -283,7 +292,7 @@ Lingsha = CharacterList(
     es='Lingsha',
 )
 Luka = CharacterList(
-    id=32,
+    id=33,
     name='Luka',
     cn='卢卡',
     cht='盧卡',
@@ -292,7 +301,7 @@ Luka = CharacterList(
     es='Luka',
 )
 Luocha = CharacterList(
-    id=33,
+    id=34,
     name='Luocha',
     cn='罗刹',
     cht='羅剎',
@@ -301,7 +310,7 @@ Luocha = CharacterList(
     es='Luocha',
 )
 Lynx = CharacterList(
-    id=34,
+    id=35,
     name='Lynx',
     cn='玲可',
     cht='玲可',
@@ -310,7 +319,7 @@ Lynx = CharacterList(
     es='Lynx',
 )
 March7thPreservation = CharacterList(
-    id=35,
+    id=36,
     name='March7thPreservation',
     cn='三月七•存护',
     cht='三月七•存護',
@@ -319,7 +328,7 @@ March7thPreservation = CharacterList(
     es='Siete de Marzo: Conservación',
 )
 March7thTheHunt = CharacterList(
-    id=36,
+    id=37,
     name='March7thTheHunt',
     cn='三月七•巡猎',
     cht='三月七•巡獵',
@@ -328,7 +337,7 @@ March7thTheHunt = CharacterList(
     es='Siete de Marzo: Cacería',
 )
 Misha = CharacterList(
-    id=37,
+    id=38,
     name='Misha',
     cn='米沙',
     cht='米沙',
@@ -337,7 +346,7 @@ Misha = CharacterList(
     es='Misha',
 )
 Moze = CharacterList(
-    id=38,
+    id=39,
     name='Moze',
     cn='貊泽',
     cht='貊澤',
@@ -346,7 +355,7 @@ Moze = CharacterList(
     es='Moze',
 )
 Natasha = CharacterList(
-    id=39,
+    id=40,
     name='Natasha',
     cn='娜塔莎',
     cht='娜塔莎',
@@ -355,7 +364,7 @@ Natasha = CharacterList(
     es='Natasha',
 )
 Pela = CharacterList(
-    id=40,
+    id=41,
     name='Pela',
     cn='佩拉',
     cht='佩拉',
@@ -364,7 +373,7 @@ Pela = CharacterList(
     es='Pela',
 )
 Qingque = CharacterList(
-    id=41,
+    id=42,
     name='Qingque',
     cn='青雀',
     cht='青雀',
@@ -373,7 +382,7 @@ Qingque = CharacterList(
     es='Qingque',
 )
 Rappa = CharacterList(
-    id=42,
+    id=43,
     name='Rappa',
     cn='乱破',
     cht='亂破',
@@ -382,7 +391,7 @@ Rappa = CharacterList(
     es='Rappa',
 )
 Robin = CharacterList(
-    id=43,
+    id=44,
     name='Robin',
     cn='知更鸟',
     cht='知更鳥',
@@ -391,7 +400,7 @@ Robin = CharacterList(
     es='Robin',
 )
 RuanMei = CharacterList(
-    id=44,
+    id=45,
     name='RuanMei',
     cn='阮•梅',
     cht='阮•梅',
@@ -400,7 +409,7 @@ RuanMei = CharacterList(
     es='Ruan Mei',
 )
 Sampo = CharacterList(
-    id=45,
+    id=46,
     name='Sampo',
     cn='桑博',
     cht='桑博',
@@ -409,7 +418,7 @@ Sampo = CharacterList(
     es='Sampo',
 )
 Seele = CharacterList(
-    id=46,
+    id=47,
     name='Seele',
     cn='希儿',
     cht='希兒',
@@ -418,7 +427,7 @@ Seele = CharacterList(
     es='Seele',
 )
 Serval = CharacterList(
-    id=47,
+    id=48,
     name='Serval',
     cn='希露瓦',
     cht='希露瓦',
@@ -427,7 +436,7 @@ Serval = CharacterList(
     es='Serval',
 )
 SilverWolf = CharacterList(
-    id=48,
+    id=49,
     name='SilverWolf',
     cn='银狼',
     cht='銀狼',
@@ -436,7 +445,7 @@ SilverWolf = CharacterList(
     es='Silver Wolf',
 )
 Sparkle = CharacterList(
-    id=49,
+    id=50,
     name='Sparkle',
     cn='花火',
     cht='花火',
@@ -444,8 +453,17 @@ Sparkle = CharacterList(
     jp='花火',
     es='Sparkle',
 )
+Sunday = CharacterList(
+    id=51,
+    name='Sunday',
+    cn='星期日',
+    cht='星期日',
+    en='Sunday',
+    jp='サンデー',
+    es='Sunday',
+)
 Sushang = CharacterList(
-    id=50,
+    id=52,
     name='Sushang',
     cn='素裳',
     cht='素裳',
@@ -454,7 +472,7 @@ Sushang = CharacterList(
     es='Sushang',
 )
 Tingyun = CharacterList(
-    id=51,
+    id=53,
     name='Tingyun',
     cn='停云',
     cht='停雲',
@@ -463,7 +481,7 @@ Tingyun = CharacterList(
     es='Tingyun',
 )
 TopazNumby = CharacterList(
-    id=52,
+    id=54,
     name='TopazNumby',
     cn='托帕&账账',
     cht='托帕&帳帳',
@@ -472,7 +490,7 @@ TopazNumby = CharacterList(
     es='Topaz y Conti',
 )
 TrailblazerDestruction = CharacterList(
-    id=53,
+    id=55,
     name='TrailblazerDestruction',
     cn='Trailblazer•毁灭',
     cht='Trailblazer•毀滅',
@@ -481,7 +499,7 @@ TrailblazerDestruction = CharacterList(
     es='Trailblazer: Destrucción',
 )
 TrailblazerHarmony = CharacterList(
-    id=54,
+    id=56,
     name='TrailblazerHarmony',
     cn='Trailblazer•同谐',
     cht='Trailblazer•同諧',
@@ -490,7 +508,7 @@ TrailblazerHarmony = CharacterList(
     es='Trailblazer: Armonía',
 )
 TrailblazerPreservation = CharacterList(
-    id=55,
+    id=57,
     name='TrailblazerPreservation',
     cn='Trailblazer•存护',
     cht='Trailblazer•存護',
@@ -499,7 +517,7 @@ TrailblazerPreservation = CharacterList(
     es='Trailblazer: Conservación',
 )
 Welt = CharacterList(
-    id=56,
+    id=58,
     name='Welt',
     cn='瓦尔特',
     cht='瓦爾特',
@@ -508,7 +526,7 @@ Welt = CharacterList(
     es='Welt',
 )
 Xueyi = CharacterList(
-    id=57,
+    id=59,
     name='Xueyi',
     cn='雪衣',
     cht='雪衣',
@@ -517,7 +535,7 @@ Xueyi = CharacterList(
     es='Xueyi',
 )
 Yanqing = CharacterList(
-    id=58,
+    id=60,
     name='Yanqing',
     cn='彦卿',
     cht='彥卿',
@@ -526,7 +544,7 @@ Yanqing = CharacterList(
     es='Yanqing',
 )
 Yukong = CharacterList(
-    id=59,
+    id=61,
     name='Yukong',
     cn='驭空',
     cht='馭空',
@@ -535,7 +553,7 @@ Yukong = CharacterList(
     es='Yukong',
 )
 Yunli = CharacterList(
-    id=60,
+    id=62,
     name='Yunli',
     cn='云璃',
     cht='雲璃',

tasks/character/keywords/height.py

@@ -30,6 +30,7 @@ CHARACTER_HEIGHT = {
     'March7thTheHunt': 'Maid',
     'Lingsha': 'Maid',
     'Rappa': 'Maid',
+    'Fugue': 'Maid',
     'Himeko': 'Lady',
     'Serval': 'Lady',
     'Natasha': 'Lady',
@@ -43,8 +44,10 @@ CHARACTER_HEIGHT = {
     'DanHeng': 'Lad',
     'Luka': 'Lad',
     'DanHengImbibitorLunae': 'Lad',
+    'Sunday': 'Lad',
     'Aventurine': 'Lad',
     'Jiaoqiu': 'Lad',
+    'Sunday': 'Lad',
     'Welt': 'Male',
     'Gepard': 'Male',
     'Sampo': 'Male',

tasks/daily/keywords/daily_quest.py

@@ -37,7 +37,7 @@ Clear_Cavern_of_Corrosion_1_times = DailyQuest(
     cht='完成1次「侵蝕隧洞」',
     en='Clear Cavern of Corrosion 1 time(s)',
     jp='「侵蝕トンネル」を1回クリアする',
-    es='Completa Caverna de la corrosión 1 vez',
+    es='Completa Caverna de la corrosión 1 veces',
 )
 In_a_single_battle_inflict_3_Weakness_Break_of_different_Types = DailyQuest(
     id=6,
@@ -208,7 +208,7 @@ Use_the_Omni_Synthesizer_1_times = DailyQuest(
     cht='使用1次「萬能合成機」',
     en='Use the Omni-Synthesizer 1 time(s)',
     jp='「万能合成マシン」を1回使用する',
-    es='Utiliza la máquina sintetizadora multiusos 1 vez',
+    es='Utiliza la máquina sintetizadora multiusos 1 veces',
 )
 Take_photos_1_times = DailyQuest(
     id=38,

tasks/daily/keywords/daily_quest_state.py

@@ -28,7 +28,7 @@ In_Progress = DailyQuestState(
     cht='進行中',
     en='In Progress',
     jp='進行中',
-    es='En progreso',
+    es='En curso',
 )
 Claimed = DailyQuestState(
     id=4,

tasks/dungeon/keywords/classes.py

@@ -75,8 +75,8 @@ class DungeonList(Keyword):
         for path in RoguePath.instances.values():
             if path.name in self.name:
                 return path
-            elif path.name == 'The_Harmony' and 'Harmony' in self.name:
+            # elif path.name == 'The_Harmony' and 'Harmony' in self.name:
-                return path
+            #     return path
         return None
 
     @cached_property

tasks/dungeon/keywords/dungeon_detailed.py

@@ -105,11 +105,11 @@ Stagnant_Shadow_Abomination = DungeonDetailed(
 Stagnant_Shadow_Scorch = DungeonDetailed(
     id=12,
     name='Stagnant_Shadow_Scorch',
-    cn='角色晋阶材料：火（桂乃芬 / 托帕&账账）',
+    cn='角色晋阶材料：火（桂乃芬 / 托帕&账账 / 忘归人）',
-    cht='角色晉階材料：火（桂乃芬 / 托帕&帳帳）',
+    cht='角色晉階材料：火（桂乃芬 / 托帕&帳帳 / 忘歸人）',
-    en='Ascension: Fire (Guinaifen / Topaz & Numby)',
+    en='Ascension: Fire (Guinaifen / Topaz & Numby / Fugue)',
-    jp='キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ）',
+    jp='キャラクター昇格素材：炎（桂乃芬 / トパーズ&カブ / 帰忘の流離人）',
-    es='Ascension: Fuego (Guinaifen / Topaz y Conti)',
+    es='Ascension: Fuego (Guinaifen / Topaz y Conti / Fugue)',
 )
 Stagnant_Shadow_Celestial = DungeonDetailed(
     id=13,
@@ -168,11 +168,11 @@ Stagnant_Shadow_Duty = DungeonDetailed(
 Stagnant_Shadow_Timbre = DungeonDetailed(
     id=19,
     name='Stagnant_Shadow_Timbre',
-    cn='角色晋阶材料：虚数（乱破）',
+    cn='角色晋阶材料：虚数（星期日 / 乱破）',
-    cht='角色晉階材料：虛數（亂破）',
+    cht='角色晉階材料：虛數（星期日 / 亂破）',
-    en='Ascension: Imaginary (Rappa)',
+    en='Ascension: Imaginary (Sunday / Rappa)',
-    jp='キャラクター昇格素材：虚数（乱破）',
+    jp='キャラクター昇格素材：虚数（サンデー / 乱破）',
-    es='Ascension: Imaginario (Rappa)',
+    es='Ascension: Imaginario (Sunday / Rappa)',
 )
 Stagnant_Shadow_Mechwolf = DungeonDetailed(
     id=20,

tasks/dungeon/keywords/dungeon_entrance.py

@@ -19,7 +19,7 @@ Teleport = DungeonEntrance(
     cht='傳送',
     en='Teleport',
     jp='テレポート',
-    es='Teletransportarse',
+    es='Ir',
 )
 Navigate = DungeonEntrance(
     id=3,

tasks/dungeon/keywords/nav.py

@@ -81,7 +81,7 @@ Latest_Update = DungeonNav(
     cn='最近更新',
     cht='最近更新',
     en='Latest Update',
-    jp='更新情報',
+    jp='最近更新',
     es='Actualización reciente',
 )
 Forgotten_Hall = DungeonNav(

tasks/dungeon/ui/nav.py

@@ -101,7 +101,7 @@ class DungeonUINav(UI):
             bool: If UI switched
 
         Examples:
-            self = DungeonUI('alas')
+            self = DungeonUINav('src')
             self.device.screenshot()
             self.dungeon_tab_goto(KEYWORDS_DUNGEON_TAB.Operation_Briefing)
             self.dungeon_tab_goto(KEYWORDS_DUNGEON_TAB.Daily_Training)

tasks/item/keywords/tab.py

@@ -12,14 +12,14 @@ UpgradeMaterials = ItemTab(
     jp='育成素材',
     es='Materiales de mejora',
 )
-LightCones = ItemTab(
+LightCone = ItemTab(
     id=2,
-    name='LightCones',
+    name='LightCone',
     cn='光锥',
     cht='光錐',
-    en='Light Cones',
+    en='Light Cone',
     jp='光円錐',
-    es='Conos de luz',
+    es='Cono de luz',
 )
 Relics = ItemTab(
     id=3,

tasks/item/ui.py

@@ -37,7 +37,7 @@ SWITCH_ITEM_TAB.add_state(
     click_button=UPGRADE_MATERIAL_CLICK
 )
 SWITCH_ITEM_TAB.add_state(
-    KEYWORDS_ITEM_TAB.LightCones,
+    KEYWORDS_ITEM_TAB.LightCone,
     check_button=LIGHT_CONE_CHECK,
     click_button=LIGHT_CONE_CLICK
 )

tasks/map/keywords/plane.py

@@ -10,7 +10,7 @@ Special_HertaOffice = MapPlane(
     cht='黑塔的辦公室',
     en="Herta's Office",
     jp='ヘルタのオフィス',
-    es='oficina de Herta',
+    es='Oficina de Herta',
     world_id=-1,
     plane_id=1,
 )
@@ -146,8 +146,19 @@ Penacony_TheSoaringClockHand = MapPlane(
     world_id=3,
     plane_id=4,
 )
-Herta_ParlorCar = MapPlane(
+Herta_PartyCar = MapPlane(
     id=14,
+    name='Herta_PartyCar',
+    cn='派对车厢',
+    cht='派對車廂',
+    en='Party Car',
+    jp='パーティー車両',
+    es='Vagón de fiestas',
+    world_id=0,
+    plane_id=1000003,
+)
+Herta_ParlorCar = MapPlane(
+    id=15,
     name='Herta_ParlorCar',
     cn='观景车厢',
     cht='觀景車廂',
@@ -157,8 +168,19 @@ Herta_ParlorCar = MapPlane(
     world_id=0,
     plane_id=1000001,
 )
+Herta_PassengerCabin = MapPlane(
+    id=16,
+    name='Herta_PassengerCabin',
+    cn='客房车厢',
+    cht='客房車廂',
+    en='Passenger Cabin',
+    jp='客室車両',
+    es='Vagón dormitorio',
+    world_id=0,
+    plane_id=1000002,
+)
 Herta_MasterControlZone = MapPlane(
-    id=15,
+    id=17,
     name='Herta_MasterControlZone',
     cn='主控舱段',
     cht='主控艙段',
@@ -169,7 +191,7 @@ Herta_MasterControlZone = MapPlane(
     plane_id=1000101,
 )
 Herta_BaseZone = MapPlane(
-    id=16,
+    id=18,
     name='Herta_BaseZone',
     cn='基座舱段',
     cht='基座艙段',
@@ -180,7 +202,7 @@ Herta_BaseZone = MapPlane(
     plane_id=2000101,
 )
 Herta_StorageZone = MapPlane(
-    id=17,
+    id=19,
     name='Herta_StorageZone',
     cn='收容舱段',
     cht='收容艙段',
@@ -191,7 +213,7 @@ Herta_StorageZone = MapPlane(
     plane_id=2000201,
 )
 Herta_SupplyZone = MapPlane(
-    id=18,
+    id=20,
     name='Herta_SupplyZone',
     cn='支援舱段',
     cht='支援艙段',
@@ -202,7 +224,7 @@ Herta_SupplyZone = MapPlane(
     plane_id=2000301,
 )
 Herta_SeclusionZone = MapPlane(
-    id=19,
+    id=21,
     name='Herta_SeclusionZone',
     cn='禁闭舱段',
     cht='禁閉艙段',
@@ -213,7 +235,7 @@ Herta_SeclusionZone = MapPlane(
     plane_id=2000401,
 )
 Jarilo_AdministrativeDistrict = MapPlane(
-    id=20,
+    id=22,
     name='Jarilo_AdministrativeDistrict',
     cn='行政区',
     cht='行政區',
@@ -224,7 +246,7 @@ Jarilo_AdministrativeDistrict = MapPlane(
     plane_id=1010101,
 )
 Jarilo_OutlyingSnowPlains = MapPlane(
-    id=21,
+    id=23,
     name='Jarilo_OutlyingSnowPlains',
     cn='城郊雪原',
     cht='城郊雪原',
@@ -235,7 +257,7 @@ Jarilo_OutlyingSnowPlains = MapPlane(
     plane_id=2010101,
 )
 Jarilo_BackwaterPass = MapPlane(
-    id=22,
+    id=24,
     name='Jarilo_BackwaterPass',
     cn='边缘通路',
     cht='邊緣通道',
@@ -246,7 +268,7 @@ Jarilo_BackwaterPass = MapPlane(
     plane_id=2011101,
 )
 Jarilo_SilvermaneGuardRestrictedZone = MapPlane(
-    id=23,
+    id=25,
     name='Jarilo_SilvermaneGuardRestrictedZone',
     cn='铁卫禁区',
     cht='鐵衛禁區',
@@ -257,7 +279,7 @@ Jarilo_SilvermaneGuardRestrictedZone = MapPlane(
     plane_id=2013101,
 )
 Jarilo_CorridorofFadingEchoes = MapPlane(
-    id=24,
+    id=26,
     name='Jarilo_CorridorofFadingEchoes',
     cn='残响回廊',
     cht='殘響迴廊',
@@ -268,7 +290,7 @@ Jarilo_CorridorofFadingEchoes = MapPlane(
     plane_id=2013201,
 )
 Jarilo_EverwinterHill = MapPlane(
-    id=25,
+    id=27,
     name='Jarilo_EverwinterHill',
     cn='永冬岭',
     cht='永冬嶺',
@@ -279,7 +301,7 @@ Jarilo_EverwinterHill = MapPlane(
     plane_id=2013401,
 )
 Jarilo_PillarsofCreation = MapPlane(
-    id=26,
+    id=28,
     name='Jarilo_PillarsofCreation',
     cn='造物之柱',
     cht='造物之柱',
@@ -290,7 +312,7 @@ Jarilo_PillarsofCreation = MapPlane(
     plane_id=2013501,
 )
 Jarilo_OldWeaponTestingGround = MapPlane(
-    id=27,
+    id=29,
     name='Jarilo_OldWeaponTestingGround',
     cn='旧武器试验场',
     cht='舊武器試驗場',
@@ -301,7 +323,7 @@ Jarilo_OldWeaponTestingGround = MapPlane(
     plane_id=2013601,
 )
 Jarilo_BoulderTown = MapPlane(
-    id=28,
+    id=30,
     name='Jarilo_BoulderTown',
     cn='磐岩镇',
     cht='磐岩鎮',
@@ -312,7 +334,7 @@ Jarilo_BoulderTown = MapPlane(
     plane_id=1010201,
 )
 Jarilo_GreatMine = MapPlane(
-    id=29,
+    id=31,
     name='Jarilo_GreatMine',
     cn='大矿区',
     cht='大礦區',
@@ -323,7 +345,7 @@ Jarilo_GreatMine = MapPlane(
     plane_id=2012101,
 )
 Jarilo_RivetTown = MapPlane(
-    id=30,
+    id=32,
     name='Jarilo_RivetTown',
     cn='铆钉镇',
     cht='鉚釘鎮',
@@ -334,7 +356,7 @@ Jarilo_RivetTown = MapPlane(
     plane_id=2012201,
 )
 Jarilo_RobotSettlement = MapPlane(
-    id=31,
+    id=33,
     name='Jarilo_RobotSettlement',
     cn='机械聚落',
     cht='機械聚落',
@@ -345,7 +367,7 @@ Jarilo_RobotSettlement = MapPlane(
     plane_id=2012301,
 )
 Luofu_CentralStarskiffHaven = MapPlane(
-    id=32,
+    id=34,
     name='Luofu_CentralStarskiffHaven',
     cn='星槎海中枢',
     cht='星槎海中樞',
@@ -356,7 +378,7 @@ Luofu_CentralStarskiffHaven = MapPlane(
     plane_id=1020101,
 )
 Luofu_Cloudford = MapPlane(
-    id=33,
+    id=35,
     name='Luofu_Cloudford',
     cn='流云渡',
     cht='流雲渡',
@@ -367,7 +389,7 @@ Luofu_Cloudford = MapPlane(
     plane_id=2021101,
 )
 Luofu_StargazerNavalia = MapPlane(
-    id=34,
+    id=36,
     name='Luofu_StargazerNavalia',
     cn='迴星港',
     cht='迴星港',
@@ -378,7 +400,7 @@ Luofu_StargazerNavalia = MapPlane(
     plane_id=2021201,
 )
 Luofu_ExaltingSanctum = MapPlane(
-    id=35,
+    id=37,
     name='Luofu_ExaltingSanctum',
     cn='长乐天',
     cht='長樂天',
@@ -389,7 +411,7 @@ Luofu_ExaltingSanctum = MapPlane(
     plane_id=1020201,
 )
 Luofu_AurumAlley = MapPlane(
-    id=36,
+    id=38,
     name='Luofu_AurumAlley',
     cn='金人巷',
     cht='金人巷',
@@ -400,7 +422,7 @@ Luofu_AurumAlley = MapPlane(
     plane_id=1020204,
 )
 Luofu_DivinationCommission = MapPlane(
-    id=37,
+    id=39,
     name='Luofu_DivinationCommission',
     cn='太卜司',
     cht='太卜司',
@@ -411,7 +433,7 @@ Luofu_DivinationCommission = MapPlane(
     plane_id=2022101,
 )
 Luofu_ArtisanshipCommission = MapPlane(
-    id=38,
+    id=40,
     name='Luofu_ArtisanshipCommission',
     cn='工造司',
     cht='工造司',
@@ -422,7 +444,7 @@ Luofu_ArtisanshipCommission = MapPlane(
     plane_id=2022201,
 )
 Luofu_FyxestrollGarden = MapPlane(
-    id=39,
+    id=41,
     name='Luofu_FyxestrollGarden',
     cn='绥园',
     cht='綏園',
@@ -433,7 +455,7 @@ Luofu_FyxestrollGarden = MapPlane(
     plane_id=2022301,
 )
 Luofu_AlchemyCommission = MapPlane(
-    id=40,
+    id=42,
     name='Luofu_AlchemyCommission',
     cn='丹鼎司',
     cht='丹鼎司',
@@ -444,7 +466,7 @@ Luofu_AlchemyCommission = MapPlane(
     plane_id=2023101,
 )
 Luofu_ScalegorgeWaterscape = MapPlane(
-    id=41,
+    id=43,
     name='Luofu_ScalegorgeWaterscape',
     cn='鳞渊境',
     cht='鱗淵境',
@@ -455,7 +477,7 @@ Luofu_ScalegorgeWaterscape = MapPlane(
     plane_id=2023201,
 )
 Luofu_TheShacklingPrison = MapPlane(
-    id=42,
+    id=44,
     name='Luofu_TheShacklingPrison',
     cn='幽囚狱',
     cht='幽囚獄',
@@ -466,7 +488,7 @@ Luofu_TheShacklingPrison = MapPlane(
     plane_id=2024101,
 )
 Luofu_Skysplitter = MapPlane(
-    id=43,
+    id=45,
     name='Luofu_Skysplitter',
     cn='竞锋舰',
     cht='競鋒艦',
@@ -477,7 +499,7 @@ Luofu_Skysplitter = MapPlane(
     plane_id=2024201,
 )
 Penacony_TheReverieReality = MapPlane(
-    id=44,
+    id=46,
     name='Penacony_TheReverieReality',
     cn='「白日梦」酒店-现实',
     cht='「白日夢」飯店-現實',
@@ -488,7 +510,7 @@ Penacony_TheReverieReality = MapPlane(
     plane_id=1030501,
 )
 Penacony_GoldenHour = MapPlane(
-    id=45,
+    id=47,
     name='Penacony_GoldenHour',
     cn='黄金的时刻',
     cht='黃金的時刻',
@@ -499,7 +521,7 @@ Penacony_GoldenHour = MapPlane(
     plane_id=1030101,
 )
 Penacony_DreamEdge = MapPlane(
-    id=46,
+    id=48,
     name='Penacony_DreamEdge',
     cn='筑梦边境',
     cht='築夢邊境',
@@ -510,7 +532,7 @@ Penacony_DreamEdge = MapPlane(
     plane_id=2031301,
 )
 Penacony_AChildDream = MapPlane(
-    id=47,
+    id=49,
     name='Penacony_AChildDream',
     cn='稚子的梦',
     cht='稚子的夢',
@@ -521,7 +543,7 @@ Penacony_AChildDream = MapPlane(
     plane_id=2031201,
 )
 Penacony_TheReverieDreamscape = MapPlane(
-    id=48,
+    id=50,
     name='Penacony_TheReverieDreamscape',
     cn='「白日梦」酒店-梦境',
     cht='「白日夢」飯店-夢境',
@@ -532,7 +554,7 @@ Penacony_TheReverieDreamscape = MapPlane(
     plane_id=2031101,
 )
 Penacony_DewlightPavilion = MapPlane(
-    id=49,
+    id=51,
     name='Penacony_DewlightPavilion',
     cn='朝露公馆',
     cht='朝露公館',
@@ -543,7 +565,7 @@ Penacony_DewlightPavilion = MapPlane(
     plane_id=2032201,
 )
 Penacony_ClockStudiosThemePark = MapPlane(
-    id=50,
+    id=52,
     name='Penacony_ClockStudiosThemePark',
     cn='克劳克影视乐园',
     cht='克勞克影視樂園',
@@ -554,7 +576,7 @@ Penacony_ClockStudiosThemePark = MapPlane(
     plane_id=2032101,
 )
 Penacony_DreamfluxReef = MapPlane(
-    id=51,
+    id=53,
     name='Penacony_DreamfluxReef',
     cn='流梦礁',
     cht='流夢礁',
@@ -565,7 +587,7 @@ Penacony_DreamfluxReef = MapPlane(
     plane_id=1030401,
 )
 Penacony_SoulGladScorchsandAuditionVenue = MapPlane(
-    id=52,
+    id=54,
     name='Penacony_SoulGladScorchsandAuditionVenue',
     cn='苏乐达热砂海选会场',
     cht='蘇樂達熱砂海選會場',
@@ -576,7 +598,7 @@ Penacony_SoulGladScorchsandAuditionVenue = MapPlane(
     plane_id=2033101,
 )
 Penacony_PenaconyGrandTheater = MapPlane(
-    id=53,
+    id=55,
     name='Penacony_PenaconyGrandTheater',
     cn='匹诺康尼大剧院',
     cht='匹諾康尼大劇院',
@@ -587,7 +609,7 @@ Penacony_PenaconyGrandTheater = MapPlane(
     plane_id=2033201,
 )
 Penacony_PenaconyPaperfoldUniversityCollege = MapPlane(
-    id=55,
+    id=57,
     name='Penacony_PenaconyPaperfoldUniversityCollege',
     cn='匹诺康尼折纸大学学院',
     cht='匹諾康尼摺紙大學學院',

tasks/rogue/keywords/bonus.py

@@ -300,3 +300,21 @@ Boundless_Sea = RogueBonus(
     jp='果てなき海',
     es='Mar infinito',
 )
+Aether_Well = RogueBonus(
+    id=34,
+    name='Aether_Well',
+    cn='以太井',
+    cht='乙太井',
+    en='Aether Well',
+    jp='エーテル井戸',
+    es='Pozo etéreo',
+)
+Silent_Orifice = RogueBonus(
+    id=35,
+    name='Silent_Orifice',
+    cn='静默孔',
+    cht='靜默孔',
+    en='Silent Orifice',
+    jp='沈黙の孔',
+    es='Agujero de la quietud',
+)

tasks/rogue/keywords/curio.py

@@ -1371,3 +1371,111 @@ Tangible_Luck = RogueCurio(
     jp='幸運の形',
     es='Suerte tangible',
 )
+Road_of_Prayers = RogueCurio(
+    id=153,
+    name='Road_of_Prayers',
+    cn='祈祷之路',
+    cht='祈禱之路',
+    en='Road of Prayers',
+    jp='祈りの道',
+    es='Camino de plegarias',
+)
+Automated_Experience = RogueCurio(
+    id=154,
+    name='Automated_Experience',
+    cn='自动化体验',
+    cht='自動化體驗',
+    en='Automated Experience',
+    jp='オートメーション',
+    es='Experiencia automatizada',
+)
+High_Calorie_Diet = RogueCurio(
+    id=155,
+    name='High_Calorie_Diet',
+    cn='高热饮食',
+    cht='高熱飲食',
+    en='High-Calorie Diet',
+    jp='高カロリー食',
+    es='Dieta calórica',
+)
+Peace_Box = RogueCurio(
+    id=156,
+    name='Peace_Box',
+    cn='和平箱',
+    cht='和平箱',
+    en='Peace Box',
+    jp='平和の箱',
+    es='Caja de paz',
+)
+The_Story_Presently = RogueCurio(
+    id=157,
+    name='The_Story_Presently',
+    cn='故事的现在时',
+    cht='故事的現在時',
+    en='The Story Presently',
+    jp='物語の現在',
+    es='La historia actual',
+)
+Genius_Society_Dangerous_Gossip = RogueCurio(
+    id=158,
+    name='Genius_Society_Dangerous_Gossip',
+    cn='天才俱乐部危险八卦',
+    cht='天才俱樂部危險八卦',
+    en="Genius Society's Dangerous Gossip",
+    jp='天才クラブの危険な噂',
+    es='Chisme peligroso del Círculo de Genios',
+)
+Hero_Triumphant_Return = RogueCurio(
+    id=159,
+    name='Hero_Triumphant_Return',
+    cn='英雄凯旋',
+    cht='英雄凱旋',
+    en="Hero's Triumphant Return",
+    jp='英雄の凱旋',
+    es='Regreso triunfante del héroe',
+)
+Unmanned_Comms = RogueCurio(
+    id=160,
+    name='Unmanned_Comms',
+    cn='无人通讯',
+    cht='無人通訊',
+    en='Unmanned Comms',
+    jp='応答なき通信',
+    es='Comunicaciones no tripuladas',
+)
+Doomsday_Compound_Eye_Early_Access_Version = RogueCurio(
+    id=161,
+    name='Doomsday_Compound_Eye_Early_Access_Version',
+    cn='末日复眼•先行版',
+    cht='末日複眼•首發版',
+    en='Doomsday Compound Eye — Early Access Version',
+    jp='終末の複眼･先行版',
+    es='Ojo del fin del mundo (versión de acceso anticipado)',
+)
+Towat_Cards = RogueCurio(
+    id=162,
+    name='Towat_Cards',
+    cn='奥塔牌',
+    cht='奧塔牌',
+    en='Towat Cards',
+    jp='オトッタカード',
+    es='Cartas de Towat',
+)
+High_Calorie_Diet_Decrypted = RogueCurio(
+    id=163,
+    name='High_Calorie_Diet_Decrypted',
+    cn='高热饮食（破解版）',
+    cht='高熱飲食（破解版）',
+    en='High-Calorie Diet (Decrypted)',
+    jp='高カロリー食（クラック版）',
+    es='Dieta calórica (versión pirateada)',
+)
+Unmanned_Comms_Decrypted = RogueCurio(
+    id=164,
+    name='Unmanned_Comms_Decrypted',
+    cn='无人通讯（破解版）',
+    cht='無人通訊（破解版）',
+    en='Unmanned Comms (Decrypted)',
+    jp='応答なき通信（クラック版）',
+    es='Comunicaciones no tripuladas (versión pirateada)',
+)

tasks/rogue/keywords/event_option.py

@@ -2493,7 +2493,7 @@ A_perfect_man_needs_a_popular_gacha_toy = RogueEventOption(
     cn='完美型男需要「潮流扭蛋人」。',
     cht='完美型男需要「潮流扭蛋人」。',
     en='A perfect man needs a "popular gacha toy."',
-    jp='美形ハンサムには「トレンドガチャマン」が必要だ',
+    jp='美形ハンサムには「流行のガチャ人形」が必要だ',
     es='Una persona perfecta necesita un juguete gacha popular.',
 )
 A_perfectionist_wants_them_all = RogueEventOption(
@@ -4647,3 +4647,264 @@ A_joke_about_a_broken_mask = RogueEventOption(
     jp='割れた仮面のジョーク',
     es='Un chiste sobre una máscara rota.',
 )
+Just_a_cursory_amount_for_show = RogueEventOption(
+    id=517,
+    name='Just_a_cursory_amount_for_show',
+    cn='象征性意思意思',
+    cht='客氣一下而已',
+    en='Just a cursory amount for show',
+    jp='少しだけ誠意を見せる',
+    es='Compra solo una pequeña cantidad para quedar bien',
+)
+Buy_more_to_gift_friends_and_family = RogueEventOption(
+    id=518,
+    name='Buy_more_to_gift_friends_and_family',
+    cn='多买点送亲戚朋友',
+    cht='多買一點送親朋好友',
+    en='Buy more to gift friends and family',
+    jp='もっと買って親戚や友人のお土産にする',
+    es='Compra muchos regalos para la familia y los amigos',
+)
+Buy_everything_in_this_vending_machine = RogueEventOption(
+    id=519,
+    name='Buy_everything_in_this_vending_machine',
+    cn='这台售货机，你承包了！',
+    cht='這台販賣機，你承包了！',
+    en='Buy everything in this vending machine!',
+    jp='この自動販売機のものを全部買う！',
+    es='¡Compra todo lo que hay en esta máquina expendedora!',
+)
+You_decide_to_do_as_the_locals_do = RogueEventOption(
+    id=520,
+    name='You_decide_to_do_as_the_locals_do',
+    cn='你决定入乡随俗',
+    cht='你決定入鄉隨俗',
+    en='You decide to do as the locals do',
+    jp='郷に入っては郷に従うことに決めた',
+    es='Decides que "donde fueres, haz lo que vieres"',
+)
+Knock_out_the_golden_head_of_tricks = RogueEventOption(
+    id=521,
+    name='Knock_out_the_golden_head_of_tricks',
+    cn='敲晕手法的黄金脑袋',
+    cht='敲暈手法的黃金腦袋',
+    en='Knock out the golden head of tricks',
+    jp='トリックを推理するゴールデンヘッドを気絶させる',
+    es='Golpea la cabeza dorada de los trucos',
+)
+Knock_out_the_diamond_head_of_motives = RogueEventOption(
+    id=522,
+    name='Knock_out_the_diamond_head_of_motives',
+    cn='敲晕动机的钻石脑袋',
+    cht='敲暈動機的鑽石腦袋',
+    en='Knock out the diamond head of motives',
+    jp='動機を推理するダイヤモンドヘッドを気絶させる',
+    es='Golpea la cabeza de diamante de los motivos',
+)
+Wide_broad_strokes = RogueEventOption(
+    id=523,
+    name='Wide_broad_strokes',
+    cn='大笔一挥',
+    cht='大筆一揮',
+    en='Wide, broad strokes',
+    jp='絵を描く',
+    es='Pinceladas grandes y amplias',
+)
+Give_up_on_painting = RogueEventOption(
+    id=524,
+    name='Give_up_on_painting',
+    cn='放弃作画',
+    cht='放棄作畫',
+    en='Give up on painting',
+    jp='絵を描くのを諦める',
+    es='Deja de pintar',
+)
+Learn_from_a_master = RogueEventOption(
+    id=525,
+    name='Learn_from_a_master',
+    cn='拜师学艺',
+    cht='拜師學藝',
+    en='Learn from a master',
+    jp='師匠について学ぶ',
+    es='Aprende del maestro',
+)
+Purchase_high_quality_paints = RogueEventOption(
+    id=526,
+    name='Purchase_high_quality_paints',
+    cn='购买高级颜料',
+    cht='購買高級顏料',
+    en='Purchase high-quality paints',
+    jp='高級絵の具を購入する',
+    es='Compra pinturas de buena calidad',
+)
+Hire_a_local_illustrator = RogueEventOption(
+    id=527,
+    name='Hire_a_local_illustrator',
+    cn='聘请本地绘师',
+    cht='聘請本地繪師',
+    en='Hire a local illustrator',
+    jp='現地の画家を雇う',
+    es='Contrata a un artista local',
+)
+Offer_fury_to_the_deceased_king = RogueEventOption(
+    id=528,
+    name='Offer_fury_to_the_deceased_king',
+    cn='向已死之王献上愤怒',
+    cht='向已死之王獻上憤怒',
+    en='Offer fury to the deceased king',
+    jp='死した王に怒りを捧げる',
+    es='Ofrece furia al difunto rey',
+)
+Leave_this_gloomy_place = RogueEventOption(
+    id=529,
+    name='Leave_this_gloomy_place',
+    cn='离开这个阴沉的地方',
+    cht='離開這個陰沉的地方',
+    en='Leave this gloomy place',
+    jp='この陰鬱な場所を離れる',
+    es='Sal de este lugar sombrío',
+)
+Leave_with_the_Wrath_King_treasure = RogueEventOption(
+    id=530,
+    name='Leave_with_the_Wrath_King_treasure',
+    cn='带走嗔王的宝藏',
+    cht='帶走嗔王的寶藏',
+    en="Leave with the Wrath King's treasure",
+    jp='怒りの王の宝物を持ち去る',
+    es='Toma el tesoro del Rey de la Ira',
+)
+Leave_with_the_Wrath_King_memories = RogueEventOption(
+    id=531,
+    name='Leave_with_the_Wrath_King_memories',
+    cn='带走嗔王的回忆',
+    cht='帶走嗔王的回憶',
+    en="Leave with the Wrath King's memories",
+    jp='怒りの王の思い出を持ち去る',
+    es='Toma los recuerdos del Rey de la Ira',
+)
+Change_my_future = RogueEventOption(
+    id=532,
+    name='Change_my_future',
+    cn='改变我的未来',
+    cht='改變我的未來',
+    en='Change my future',
+    jp='の未来を変える',
+    es='Cambia mi futuro',
+)
+Abandon_the_suspicious_divination = RogueEventOption(
+    id=533,
+    name='Abandon_the_suspicious_divination',
+    cn='放弃可疑的占卜',
+    cht='放棄可疑的占卜',
+    en='Abandon the suspicious divination',
+    jp='怪しい占いを無視する',
+    es='Rehúsa la adivinación sospechosa',
+)
+Collect_the_remaining_data = RogueEventOption(
+    id=534,
+    name='Collect_the_remaining_data',
+    cn='收拾残存的数据',
+    cht='收拾殘存的資料',
+    en='Collect the remaining data',
+    jp='残りのデータを片付ける',
+    es='Reúne los datos restantes',
+)
+Gather_more_of_the_deep_data = RogueEventOption(
+    id=535,
+    name='Gather_more_of_the_deep_data',
+    cn='捞取更多深层数据',
+    cht='挖掘更多深層資料',
+    en='Gather more of the deep data',
+    jp='深層のデータをさらに引き上げる',
+    es='Reúne más datos profundos',
+)
+Float_toward_the_surface_data = RogueEventOption(
+    id=536,
+    name='Float_toward_the_surface_data',
+    cn='向数据表层上浮',
+    cht='挪移至資料表層',
+    en='Float toward the surface data',
+    jp='データの表層へ浮上する',
+    es='Flota hacia la superficie de los datos',
+)
+Gummy_candies_so_spicy_that_they_make_one_rethink_life = RogueEventOption(
+    id=537,
+    name='Gummy_candies_so_spicy_that_they_make_one_rethink_life',
+    cn='辣到怀疑人生的软糖',
+    cht='辣到懷疑人生的軟糖',
+    en='Gummy candies so spicy that they make one rethink life',
+    jp='人生の走馬灯が見える激辛グミ',
+    es='Golosinas tan picantes que te hacen dudar de la vida',
+)
+Hard_crack_candies_so_numbing_that_make_one_reconsider_monsterdom = RogueEventOption(
+    id=538,
+    name='Hard_crack_candies_so_numbing_that_make_one_reconsider_monsterdom',
+    cn='麻到怀疑妖生的硬糖',
+    cht='麻到懷疑妖生的硬糖',
+    en='Hard-crack candies so numbing that make one reconsider monsterdom',
+    jp='妖生の走馬灯が見える麻辣キャンディー',
+    es='Golosinas que te entumecen la lengua',
+)
+Fruit_candies_mumbling_speechlessly = RogueEventOption(
+    id=539,
+    name='Fruit_candies_mumbling_speechlessly',
+    cn='叽里咕噜无语水果糖',
+    cht='嘰哩咕嚕無言水果糖',
+    en='Fruit candies mumbling speechlessly',
+    jp='食べると言葉を失うフルーツキャンディー',
+    es='Caramelos de frutas que murmuran sin decir nada',
+)
+Punish_and_vanquish_evil = RogueEventOption(
+    id=540,
+    name='Punish_and_vanquish_evil',
+    cn='惩凶除恶',
+    cht='懲凶除惡',
+    en='Punish and vanquish evil',
+    jp='悪を懲らしめる',
+    es='Erradica el mal',
+)
+Protect_peace = RogueEventOption(
+    id=541,
+    name='Protect_peace',
+    cn='守望安宁',
+    cht='守望安寧',
+    en='Protect peace',
+    jp='平和を見守る',
+    es='Protege la paz',
+)
+I_want_to_eliminate_the_wicked = RogueEventOption(
+    id=542,
+    name='I_want_to_eliminate_the_wicked',
+    cn='我要剿灭奸邪之徒',
+    cht='我要剿滅奸邪之徒',
+    en='I want to eliminate the wicked',
+    jp='悪党を滅ぼしたい',
+    es='Quiero acabar con los malvados',
+)
+I_want_to_suppress_dangerous_entities = RogueEventOption(
+    id=543,
+    name='I_want_to_suppress_dangerous_entities',
+    cn='我要镇压危险之物',
+    cht='我要鎮壓危險之物',
+    en='I want to suppress dangerous entities',
+    jp='危険な存在を抑え込みたい',
+    es='Quiero eliminar los peligros',
+)
+I_will_stand_upon_the_Wardance_arena = RogueEventOption(
+    id=544,
+    name='I_will_stand_upon_the_Wardance_arena',
+    cn='我要登上演武仪典的擂台',
+    cht='我要登上演武儀典的擂台',
+    en="I will stand upon the Wardance's arena",
+    jp='演武典礼の演武台に上がりたい',
+    es='Quiero salir a la arena de la ceremonia de Habilidades Estelares de Combate',
+)
+I_will_rout_the_abominations_of_the_Plague_Author = RogueEventOption(
+    id=545,
+    name='I_will_rout_the_abominations_of_the_Plague_Author',
+    cn='我要去击退寿瘟的孽物',
+    cht='我要去擊退壽瘟的孽物',
+    en='I will rout the abominations of the Plague Author',
+    jp='寿瘟の忌み物を撃退したい',
+    es='Quiero derrotar a las abominaciones de la Hacedora de Plagas',
+)

tasks/rogue/keywords/event_title.py

@@ -1600,7 +1600,7 @@ Ship_of_Fools = RogueEventTitle(
     cht='愚人船',
     en='Ship of Fools',
     jp='阿呆船',
-    es='El barco de los tontos',
+    es='El barco de los Bufones',
     option_ids=[511, 512, 513, 514, 515, 516],
 )
 Stephen = RogueEventTitle(
@@ -1613,3 +1613,103 @@ Stephen = RogueEventTitle(
     es='Stephen',
     option_ids=[5, 6, 7, 8, 10],
 )
+Blue_Ocean_Strategy = RogueEventTitle(
+    id=162,
+    name='Blue_Ocean_Strategy',
+    cn='销售蓝海',
+    cht='銷售藍海',
+    en='Blue Ocean Strategy',
+    jp='ブルーオーシャン戦略',
+    es='La estrategia del océano azul',
+    option_ids=[517, 518, 519, 520],
+)
+Majority_Report = RogueEventTitle(
+    id=163,
+    name='Majority_Report',
+    cn='多数派报告',
+    cht='多數派報告',
+    en='Majority Report',
+    jp='多数派報告',
+    es='Informe mayoritario',
+    option_ids=[521, 522],
+)
+Inspiration_Strikes = RogueEventTitle(
+    id=164,
+    name='Inspiration_Strikes',
+    cn='妙笔生花',
+    cht='妙筆生花',
+    en='Inspiration Strikes',
+    jp='妙筆生花',
+    es='El gran secreto',
+    option_ids=[523, 524, 525, 526, 527],
+)
+Temple_of_Reticence = RogueEventTitle(
+    id=165,
+    name='Temple_of_Reticence',
+    cn='缄默之殿',
+    cht='緘默之殿',
+    en='Temple of Reticence',
+    jp='沈黙の神殿',
+    es='Templo del Silencio',
+    option_ids=[528, 529, 530, 531],
+)
+False_Future = RogueEventTitle(
+    id=166,
+    name='False_Future',
+    cn='假未来',
+    cht='假未來',
+    en='False Future',
+    jp='偽りの未来',
+    es='Futuro falso',
+    option_ids=[532, 533],
+)
+Hackers_and_Sailors = RogueEventTitle(
+    id=167,
+    name='Hackers_and_Sailors',
+    cn='骇客与水手',
+    cht='駭客與水手',
+    en='Hackers and Sailors',
+    jp='ハッカーと船乗り',
+    es='Hackers y marineros',
+    option_ids=[534, 535, 536],
+)
+First_Battle_of_the_Shopping_Street = RogueEventTitle(
+    id=168,
+    name='First_Battle_of_the_Shopping_Street',
+    cn='商店街一番战',
+    cht='商店街一番戰',
+    en='First Battle of the Shopping Street',
+    jp='商店街での第一戦',
+    es='Primera batalla de la calle comercial',
+    option_ids=[537, 538, 539],
+)
+Life_is_Like_a_Vegetable_I = RogueEventTitle(
+    id=169,
+    name='Life_is_Like_a_Vegetable_I',
+    cn='人生如菜（其一）',
+    cht='人生如菜（其一）',
+    en='Life is Like a Vegetable (I)',
+    jp='人生は料理の如く（その1）',
+    es='La vida es como la verdura (I)',
+    option_ids=[540, 541, 542, 543, 544, 545],
+)
+Life_is_Like_a_Vegetable_II = RogueEventTitle(
+    id=170,
+    name='Life_is_Like_a_Vegetable_II',
+    cn='人生如菜（其二）',
+    cht='人生如菜（其二）',
+    en='Life is Like a Vegetable (II)',
+    jp='人生は料理の如く（その2）',
+    es='La vida es como la verdura (II)',
+    option_ids=[541, 542, 543, 544, 545],
+)
+Life_is_Like_a_Vegetable_III = RogueEventTitle(
+    id=171,
+    name='Life_is_Like_a_Vegetable_III',
+    cn='人生如菜（其三）',
+    cht='人生如菜（其三）',
+    en='Life is Like a Vegetable (III)',
+    jp='人生は料理の如く（その3）',
+    es='La vida es como la verdura (III)',
+    option_ids=[542, 543, 544, 545],
+)

tasks/rogue/keywords/path.py

@@ -84,48 +84,48 @@ Erudition = RoguePath(
     jp='知恵',
     es='Erudición',
 )
-The_Harmony = RoguePath(
+Harmony = RoguePath(
     id=10,
-    name='The_Harmony',
+    name='Harmony',
     cn='同谐',
     cht='同諧',
-    en='The Harmony',
+    en='Harmony',
     jp='調和',
     es='Armonía',
 )
-The_Order = RoguePath(
+Order = RoguePath(
     id=11,
-    name='The_Order',
+    name='Order',
     cn='秩序',
     cht='秩序',
-    en='The Order',
+    en='Order',
     jp='秩序',
     es='Orden',
 )
-The_Voracity = RoguePath(
+Voracity = RoguePath(
     id=12,
-    name='The_Voracity',
+    name='Voracity',
     cn='贪饕',
     cht='貪饕',
-    en='The Voracity',
+    en='Voracity',
     jp='貪慾',
     es='Voracidad',
 )
-The_Equilibrium = RoguePath(
+Equilibrium = RoguePath(
     id=13,
-    name='The_Equilibrium',
+    name='Equilibrium',
     cn='均衡',
     cht='均衡',
-    en='The Equilibrium',
+    en='Equilibrium',
     jp='均衡',
     es='Equilibrio',
 )
-The_Enigmata = RoguePath(
+Enigmata = RoguePath(
     id=14,
-    name='The_Enigmata',
+    name='Enigmata',
     cn='神秘',
     cht='神秘',
-    en='The Enigmata',
+    en='Enigmata',
     jp='神秘',
     es='Enigma',
 )