Merge pull request #609 from LmeSzinc/dev

Bug fix

config/template.json

@@ -119,6 +119,29 @@
       "FuelReserve": 5
     }
   },
+  "Ornament": {
+    "Scheduler": {
+      "Enable": false,
+      "NextRun": "2020-01-01 00:00:00",
+      "Command": "Ornament",
+      "ServerUpdate": "04:00"
+    },
+    "Ornament": {
+      "Dungeon": "Divergent_Universe_Eternal_Comedy",
+      "UseImmersifier": true,
+      "DoubleEvent": true,
+      "UseStamina": false
+    },
+    "DungeonSupport": {
+      "Use": "when_daily",
+      "Character": "FirstCharacter"
+    },
+    "TrailblazePower": {
+      "ExtractReservedTrailblazePower": false,
+      "UseFuel": false,
+      "FuelReserve": 5
+    }
+  },
   "DailyQuest": {
     "Scheduler": {
       "Enable": true,
@@ -220,7 +243,7 @@
       "ServerUpdate": "04:00"
     },
     "RogueWorld": {
-      "World": "Simulated_Universe_World_7",
+      "World": "Simulated_Universe_World_8",
       "Path": "The_Hunt",
       "Bonus": "Blessing Universe",
       "DomainStrategy": "combat",
@@ -243,29 +266,6 @@
       "DebugMode": false
     }
   },
-  "Ornament": {
-    "Scheduler": {
-      "Enable": false,
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Ornament",
-      "ServerUpdate": "04:00"
-    },
-    "Ornament": {
-      "Dungeon": "Divergent_Universe_Eternal_Comedy",
-      "UseImmersifier": true,
-      "DoubleEvent": true,
-      "UseStamina": false
-    },
-    "DungeonSupport": {
-      "Use": "when_daily",
-      "Character": "FirstCharacter"
-    },
-    "TrailblazePower": {
-      "ExtractReservedTrailblazePower": false,
-      "UseFuel": false,
-      "FuelReserve": 5
-    }
-  },
   "Daemon": {
     "Daemon": {
       "Enable": true,

module/config/argument/args.json

@@ -763,6 +763,159 @@
       }
     }
   },
+  "Ornament": {
+    "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": "Ornament",
+        "display": "hide"
+      },
+      "ServerUpdate": {
+        "type": "input",
+        "value": "04:00",
+        "display": "hide"
+      }
+    },
+    "Ornament": {
+      "Dungeon": {
+        "type": "select",
+        "value": "Divergent_Universe_Eternal_Comedy",
+        "option": [
+          "Divergent_Universe_Eternal_Comedy",
+          "Divergent_Universe_To_Sweet_Dreams",
+          "Divergent_Universe_Pouring_Blades",
+          "Divergent_Universe_Fruit_of_Evil",
+          "Divergent_Universe_Permafrost",
+          "Divergent_Universe_Gentle_Words",
+          "Divergent_Universe_Smelted_Heart",
+          "Divergent_Universe_Untoppled_Walls"
+        ]
+      },
+      "UseImmersifier": {
+        "type": "state",
+        "value": true,
+        "option": [
+          true
+        ],
+        "option_bold": [
+          true
+        ]
+      },
+      "DoubleEvent": {
+        "type": "state",
+        "value": true,
+        "option": [
+          true
+        ],
+        "option_bold": [
+          true
+        ]
+      },
+      "UseStamina": {
+        "type": "checkbox",
+        "value": false
+      }
+    },
+    "DungeonSupport": {
+      "Use": {
+        "type": "select",
+        "value": "when_daily",
+        "option": [
+          "when_daily",
+          "always_use"
+        ]
+      },
+      "Character": {
+        "type": "select",
+        "value": "FirstCharacter",
+        "option": [
+          "FirstCharacter",
+          "Acheron",
+          "Argenti",
+          "Arlan",
+          "Asta",
+          "Aventurine",
+          "Bailu",
+          "BlackSwan",
+          "Blade",
+          "Boothill",
+          "Bronya",
+          "Clara",
+          "DanHeng",
+          "DanHengImbibitorLunae",
+          "DrRatio",
+          "Firefly",
+          "FuXuan",
+          "Gallagher",
+          "Gepard",
+          "Guinaifen",
+          "Hanya",
+          "Herta",
+          "Himeko",
+          "Hook",
+          "Huohuo",
+          "Jade",
+          "JingYuan",
+          "Jingliu",
+          "Kafka",
+          "Luka",
+          "Luocha",
+          "Lynx",
+          "March7thPreservation",
+          "March7thTheHunt",
+          "Misha",
+          "Natasha",
+          "Pela",
+          "Qingque",
+          "Robin",
+          "RuanMei",
+          "Sampo",
+          "Seele",
+          "Serval",
+          "SilverWolf",
+          "Sparkle",
+          "Sushang",
+          "Tingyun",
+          "TopazNumby",
+          "TrailblazerDestruction",
+          "TrailblazerHarmony",
+          "TrailblazerPreservation",
+          "Welt",
+          "Xueyi",
+          "Yanqing",
+          "Yukong",
+          "Yunli"
+        ]
+      }
+    },
+    "TrailblazePower": {
+      "ExtractReservedTrailblazePower": {
+        "type": "checkbox",
+        "value": false
+      },
+      "UseFuel": {
+        "type": "checkbox",
+        "value": false
+      },
+      "FuelReserve": {
+        "type": "input",
+        "value": 5
+      }
+    }
+  },
   "DailyQuest": {
     "Scheduler": {
       "Enable": {
@@ -1311,13 +1464,12 @@
     "RogueWorld": {
       "World": {
         "type": "select",
-        "value": "Simulated_Universe_World_7",
+        "value": "Simulated_Universe_World_8",
         "option": [
           "Simulated_Universe_World_3",
           "Simulated_Universe_World_4",
           "Simulated_Universe_World_5",
           "Simulated_Universe_World_6",
-          "Simulated_Universe_World_7",
           "Simulated_Universe_World_8"
         ]
       },
@@ -1430,159 +1582,6 @@
       }
     }
   },
-  "Ornament": {
-    "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": "Ornament",
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
-        "display": "hide"
-      }
-    },
-    "Ornament": {
-      "Dungeon": {
-        "type": "select",
-        "value": "Divergent_Universe_Eternal_Comedy",
-        "option": [
-          "Divergent_Universe_Eternal_Comedy",
-          "Divergent_Universe_To_Sweet_Dreams",
-          "Divergent_Universe_Pouring_Blades",
-          "Divergent_Universe_Fruit_of_Evil",
-          "Divergent_Universe_Permafrost",
-          "Divergent_Universe_Gentle_Words",
-          "Divergent_Universe_Smelted_Heart",
-          "Divergent_Universe_Untoppled_Walls"
-        ]
-      },
-      "UseImmersifier": {
-        "type": "state",
-        "value": true,
-        "option": [
-          true
-        ],
-        "option_bold": [
-          true
-        ]
-      },
-      "DoubleEvent": {
-        "type": "state",
-        "value": true,
-        "option": [
-          true
-        ],
-        "option_bold": [
-          true
-        ]
-      },
-      "UseStamina": {
-        "type": "checkbox",
-        "value": false
-      }
-    },
-    "DungeonSupport": {
-      "Use": {
-        "type": "select",
-        "value": "when_daily",
-        "option": [
-          "when_daily",
-          "always_use"
-        ]
-      },
-      "Character": {
-        "type": "select",
-        "value": "FirstCharacter",
-        "option": [
-          "FirstCharacter",
-          "Acheron",
-          "Argenti",
-          "Arlan",
-          "Asta",
-          "Aventurine",
-          "Bailu",
-          "BlackSwan",
-          "Blade",
-          "Boothill",
-          "Bronya",
-          "Clara",
-          "DanHeng",
-          "DanHengImbibitorLunae",
-          "DrRatio",
-          "Firefly",
-          "FuXuan",
-          "Gallagher",
-          "Gepard",
-          "Guinaifen",
-          "Hanya",
-          "Herta",
-          "Himeko",
-          "Hook",
-          "Huohuo",
-          "Jade",
-          "JingYuan",
-          "Jingliu",
-          "Kafka",
-          "Luka",
-          "Luocha",
-          "Lynx",
-          "March7thPreservation",
-          "March7thTheHunt",
-          "Misha",
-          "Natasha",
-          "Pela",
-          "Qingque",
-          "Robin",
-          "RuanMei",
-          "Sampo",
-          "Seele",
-          "Serval",
-          "SilverWolf",
-          "Sparkle",
-          "Sushang",
-          "Tingyun",
-          "TopazNumby",
-          "TrailblazerDestruction",
-          "TrailblazerHarmony",
-          "TrailblazerPreservation",
-          "Welt",
-          "Xueyi",
-          "Yanqing",
-          "Yukong",
-          "Yunli"
-        ]
-      }
-    },
-    "TrailblazePower": {
-      "ExtractReservedTrailblazePower": {
-        "type": "checkbox",
-        "value": false
-      },
-      "UseFuel": {
-        "type": "checkbox",
-        "value": false
-      },
-      "FuelReserve": {
-        "type": "input",
-        "value": 5
-      }
-    }
-  },
   "Daemon": {
     "Daemon": {
       "Enable": {

module/config/argument/argument.yaml

@@ -246,13 +246,12 @@ CloudStorage:
 RogueWorld:
   # Worlds will be injected in config updater
   World:
-    value: Simulated_Universe_World_7
+    value: Simulated_Universe_World_8
     option: [
       Simulated_Universe_World_3,
       Simulated_Universe_World_4,
       Simulated_Universe_World_5,
       Simulated_Universe_World_6,
-      Simulated_Universe_World_7,
       Simulated_Universe_World_8,
     ]
   Path:

module/config/argument/menu.json

@@ -12,6 +12,7 @@
     "page": "setting",
     "tasks": [
       "Dungeon",
+      "Ornament",
       "DailyQuest",
       "BattlePass",
       "Assignment",
@@ -24,8 +25,7 @@
     "page": "setting",
     "tasks": [
       "Weekly",
-      "Rogue",
-      "Ornament"
+      "Rogue"
     ]
   },
   "Tool": {

module/config/argument/stored.json

@@ -669,7 +669,7 @@
     "stored": "StoredResersed",
     "attrs": {
       "time": "2020-01-01 00:00:00",
-      "total": 8,
+      "total": 2400,
       "value": 0
     },
     "order": 0,

module/config/argument/task.yaml

@@ -29,6 +29,11 @@ Daily:
       - DungeonSupport
       - DungeonStorage
       - TrailblazePower
+    Ornament:
+      - Scheduler
+      - Ornament
+      - DungeonSupport
+      - TrailblazePower
     DailyQuest:
       - Scheduler
       - DailyStorage
@@ -61,11 +66,6 @@ Weekly:
       - RogueWorld
       - RogueBlessing
       - RogueDebug
-    Ornament:
-      - Scheduler
-      - Ornament
-      - DungeonSupport
-      - TrailblazePower
 
 # ==================== Tool ====================
 

module/config/config_generated.py

@@ -159,7 +159,7 @@ class GeneratedConfig:
     CloudStorage_CloudRemainFree = {}
 
     # Group `RogueWorld`
-    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_World = 'Simulated_Universe_World_8'  # Simulated_Universe_World_3, Simulated_Universe_World_4, Simulated_Universe_World_5, Simulated_Universe_World_6, Simulated_Universe_World_8
     RogueWorld_Path = 'The_Hunt'  # Preservation, Remembrance, Nihility, Abundance, The_Hunt, Destruction, Elation, Propagation, Erudition
     RogueWorld_Bonus = 'Blessing Universe'  # Blessing Universe, Miracle Universe, Fragmented Universe
     RogueWorld_DomainStrategy = 'combat'  # combat, occurrence

module/config/i18n/en-US.json

@@ -30,6 +30,10 @@
       "name": "Dungeon",
       "help": ""
     },
+    "Ornament": {
+      "name": "Ornament",
+      "help": "The followings must be satisfied:\n1. Manually clear Divergent Universe once this week and have a save file.\n2. Enter the dungeon once on current device to have dungeon team saved."
+    },
     "DailyQuest": {
       "name": "Daily Quest",
       "help": ""
@@ -58,10 +62,6 @@
       "name": "Simulated Universe",
       "help": ""
     },
-    "Ornament": {
-      "name": "Ornament",
-      "help": "The followings must be satisfied:\n1. Manually clear Divergent Universe once this week and have a save file.\n2. Enter the dungeon once on current device to have dungeon team saved."
-    },
     "Daemon": {
       "name": "Dialogue Clicker",
       "help": ""
@@ -936,7 +936,6 @@
       "Simulated_Universe_World_4": "Simulated Universe: World 4",
       "Simulated_Universe_World_5": "Simulated Universe: World 5",
       "Simulated_Universe_World_6": "Simulated Universe: World 6",
-      "Simulated_Universe_World_7": "Simulated Universe: World 7",
       "Simulated_Universe_World_8": "Simulated Universe: World 8"
     },
     "Path": {

module/config/i18n/es-ES.json

@@ -30,6 +30,10 @@
       "name": "Mazmorra",
       "help": ""
     },
+    "Ornament": {
+      "name": "Ornamentos",
+      "help": "Se deben cumplir los siguientes requisitos:\n1. Borre manualmente Universo Diferenciado una vez esta semana y tenga un archivo guardado.\n2. Ingrese a la mazmorra una vez en el dispositivo actual para guardar el equipo de la mazmorra."
+    },
     "DailyQuest": {
       "name": "Misión diaria",
       "help": ""
@@ -58,10 +62,6 @@
       "name": "Universo Simulado",
       "help": ""
     },
-    "Ornament": {
-      "name": "Ornamentos",
-      "help": "Se deben cumplir los siguientes requisitos:\n1. Borre manualmente Universo Diferenciado una vez esta semana y tenga un archivo guardado.\n2. Ingrese a la mazmorra una vez en el dispositivo actual para guardar el equipo de la mazmorra."
-    },
     "Daemon": {
       "name": "Clic de diálogo",
       "help": ""
@@ -936,7 +936,6 @@
       "Simulated_Universe_World_4": "Mundo 4",
       "Simulated_Universe_World_5": "Mundo 5",
       "Simulated_Universe_World_6": "Mundo 6",
-      "Simulated_Universe_World_7": "Mundo 7",
       "Simulated_Universe_World_8": "Mundo 8"
     },
     "Path": {

module/config/i18n/ja-JP.json

@@ -30,6 +30,10 @@
       "name": "Task.Dungeon.name",
       "help": "Task.Dungeon.help"
     },
+    "Ornament": {
+      "name": "Task.Ornament.name",
+      "help": "Task.Ornament.help"
+    },
     "DailyQuest": {
       "name": "Task.DailyQuest.name",
       "help": "Task.DailyQuest.help"
@@ -58,10 +62,6 @@
       "name": "Task.Rogue.name",
       "help": "Task.Rogue.help"
     },
-    "Ornament": {
-      "name": "Task.Ornament.name",
-      "help": "Task.Ornament.help"
-    },
     "Daemon": {
       "name": "Task.Daemon.name",
       "help": "Task.Daemon.help"
@@ -936,7 +936,6 @@
       "Simulated_Universe_World_4": "第四世界・模擬宇宙",
       "Simulated_Universe_World_5": "第五世界・模擬宇宙",
       "Simulated_Universe_World_6": "第六世界・模擬宇宙",
-      "Simulated_Universe_World_7": "第七世界・模擬宇宙",
       "Simulated_Universe_World_8": "第八世界・模擬宇宙"
     },
     "Path": {

module/config/i18n/zh-CN.json

@@ -30,6 +30,10 @@
       "name": "每日副本",
       "help": ""
     },
+    "Ornament": {
+      "name": "饰品提取",
+      "help": "运行 \"饰品提取\" 任务需要：\n1. 每周事先手动通关差分宇宙一次并保存存档\n2. 在当前设备进入过副本一次，有保存的编队"
+    },
     "DailyQuest": {
       "name": "每日任务",
       "help": ""
@@ -58,10 +62,6 @@
       "name": "模拟宇宙",
       "help": ""
     },
-    "Ornament": {
-      "name": "饰品提取",
-      "help": "运行 \"饰品提取\" 任务需要：\n1. 每周事先手动通关差分宇宙一次并保存存档\n2. 在当前设备进入过副本一次，有保存的编队"
-    },
     "Daemon": {
       "name": "剧情连点器",
       "help": ""
@@ -936,7 +936,6 @@
       "Simulated_Universe_World_4": "第四世界•模拟宇宙",
       "Simulated_Universe_World_5": "第五世界•模拟宇宙",
       "Simulated_Universe_World_6": "第六世界•模拟宇宙",
-      "Simulated_Universe_World_7": "第七世界•模拟宇宙",
       "Simulated_Universe_World_8": "第八世界•模拟宇宙"
     },
     "Path": {

module/config/i18n/zh-TW.json

@@ -30,6 +30,10 @@
       "name": "每日副本",
       "help": ""
     },
+    "Ornament": {
+      "name": "飾品提取",
+      "help": "運行 \"飾品提取\" 任務需要：\n1. 每週事先手動通關差分宇宙一次並保存檔案\n2. 在當前設備進入過副本一次，有保存的編隊"
+    },
     "DailyQuest": {
       "name": "每日任務",
       "help": ""
@@ -58,10 +62,6 @@
       "name": "模擬宇宙",
       "help": ""
     },
-    "Ornament": {
-      "name": "飾品提取",
-      "help": "運行 \"飾品提取\" 任務需要：\n1. 每週事先手動通關差分宇宙一次並保存檔案\n2. 在當前設備進入過副本一次，有保存的編隊"
-    },
     "Daemon": {
       "name": "劇情連點器",
       "help": ""
@@ -936,7 +936,6 @@
       "Simulated_Universe_World_4": "第四世界•模擬宇宙",
       "Simulated_Universe_World_5": "第五世界•模擬宇宙",
       "Simulated_Universe_World_6": "第六世界•模擬宇宙",
-      "Simulated_Universe_World_7": "第七世界•模擬宇宙",
       "Simulated_Universe_World_8": "第八世界•模擬宇宙"
     },
     "Path": {

route/rogue/Elite/Luofu_ArtisanshipCommission_F1.py

@@ -1,10 +1,12 @@
 from tasks.map.control.waypoint import Waypoint
 from tasks.map.keywords.plane import Luofu_ArtisanshipCommission
+from tasks.map.route.base import locked_rotation
 from tasks.rogue.route.base import RouteBase
 
 
 class Route(RouteBase):
 
+    @locked_rotation(90)
     def Luofu_ArtisanshipCommission_F1_X385Y494(self):
         """
         | Waypoint | Position                  | Direction | Rotation |
@@ -24,6 +26,7 @@ class Route(RouteBase):
         self.domain_single_exit(exit_)
         # ===== End of generated waypoints =====
 
+    @locked_rotation(90)
     def Luofu_ArtisanshipCommission_F1_X391Y493(self):
         """
         | Waypoint | Position                  | Direction | Rotation |

route/rogue/Respite/Luofu_StargazerNavalia_F2Rogue.py

@@ -40,7 +40,7 @@ class Route(RouteBase):
         | exit_    | Waypoint((515.4, 299.2)), | 239.8     | 239      |
         """
         self.map_init(plane=Luofu_StargazerNavalia, floor="F2Rogue", position=(574.8, 275.0))
-        item = Waypoint((553.4, 273.2))
+        item = Waypoint((553.4, 273.2)).set_threshold(7)
         herta = Waypoint((533.4, 286.9))
         exit_ = Waypoint((515.4, 299.2))
 

tasks/combat/stamina_status.py

@@ -155,7 +155,7 @@ class StaminaStatus(UI):
                 if status.reserved is not None:
                     self.config.stored.Reserved.value = status.reserved
                 if status.immersifier is not None:
-                    self.config.stored.Immersifier.value = status.reserved
+                    self.config.stored.Immersifier.value = status.immersifier
 
             if use_cached_image or valid:
                 return status

tasks/ornament/combat.py

@@ -110,7 +110,7 @@ class OrnamentCombat(Dungeon, RouteLoader, DungeonState):
 
     def get_equivalent_stamina(self):
         value = self.config.stored.Immersifier.value * 40
-        if self.config.Ornament_UseStamina:
+        if self.config.Ornament_UseStamina or self.config.stored.DungeonDouble.rogue > 0:
             value += self.config.stored.TrailblazePower.value
         return value