Upd: Redirect to 2.0 dungeon settings

module/config/argument/argument.yaml

@@ -92,10 +92,10 @@ Dungeon:
 DungeonDaily:
   # Dungeon names will be injected in config updater
   CalyxGolden:
-    value: Calyx_Golden_Treasures
+    value: Calyx_Golden_Treasures_Jarilo_VI
     option: [ do_not_achieve, ]
   CalyxCrimson:
-    value: Calyx_Crimson_Erudition
+    value: Calyx_Crimson_Destruction_Herta_StorageZone
     option: [ do_not_achieve, ]
   StagnantShadow:
     value: Stagnant_Shadow_Quanta

module/config/config_updater.py

@@ -6,6 +6,7 @@ from cached_property import cached_property
 
 from deploy.Windows.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write
 from module.base.timer import timer
+from module.config.convert import *
 from module.config.server import VALID_SERVER
 from module.config.utils import *
 
@@ -631,11 +632,10 @@ class ConfigGenerator:
 class ConfigUpdater:
     # source, target, (optional)convert_func
     redirection = [
-        # ('Dungeon.Dungeon.Support', 'Dungeon.DungeonSupport.Use'),
-        # ('Dungeon.Dungeon.SupportCharacter', 'Dungeon.DungeonSupport.Character'),
-        # ('Dungeon.Dungeon.Name', 'Dungeon.Dungeon.Name', convert_daily),
-        # ('Dungeon.Dungeon.NameAtDoubleCalyx', 'Dungeon.Dungeon.NameAtDoubleCalyx', convert_daily),
-        # ('Dungeon.DungeonDaily.CalyxCrimson', 'Dungeon.DungeonDaily.CalyxCrimson', convert_daily),
+        ('Dungeon.Dungeon.Name', 'Dungeon.Dungeon.Name', convert_20_dungeon),
+        ('Dungeon.Dungeon.NameAtDoubleCalyx', 'Dungeon.Dungeon.NameAtDoubleCalyx', convert_20_dungeon),
+        ('Dungeon.DungeonDaily.CalyxGolden', 'Dungeon.DungeonDaily.CalyxGolden', convert_20_dungeon),
+        ('Dungeon.DungeonDaily.CalyxCrimson', 'Dungeon.DungeonDaily.CalyxCrimson', convert_20_dungeon),
     ]
 
     @cached_property

module/config/convert.py

@@ -2,3 +2,31 @@ def convert_daily(value):
     if value == "Calyx_Crimson_Hunt":
         value = "Calyx_Crimson_The_Hunt"
     return value
+
+
+def convert_20_dungeon(value):
+    if value == 'Calyx_Golden_Memories':
+        return 'Calyx_Golden_Memories_Jarilo_VI'
+    if value == 'Calyx_Golden_Aether':
+        return 'Calyx_Golden_Aether_Jarilo_VI'
+    if value == 'Calyx_Golden_Treasures':
+        return 'Calyx_Golden_Treasures_Jarilo_VI'
+    if value == 'Calyx_Golden_Memories':
+        return 'Calyx_Golden_Memories_Jarilo_VI'
+
+    if value == 'Calyx_Crimson_Destruction':
+        return 'Calyx_Crimson_Destruction_Herta_StorageZone'
+    if value == 'Calyx_Crimson_The_Hunt':
+        return 'Calyx_Crimson_The_Hunt_Jarilo_OutlyingSnowPlains'
+    if value == 'Calyx_Crimson_Erudition':
+        return 'Calyx_Crimson_Erudition_Jarilo_RivetTown'
+    if value == 'Calyx_Crimson_Harmony':
+        return 'Calyx_Crimson_Harmony_Jarilo_RobotSettlement'
+    if value == 'Calyx_Crimson_Nihility':
+        return 'Calyx_Crimson_Nihility_Jarilo_GreatMine'
+    if value == 'Calyx_Crimson_Preservation':
+        return 'Calyx_Crimson_Preservation_Herta_SupplyZone'
+    if value == 'Calyx_Crimson_Abundance':
+        return 'Calyx_Crimson_Abundance_Jarilo_BackwaterPass'
+
+    return value