Opt: Re-arrange rogue settings

2024-11-22 00:35:34 +00:00 · 2023-12-07 00:41:33 +08:00 · 2023-12-07 00:41:33 +08:00 · e398c79687
commit e398c79687
parent 5ebfdf1976
15 changed files with 159 additions and 166 deletions
--- a/config/template.json
+++ b/config/template.json
@ -64,18 +64,6 @@
      "SimulatedUniverse": {}
    }
  },
-  "Weekly": {
-    "Scheduler": {
-      "Enable": true,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Weekly",
-      "ServerUpdate": "04:00"
-    },
-    "Weekly": {
-      "Name": "Echo_of_War_Divine_Seed",
-      "Team": 1
-    }
-  },
  "DailyQuest": {
    "Scheduler": {
      "Enable": true,
@ -98,7 +86,7 @@
      "Take_1_photo": "achievable",
      "Destroy_3_destructible_objects": "achievable",
      "Complete_Forgotten_Hall_1_time": "achievable",
-      "Complete_Echo_of_War_1_times": "achievable",
+      "Complete_Echo_of_War_1_times": "not_set",
      "Complete_1_stage_in_Simulated_Universe_Any_world": "not_set",
      "Obtain_victory_in_combat_with_support_characters_1_time": "achievable",
      "Use_an_Ultimate_to_deal_the_final_blow_1_time": "achievable",
@ -167,6 +155,18 @@
      "Collect": true
    }
  },
+  "Weekly": {
+    "Scheduler": {
+      "Enable": false,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Weekly",
+      "ServerUpdate": "04:00"
+    },
+    "Weekly": {
+      "Name": "Echo_of_War_Divine_Seed",
+      "Team": 1
+    }
+  },
  "Rogue": {
    "Scheduler": {
      "Enable": false,
@ -178,15 +178,10 @@
      "World": "Simulated_Universe_World_7",
      "Path": "The_Hunt",
      "Bonus": "Blessing Cosmos",
-      "DomainStrategy": "occurrence",
+      "DomainStrategy": "combat",
      "ImmersionReward": "immersifier",
      "StopCondition": "weekly_point_reward"
    },
-    "RoguePath": {
-      "PresetResonanceFilter": "preset-1",
-      "ResonanceSelectionStrategy": "follow-presets",
-      "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random"
-    },
    "RogueBlessing": {
      "PresetBlessingFilter": "preset-1",
      "BlessingSelectionStrategy": "follow-presets",
@ -196,6 +191,11 @@
      "PresetCurioFilter": "preset-1",
      "CurioSelectionStrategy": "follow-presets",
      "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random"
+    },
+    "RoguePath": {
+      "PresetResonanceFilter": "preset-1",
+      "ResonanceSelectionStrategy": "follow-presets",
+      "CustomResonanceFilter": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random"
    }
  }
 }
--- a/module/config/argument/args.json
+++ b/module/config/argument/args.json
@ -428,57 +428,6 @@
      }
    }
  },
-  "Weekly": {
-    "Scheduler": {
-      "Enable": {
-        "type": "checkbox",
-        "value": true,
-        "option": [
-          true,
-          false
-        ]
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "Weekly",
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
-      }
-    },
-    "Weekly": {
-      "Name": {
-        "type": "select",
-        "value": "Echo_of_War_Divine_Seed",
-        "options": [],
-        "option": [
-          "Echo_of_War_Destruction_Beginning",
-          "Echo_of_War_End_of_the_Eternal_Freeze",
-          "Echo_of_War_Divine_Seed"
-        ]
-      },
-      "Team": {
-        "type": "select",
-        "value": 1,
-        "option": [
-          1,
-          2,
-          3,
-          4,
-          5,
-          6
-        ]
-      }
-    }
-  },
  "DailyQuest": {
    "Scheduler": {
      "Enable": {
@ -1157,6 +1106,57 @@
      }
    }
  },
+  "Weekly": {
+    "Scheduler": {
+      "Enable": {
+        "type": "checkbox",
+        "value": false,
+        "option": [
+          true,
+          false
+        ]
+      },
+      "NextRun": {
+        "type": "datetime",
+        "value": "2020-01-01 00:00:00",
+        "validate": "datetime"
+      },
+      "Command": {
+        "type": "input",
+        "value": "Weekly",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    },
+    "Weekly": {
+      "Name": {
+        "type": "select",
+        "value": "Echo_of_War_Divine_Seed",
+        "options": [],
+        "option": [
+          "Echo_of_War_Destruction_Beginning",
+          "Echo_of_War_End_of_the_Eternal_Freeze",
+          "Echo_of_War_Divine_Seed"
+        ]
+      },
+      "Team": {
+        "type": "select",
+        "value": 1,
+        "option": [
+          1,
+          2,
+          3,
+          4,
+          5,
+          6
+        ]
+      }
+    }
+  },
  "Rogue": {
    "Scheduler": {
      "Enable": {
@ -1220,7 +1220,7 @@
      },
      "DomainStrategy": {
        "type": "select",
-        "value": "occurrence",
+        "value": "combat",
        "option": [
          "combat",
          "occurrence"
@ -1240,34 +1240,10 @@
        "value": "weekly_point_reward",
        "option": [
          "weekly_point_reward",
-          "100_elite_boss",
-          "non_stop"
+          "debug"
        ]
      }
    },
-    "RoguePath": {
-      "PresetResonanceFilter": {
-        "type": "select",
-        "value": "preset-1",
-        "option": [
-          "preset-1",
-          "custom"
-        ]
-      },
-      "ResonanceSelectionStrategy": {
-        "type": "select",
-        "value": "follow-presets",
-        "option": [
-          "follow-presets",
-          "unrecorded-first",
-          "before-random"
-        ]
-      },
-      "CustomResonanceFilter": {
-        "type": "textarea",
-        "value": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random"
-      }
-    },
    "RogueBlessing": {
      "PresetBlessingFilter": {
        "type": "select",
@ -1313,6 +1289,29 @@
        "type": "textarea",
        "value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random"
      }
+    },
+    "RoguePath": {
+      "PresetResonanceFilter": {
+        "type": "select",
+        "value": "preset-1",
+        "option": [
+          "preset-1",
+          "custom"
+        ]
+      },
+      "ResonanceSelectionStrategy": {
+        "type": "select",
+        "value": "follow-presets",
+        "option": [
+          "follow-presets",
+          "unrecorded-first",
+          "before-random"
+        ]
+      },
+      "CustomResonanceFilter": {
+        "type": "textarea",
+        "value": "回响构音：均晶转变 > 回响构音：零维强化\n> 回响构音：第二次初恋 > 回响构音：体验的富翁\n> 回响构音：局外人 > 回响构音：怀疑的四重根\n> 回响构音：诸法无我 > 回响构音：诸行无常\n> 回响构音：射不主皮 > 回响构音：柘弓危矢\n> 回响构音：激变变星 > 回响构音：极端氦闪\n> 回响构音：末日狂欢 > 回响构音：树苗长高舞\n> random"
+      }
    }
  }
 }
--- a/module/config/argument/argument.yaml
+++ b/module/config/argument/argument.yaml
@ -217,14 +217,14 @@ RogueWorld:
    value: Blessing Cosmos
    option: [ Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos ]
  DomainStrategy:
-    value: occurrence
+    value: combat
    option: [ combat, occurrence ]
  ImmersionReward:
    value: immersifier
    option: [ do_not_claim, immersifier, immersifier_trailblaze_power ]
  StopCondition:
    value: weekly_point_reward
-    option: [ weekly_point_reward, 100_elite_boss, non_stop ]
+    option: [ weekly_point_reward, debug ]

 RoguePath:
  PresetResonanceFilter:
--- a/module/config/argument/default.yaml
+++ b/module/config/argument/default.yaml
@ -10,9 +10,6 @@
 Dungeon:
  Scheduler:
    Enable: true
-Weekly:
-  Scheduler:
-    Enable: true
 DailyQuest:
  Scheduler:
    Enable: true
--- a/module/config/argument/menu.json
+++ b/module/config/argument/menu.json
@ -12,7 +12,6 @@
    "page": "setting",
    "tasks": [
      "Dungeon",
-      "Weekly",
      "DailyQuest",
      "BattlePass",
      "Assignment",
@ -20,10 +19,11 @@
      "Freebies"
    ]
  },
-  "Rogue": {
+  "Weekly": {
    "menu": "list",
    "page": "setting",
    "tasks": [
+      "Weekly",
      "Rogue"
    ]
  }
--- a/module/config/argument/task.yaml
+++ b/module/config/argument/task.yaml
@ -28,9 +28,6 @@ Daily:
      - DungeonDaily
      - DungeonSupport
      - DungeonStorage
-    Weekly:
-      - Scheduler
-      - Weekly
    DailyQuest:
      - Scheduler
      - AchievableQuest
@ -47,15 +44,18 @@ Daily:
    Freebies:
      - Scheduler
      - SupportReward
-# ==================== Rogue ====================
+# ==================== Weekly ====================

-Rogue:
+Weekly:
  menu: 'list'
  page: 'setting'
  tasks:
+    Weekly:
+      - Scheduler
+      - Weekly
    Rogue:
      - Scheduler
      - RogueWorld
-      - RoguePath
      - RogueBlessing
      - RogueCurio
+      - RoguePath
--- a/module/config/config.py
+++ b/module/config/config.py
@ -520,6 +520,10 @@ class AzurLaneConfig(ConfigUpdater, ManualConfig, GeneratedConfig, ConfigWatcher
    def DEVICE_CONTROL_METHOD(self):
        return self.Emulator_ControlMethod

+    @property
+    def IS_ROGUE_DEBUG(self):
+        return self.RogueWorld_StopCondition == 'debug'
+
    def temporary(self, **kwargs):
        """
        Cover some settings, and recover later.
--- a/module/config/config_generated.py
+++ b/module/config/config_generated.py
@ -121,9 +121,9 @@ class GeneratedConfig:
    RogueWorld_World = 'Simulated_Universe_World_7'  # Simulated_Universe_World_3, Simulated_Universe_World_4, Simulated_Universe_World_5, Simulated_Universe_World_6, Simulated_Universe_World_7, Simulated_Universe_World_8
    RogueWorld_Path = 'The_Hunt'  # Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation
    RogueWorld_Bonus = 'Blessing Cosmos'  # Blessing Cosmos, Miracle Cosmos, Fragmented Cosmos
-    RogueWorld_DomainStrategy = 'occurrence'  # combat, occurrence
+    RogueWorld_DomainStrategy = 'combat'  # combat, occurrence
    RogueWorld_ImmersionReward = 'immersifier'  # do_not_claim, immersifier, immersifier_trailblaze_power
-    RogueWorld_StopCondition = 'weekly_point_reward'  # weekly_point_reward, 100_elite_boss, non_stop
+    RogueWorld_StopCondition = 'weekly_point_reward'  # weekly_point_reward, debug

    # Group `RoguePath`
    RoguePath_PresetResonanceFilter = 'preset-1'  # preset-1, custom
--- a/module/config/config_manual.py
+++ b/module/config/config_manual.py
@ -124,8 +124,6 @@ class ManualConfig:
    """
    tasks.rogue
    """
-    # 2023.11.13 Migrate domain exit implementation, True to stop before domain exit
-    DOMAIN_EXIT_MIGRATE_DEV = False


 ADDING = ''.join([chr(int(f)) for f in ManualConfig.OS_EXPLORE_CENTER.split('>')])
--- a/module/config/i18n/en-US.json
+++ b/module/config/i18n/en-US.json
@ -8,8 +8,8 @@
      "name": "Daily",
      "help": ""
    },
-    "Rogue": {
-      "name": "Simulated Universe",
+    "Weekly": {
+      "name": "Weekly",
      "help": ""
    }
  },
@ -26,10 +26,6 @@
      "name": "Dungeon",
      "help": ""
    },
-    "Weekly": {
-      "name": "Echo of War",
-      "help": ""
-    },
    "DailyQuest": {
      "name": "Daily Quest",
      "help": ""
@ -50,9 +46,13 @@
      "name": "Freebies",
      "help": ""
    },
+    "Weekly": {
+      "name": "Echo of War",
+      "help": ""
+    },
    "Rogue": {
      "name": "Simulated Universe",
-      "help": "Simulated Universe is in development, task will not be run"
+      "help": ""
    }
  },
  "Scheduler": {
@ -828,10 +828,9 @@
    },
    "StopCondition": {
      "name": "Stop Condition",
-      "help": "Note: If \"Reached 100 Elite/Boss drop rewards\", the simulated universe task will run for several hours",
+      "help": "",
      "weekly_point_reward": "Reached Weekly Point Rewards",
-      "100_elite_boss": "Reached 100 Elite/BOSS drop rewards",
-      "non_stop": "Non-stop (for debugging only)"
+      "debug": "(for debugging only)"
    }
  },
  "RoguePath": {
--- a/module/config/i18n/es-ES.json
+++ b/module/config/i18n/es-ES.json
@ -8,8 +8,8 @@
      "name": "Diario",
      "help": ""
    },
-    "Rogue": {
-      "name": "Universo Simulado",
+    "Weekly": {
+      "name": "Semanario",
      "help": ""
    }
  },
@ -26,10 +26,6 @@
      "name": "Mazmorra",
      "help": ""
    },
-    "Weekly": {
-      "name": "Ecos de la guerra",
-      "help": ""
-    },
    "DailyQuest": {
      "name": "Misión diaria",
      "help": ""
@ -50,9 +46,13 @@
      "name": "Freebies",
      "help": ""
    },
+    "Weekly": {
+      "name": "Ecos de la guerra",
+      "help": ""
+    },
    "Rogue": {
      "name": "Universo Simulado",
-      "help": "El Universo Simulado está en desarrollo, y no se ejecutará"
+      "help": ""
    }
  },
  "Scheduler": {
@ -828,10 +828,9 @@
    },
    "StopCondition": {
      "name": "Condición de detención",
-      "help": "Nota: Si \"recompensas de Elite/BOSS\", la tarea del universo simulado se ejecutará durante varias horas",
+      "help": "",
      "weekly_point_reward": "Recompensas de puntos semanales alcanzados",
-      "100_elite_boss": "Has alcanzado 100 recompensas de Elite/BOSS",
-      "non_stop": "Sin parar (solo para depuración)"
+      "debug": "(solo para depuración)"
    }
  },
  "RoguePath": {
--- a/module/config/i18n/ja-JP.json
+++ b/module/config/i18n/ja-JP.json
@ -8,9 +8,9 @@
      "name": "Menu.Daily.name",
      "help": "Menu.Daily.help"
    },
-    "Rogue": {
-      "name": "Menu.Rogue.name",
-      "help": "Menu.Rogue.help"
+    "Weekly": {
+      "name": "Menu.Weekly.name",
+      "help": "Menu.Weekly.help"
    }
  },
  "Task": {
@ -26,10 +26,6 @@
      "name": "Task.Dungeon.name",
      "help": "Task.Dungeon.help"
    },
-    "Weekly": {
-      "name": "Task.Weekly.name",
-      "help": "Task.Weekly.help"
-    },
    "DailyQuest": {
      "name": "Task.DailyQuest.name",
      "help": "Task.DailyQuest.help"
@ -50,6 +46,10 @@
      "name": "他ギフト",
      "help": ""
    },
+    "Weekly": {
+      "name": "Task.Weekly.name",
+      "help": "Task.Weekly.help"
+    },
    "Rogue": {
      "name": "Task.Rogue.name",
      "help": "Task.Rogue.help"
@ -830,8 +830,7 @@
      "name": "RogueWorld.StopCondition.name",
      "help": "RogueWorld.StopCondition.help",
      "weekly_point_reward": "weekly_point_reward",
-      "100_elite_boss": "100_elite_boss",
-      "non_stop": "non_stop"
+      "debug": "debug"
    }
  },
  "RoguePath": {
--- a/module/config/i18n/zh-CN.json
+++ b/module/config/i18n/zh-CN.json
@ -8,8 +8,8 @@
      "name": "每日",
      "help": ""
    },
-    "Rogue": {
-      "name": "模拟宇宙",
+    "Weekly": {
+      "name": "每周",
      "help": ""
    }
  },
@ -26,10 +26,6 @@
      "name": "每日副本",
      "help": ""
    },
-    "Weekly": {
-      "name": "历战余响",
-      "help": ""
-    },
    "DailyQuest": {
      "name": "每日任务",
      "help": ""
@ -50,9 +46,13 @@
      "name": "白嫖奖励",
      "help": ""
    },
+    "Weekly": {
+      "name": "历战余响",
+      "help": ""
+    },
    "Rogue": {
      "name": "模拟宇宙",
-      "help": "模拟宇宙还在开发中，任务不会被运行"
+      "help": ""
    }
  },
  "Scheduler": {
@ -828,10 +828,9 @@
    },
    "StopCondition": {
      "name": "停止条件",
-      "help": "注意：\"每周100精英怪掉落奖励达到上限\" 时，模拟宇宙任务将运行数小时",
+      "help": "",
      "weekly_point_reward": "每周点数奖励达到上限",
-      "100_elite_boss": "每周100精英怪掉落奖励达到上限",
-      "non_stop": "不停止 (仅用于调试)"
+      "debug": "(仅用于调试)"
    }
  },
  "RoguePath": {
--- a/module/config/i18n/zh-TW.json
+++ b/module/config/i18n/zh-TW.json
@ -8,8 +8,8 @@
      "name": "每日",
      "help": ""
    },
-    "Rogue": {
-      "name": "模擬宇宙",
+    "Weekly": {
+      "name": "每週",
      "help": ""
    }
  },
@ -26,10 +26,6 @@
      "name": "每日副本",
      "help": ""
    },
-    "Weekly": {
-      "name": "歷戰餘響",
-      "help": ""
-    },
    "DailyQuest": {
      "name": "每日任務",
      "help": ""
@ -50,9 +46,13 @@
      "name": "免費獎勵",
      "help": ""
    },
+    "Weekly": {
+      "name": "歷戰餘響",
+      "help": ""
+    },
    "Rogue": {
      "name": "模擬宇宙",
-      "help": "模擬宇宙還在開發中，任務不會被運行"
+      "help": ""
    }
  },
  "Scheduler": {
@ -828,10 +828,9 @@
    },
    "StopCondition": {
      "name": "停止條件",
-      "help": "注意：\"每週100精英怪掉落獎勵達到上限\" 時，模擬宇宙任務將運行數小時",
+      "help": "",
      "weekly_point_reward": "每週點數獎勵達到上限",
-      "100_elite_boss": "每週100精英怪掉落獎勵達到上限",
-      "non_stop": "不停止 (只用於除錯)"
+      "debug": "(只用於偵錯)"
    }
  },
  "RoguePath": {
--- a/tasks/rogue/route/base.py
+++ b/tasks/rogue/route/base.py
@ -348,14 +348,14 @@ class RouteBase(RouteBase_, RogueExit, RogueEvent, RogueReward):

        # Choose a door
        logger.hr('Find domain exit', level=2)
-        logger.info(f'Migrate={self.config.DOMAIN_EXIT_MIGRATE_DEV}, left_door={left_door}, right_door={right_door}')
-        if not self.config.DOMAIN_EXIT_MIGRATE_DEV and (not left_door and not right_door):
+        logger.info(f'Migrate={self.config.IS_ROGUE_DEBUG}, left_door={left_door}, right_door={right_door}')
+        if not self.config.IS_ROGUE_DEBUG and (not left_door and not right_door):
            return self._domain_exit_old()

        logger.info(f'Using new predict_door()')
        door = self.predict_door()
-        if self.config.DOMAIN_EXIT_MIGRATE_DEV and self.exit_has_double_door and (not left_door or not right_door):
-            logger.critical(f'Domain exit is not defined in: {self.route_func}')
+        if self.config.IS_ROGUE_DEBUG and self.exit_has_double_door and (not left_door or not right_door):
+            logger.critical(f'Domain exit is not defined, please record it: {self.route_func}')
            exit(1)

        # Goto door