diff --git a/assets/character/DanHengImbibitorLunae.png b/assets/character/DanHengImbibitorLunae.png new file mode 100644 index 000000000..3c9eada7c Binary files /dev/null and b/assets/character/DanHengImbibitorLunae.png differ diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 4d3f4208e..ae1001b9f 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -186,7 +186,7 @@ "Calyx_Golden_Treasures", "Calyx_Crimson_Destruction", "Calyx_Crimson_Preservation", - "Calyx_Crimson_Hunt", + "Calyx_Crimson_The_Hunt", "Calyx_Crimson_Abundance", "Calyx_Crimson_Erudition", "Calyx_Crimson_Harmony", @@ -200,6 +200,8 @@ "Stagnant_Shadow_Mirage", "Stagnant_Shadow_Icicle", "Stagnant_Shadow_Doom", + "Stagnant_Shadow_Puppetry", + "Stagnant_Shadow_Abomination", "Stagnant_Shadow_Celestial", "Cavern_of_Corrosion_Path_of_Gelid_Wind", "Cavern_of_Corrosion_Path_of_Jabbing_Punch", @@ -220,7 +222,7 @@ "Calyx_Golden_Treasures", "Calyx_Crimson_Destruction", "Calyx_Crimson_Preservation", - "Calyx_Crimson_Hunt", + "Calyx_Crimson_The_Hunt", "Calyx_Crimson_Abundance", "Calyx_Crimson_Erudition", "Calyx_Crimson_Harmony", @@ -272,7 +274,7 @@ "do_not_achieve", "Calyx_Crimson_Destruction", "Calyx_Crimson_Preservation", - "Calyx_Crimson_Hunt", + "Calyx_Crimson_The_Hunt", "Calyx_Crimson_Abundance", "Calyx_Crimson_Erudition", "Calyx_Crimson_Harmony", @@ -293,6 +295,8 @@ "Stagnant_Shadow_Mirage", "Stagnant_Shadow_Icicle", "Stagnant_Shadow_Doom", + "Stagnant_Shadow_Puppetry", + "Stagnant_Shadow_Abomination", "Stagnant_Shadow_Celestial" ] }, @@ -333,6 +337,7 @@ "Bronya", "Clara", "DanHeng", + "DanHengImbibitorLunae", "Gepard", "Herta", "Himeko", @@ -874,7 +879,9 @@ "Abandoned_and_Insulted", "Spring_of_Life", "The_Land_of_Gold", - "The_Blossom_in_the_Storm" + "The_Blossom_in_the_Storm", + "Legend_of_the_Puppet_Master", + "The_Wages_of_Humanity" ] }, "Name_2": { @@ -893,7 +900,9 @@ "Abandoned_and_Insulted", "Spring_of_Life", "The_Land_of_Gold", - "The_Blossom_in_the_Storm" + "The_Blossom_in_the_Storm", + "Legend_of_the_Puppet_Master", + "The_Wages_of_Humanity" ] }, "Name_3": { @@ -912,7 +921,9 @@ "Abandoned_and_Insulted", "Spring_of_Life", "The_Land_of_Gold", - "The_Blossom_in_the_Storm" + "The_Blossom_in_the_Storm", + "Legend_of_the_Puppet_Master", + "The_Wages_of_Humanity" ] }, "Name_4": { @@ -931,7 +942,9 @@ "Abandoned_and_Insulted", "Spring_of_Life", "The_Land_of_Gold", - "The_Blossom_in_the_Storm" + "The_Blossom_in_the_Storm", + "Legend_of_the_Puppet_Master", + "The_Wages_of_Humanity" ] }, "Duration": { diff --git a/module/config/config_generated.py b/module/config/config_generated.py index bdba746c7..586279fd8 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -39,20 +39,20 @@ class GeneratedConfig: Optimization_WhenTaskQueueEmpty = 'goto_main' # stay_there, goto_main, close_game # Group `Dungeon` - Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Celestial, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers - Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # do_not_participate, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility + Dungeon_Name = 'Calyx_Golden_Treasures' # Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Celestial, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers + Dungeon_NameAtDoubleCalyx = 'Calyx_Golden_Treasures' # do_not_participate, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility Dungeon_NameAtDoubleRelic = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_participate, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers Dungeon_Team = 1 # 1, 2, 3, 4, 5, 6 # Group `DungeonDaily` DungeonDaily_CalyxGolden = 'Calyx_Golden_Treasures' # do_not_achieve, Calyx_Golden_Memories, Calyx_Golden_Aether, Calyx_Golden_Treasures - DungeonDaily_CalyxCrimson = 'Calyx_Crimson_Erudition' # do_not_achieve, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility - DungeonDaily_StagnantShadow = 'do_not_achieve' # do_not_achieve, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Celestial + DungeonDaily_CalyxCrimson = 'Calyx_Crimson_Erudition' # do_not_achieve, Calyx_Crimson_Destruction, Calyx_Crimson_Preservation, Calyx_Crimson_The_Hunt, Calyx_Crimson_Abundance, Calyx_Crimson_Erudition, Calyx_Crimson_Harmony, Calyx_Crimson_Nihility + DungeonDaily_StagnantShadow = 'do_not_achieve' # do_not_achieve, Stagnant_Shadow_Quanta, Stagnant_Shadow_Gust, Stagnant_Shadow_Fulmination, Stagnant_Shadow_Blaze, Stagnant_Shadow_Spike, Stagnant_Shadow_Rime, Stagnant_Shadow_Mirage, Stagnant_Shadow_Icicle, Stagnant_Shadow_Doom, Stagnant_Shadow_Puppetry, Stagnant_Shadow_Abomination, Stagnant_Shadow_Celestial DungeonDaily_CavernOfCorrosion = 'Cavern_of_Corrosion_Path_of_Providence' # do_not_achieve, Cavern_of_Corrosion_Path_of_Gelid_Wind, Cavern_of_Corrosion_Path_of_Jabbing_Punch, Cavern_of_Corrosion_Path_of_Drifting, Cavern_of_Corrosion_Path_of_Providence, Cavern_of_Corrosion_Path_of_Holy_Hymn, Cavern_of_Corrosion_Path_of_Conflagration, Cavern_of_Corrosion_Path_of_Elixir_Seekers # Group `DungeonSupport` DungeonSupport_Use = 'when_daily' # always_use, when_daily, do_not_use - DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, Gepard, Herta, Himeko, Hook, JingYuan, Kafka, Luka, Luocha, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong + DungeonSupport_Character = 'FirstCharacter' # FirstCharacter, Arlan, Asta, Bailu, Blade, Bronya, Clara, DanHeng, DanHengImbibitorLunae, Gepard, Herta, Himeko, Hook, JingYuan, Kafka, Luka, Luocha, March7th, Natasha, Pela, Qingque, Sampo, Seele, Serval, SilverWolf, Sushang, Tingyun, TrailblazerDestruction, TrailblazerPreservation, Welt, Yanqing, Yukong # Group `DungeonStorage` DungeonStorage_TrailblazePower = {} @@ -91,9 +91,9 @@ class GeneratedConfig: DailyStorage_DailyQuest = {} # Group `Assignment` - Assignment_Name_1 = 'Nameless_Land_Nameless_People' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm - Assignment_Name_2 = 'Akashic_Records' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm - Assignment_Name_3 = 'The_Invisible_Hand' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm - Assignment_Name_4 = 'Nine_Billion_Names' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm + Assignment_Name_1 = 'Nameless_Land_Nameless_People' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm, Legend_of_the_Puppet_Master, The_Wages_of_Humanity + Assignment_Name_2 = 'Akashic_Records' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm, Legend_of_the_Puppet_Master, The_Wages_of_Humanity + Assignment_Name_3 = 'The_Invisible_Hand' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm, Legend_of_the_Puppet_Master, The_Wages_of_Humanity + Assignment_Name_4 = 'Nine_Billion_Names' # Nine_Billion_Names, Destruction_of_the_Destroyer, Winter_Soldiers, Born_to_Obey, Root_Out_the_Turpitude, Fire_Lord_Inflames_Blades_of_War, Nameless_Land_Nameless_People, Akashic_Records, The_Invisible_Hand, Abandoned_and_Insulted, Spring_of_Life, The_Land_of_Gold, The_Blossom_in_the_Storm, Legend_of_the_Puppet_Master, The_Wages_of_Humanity Assignment_Duration = 20 # 4, 8, 12, 20 Assignment_Assignment = {} diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 99d49603d..dc5463cc4 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -6,6 +6,7 @@ from deploy.Windows.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_writ from module.base.timer import timer from module.config.server import VALID_CHANNEL_PACKAGE, VALID_PACKAGE, to_package from module.config.utils import * +from module.config.convert import * CONFIG_IMPORT = ''' import datetime @@ -84,7 +85,7 @@ class ConfigGenerator: options=[dungeon.name for dungeon in DungeonList.instances.values() if dungeon.is_Cavern_of_Corrosion]) # Insert characters from tasks.character.keywords import CharacterList - unsupported_characters = ["DanHengImbibitorLunae"] + unsupported_characters = ["FuXuan", "Lynx"] characters = [character.name for character in CharacterList.instances.values() if character.name not in unsupported_characters] option_add(keys='DungeonSupport.Character.option', options=characters) @@ -536,11 +537,15 @@ class ConfigGenerator: self.generate_deploy_template() + 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), ] @cached_property diff --git a/module/config/convert.py b/module/config/convert.py new file mode 100644 index 000000000..264101d43 --- /dev/null +++ b/module/config/convert.py @@ -0,0 +1,4 @@ +def convert_daily(value): + if value == "Calyx_Crimson_Hunt": + value = "Calyx_Crimson_The_Hunt" + return value \ No newline at end of file diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 31ba90310..a298e8d0e 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -190,7 +190,7 @@ "Calyx_Golden_Treasures": "Material: Credit (Bud of Treasures)", "Calyx_Crimson_Destruction": "Trace: Destruction (Bud of Destruction)", "Calyx_Crimson_Preservation": "Trace: Preservation (Bud of Preservation)", - "Calyx_Crimson_Hunt": "Trace: Hunt (Bud of Hunt)", + "Calyx_Crimson_The_Hunt": "Trace: Hunt (Bud of Hunt)", "Calyx_Crimson_Abundance": "Trace: Abundance (Bud of Abundance)", "Calyx_Crimson_Erudition": "Trace: Erudition (Bud of Erudition)", "Calyx_Crimson_Harmony": "Trace: Harmony (Bud of Harmony)", @@ -204,6 +204,8 @@ "Stagnant_Shadow_Mirage": "Ascension: Imaginary (Shape of Mirage)", "Stagnant_Shadow_Icicle": "Ascension: Ice (Shape of Icicle)", "Stagnant_Shadow_Doom": "Ascension: Lighting (Shape of Doom)", + "Stagnant_Shadow_Puppetry": "Ascension: Imaginary (Shape of Puppetry)", + "Stagnant_Shadow_Abomination": "Ascension: Quantum (Shape of Abomination)", "Stagnant_Shadow_Celestial": "Ascension: Wind (Shape of Celestial)", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "Relics: Ice Set & Wind Set (Path of Gelid Wind)", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "Relics: Physical Set & Break Effect Set (Path of Jabbing Punch)", @@ -222,7 +224,7 @@ "Calyx_Golden_Treasures": "Material: Credit (Bud of Treasures)", "Calyx_Crimson_Destruction": "Trace: Destruction (Bud of Destruction)", "Calyx_Crimson_Preservation": "Trace: Preservation (Bud of Preservation)", - "Calyx_Crimson_Hunt": "Trace: Hunt (Bud of Hunt)", + "Calyx_Crimson_The_Hunt": "Trace: Hunt (Bud of Hunt)", "Calyx_Crimson_Abundance": "Trace: Abundance (Bud of Abundance)", "Calyx_Crimson_Erudition": "Trace: Erudition (Bud of Erudition)", "Calyx_Crimson_Harmony": "Trace: Harmony (Bud of Harmony)", @@ -270,7 +272,7 @@ "do_not_achieve": "Don't Do This Quest", "Calyx_Crimson_Destruction": "Trace: Destruction (Bud of Destruction)", "Calyx_Crimson_Preservation": "Trace: Preservation (Bud of Preservation)", - "Calyx_Crimson_Hunt": "Trace: Hunt (Bud of Hunt)", + "Calyx_Crimson_The_Hunt": "Trace: Hunt (Bud of Hunt)", "Calyx_Crimson_Abundance": "Trace: Abundance (Bud of Abundance)", "Calyx_Crimson_Erudition": "Trace: Erudition (Bud of Erudition)", "Calyx_Crimson_Harmony": "Trace: Harmony (Bud of Harmony)", @@ -289,6 +291,8 @@ "Stagnant_Shadow_Mirage": "Ascension: Imaginary (Shape of Mirage)", "Stagnant_Shadow_Icicle": "Ascension: Ice (Shape of Icicle)", "Stagnant_Shadow_Doom": "Ascension: Lighting (Shape of Doom)", + "Stagnant_Shadow_Puppetry": "Ascension: Imaginary (Shape of Puppetry)", + "Stagnant_Shadow_Abomination": "Ascension: Quantum (Shape of Abomination)", "Stagnant_Shadow_Celestial": "Ascension: Wind (Shape of Celestial)" }, "CavernOfCorrosion": { @@ -327,6 +331,7 @@ "Bronya": "Bronya", "Clara": "Clara", "DanHeng": "Dan Heng", + "DanHengImbibitorLunae": "Dan Heng • Imbibitor Lunae", "Gepard": "Gepard", "Herta": "Herta", "Himeko": "Himeko", @@ -585,7 +590,9 @@ "Abandoned_and_Insulted": "Phlogiston & Metal (Abandoned and Insulted)", "Spring_of_Life": "Virtual Particle & Solid Water (Spring of Life)", "The_Land_of_Gold": "Protein Rice & Basic Ingredients (The Land of Gold)", - "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)" + "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)", + "Legend_of_the_Puppet_Master": "Jade Abacus Unit & Discarded Ingenium Parts (Legend of the Puppet Master)", + "The_Wages_of_Humanity": "Extract of Medicinal Herbs & Human-Height Auspicious Crops (The Wages of Humanity)" }, "Name_2": { "name": "Assignment 2 Preference", @@ -602,7 +609,9 @@ "Abandoned_and_Insulted": "Phlogiston & Metal (Abandoned and Insulted)", "Spring_of_Life": "Virtual Particle & Solid Water (Spring of Life)", "The_Land_of_Gold": "Protein Rice & Basic Ingredients (The Land of Gold)", - "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)" + "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)", + "Legend_of_the_Puppet_Master": "Jade Abacus Unit & Discarded Ingenium Parts (Legend of the Puppet Master)", + "The_Wages_of_Humanity": "Extract of Medicinal Herbs & Human-Height Auspicious Crops (The Wages of Humanity)" }, "Name_3": { "name": "Assignment 3 Preference", @@ -619,7 +628,9 @@ "Abandoned_and_Insulted": "Phlogiston & Metal (Abandoned and Insulted)", "Spring_of_Life": "Virtual Particle & Solid Water (Spring of Life)", "The_Land_of_Gold": "Protein Rice & Basic Ingredients (The Land of Gold)", - "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)" + "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)", + "Legend_of_the_Puppet_Master": "Jade Abacus Unit & Discarded Ingenium Parts (Legend of the Puppet Master)", + "The_Wages_of_Humanity": "Extract of Medicinal Herbs & Human-Height Auspicious Crops (The Wages of Humanity)" }, "Name_4": { "name": "Assignment 4 Preference", @@ -636,7 +647,9 @@ "Abandoned_and_Insulted": "Phlogiston & Metal (Abandoned and Insulted)", "Spring_of_Life": "Virtual Particle & Solid Water (Spring of Life)", "The_Land_of_Gold": "Protein Rice & Basic Ingredients (The Land of Gold)", - "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)" + "The_Blossom_in_the_Storm": "Gaseous Liquid & Seed (The Blossom in the Storm)", + "Legend_of_the_Puppet_Master": "Jade Abacus Unit & Discarded Ingenium Parts (Legend of the Puppet Master)", + "The_Wages_of_Humanity": "Extract of Medicinal Herbs & Human-Height Auspicious Crops (The Wages of Humanity)" }, "Duration": { "name": "Dispatch Duration", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index e5d789860..29b2f2a07 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -190,7 +190,7 @@ "Calyx_Golden_Treasures": "疑似花萼（金）・秘蔵の蕾", "Calyx_Crimson_Destruction": "疑似花萼（赤）・壊滅の蕾", "Calyx_Crimson_Preservation": "疑似花萼（赤）・存護の蕾", - "Calyx_Crimson_Hunt": "疑似花萼（赤）・巡狩の蕾", + "Calyx_Crimson_The_Hunt": "疑似花萼（赤）・巡狩の蕾", "Calyx_Crimson_Abundance": "疑似花萼（赤）・豊穣の蕾", "Calyx_Crimson_Erudition": "疑似花萼（赤）・知恵の蕾", "Calyx_Crimson_Harmony": "疑似花萼（赤）・調和の蕾", @@ -204,6 +204,8 @@ "Stagnant_Shadow_Mirage": "凝結虚影・幻光の形", "Stagnant_Shadow_Icicle": "凝結虚影・氷柱の形", "Stagnant_Shadow_Doom": "凝結虚影・震厄の形", + "Stagnant_Shadow_Puppetry": "凝結虚影・傀儡の形", + "Stagnant_Shadow_Abomination": "凝結虚影・厄獣の形", "Stagnant_Shadow_Celestial": "凝結虚影・天人の形", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "侵蝕トンネル・霜風の路", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "侵蝕トンネル・迅拳の路", @@ -222,7 +224,7 @@ "Calyx_Golden_Treasures": "疑似花萼（金）・秘蔵の蕾", "Calyx_Crimson_Destruction": "疑似花萼（赤）・壊滅の蕾", "Calyx_Crimson_Preservation": "疑似花萼（赤）・存護の蕾", - "Calyx_Crimson_Hunt": "疑似花萼（赤）・巡狩の蕾", + "Calyx_Crimson_The_Hunt": "疑似花萼（赤）・巡狩の蕾", "Calyx_Crimson_Abundance": "疑似花萼（赤）・豊穣の蕾", "Calyx_Crimson_Erudition": "疑似花萼（赤）・知恵の蕾", "Calyx_Crimson_Harmony": "疑似花萼（赤）・調和の蕾", @@ -270,7 +272,7 @@ "do_not_achieve": "do_not_achieve", "Calyx_Crimson_Destruction": "疑似花萼（赤）・壊滅の蕾", "Calyx_Crimson_Preservation": "疑似花萼（赤）・存護の蕾", - "Calyx_Crimson_Hunt": "疑似花萼（赤）・巡狩の蕾", + "Calyx_Crimson_The_Hunt": "疑似花萼（赤）・巡狩の蕾", "Calyx_Crimson_Abundance": "疑似花萼（赤）・豊穣の蕾", "Calyx_Crimson_Erudition": "疑似花萼（赤）・知恵の蕾", "Calyx_Crimson_Harmony": "疑似花萼（赤）・調和の蕾", @@ -289,6 +291,8 @@ "Stagnant_Shadow_Mirage": "凝結虚影・幻光の形", "Stagnant_Shadow_Icicle": "凝結虚影・氷柱の形", "Stagnant_Shadow_Doom": "凝結虚影・震厄の形", + "Stagnant_Shadow_Puppetry": "凝結虚影・傀儡の形", + "Stagnant_Shadow_Abomination": "凝結虚影・厄獣の形", "Stagnant_Shadow_Celestial": "凝結虚影・天人の形" }, "CavernOfCorrosion": { @@ -327,6 +331,7 @@ "Bronya": "ブローニャ", "Clara": "クラーラ", "DanHeng": "丹恒", + "DanHengImbibitorLunae": "丹恒・飲月", "Gepard": "ジェパード", "Herta": "ヘルタ", "Himeko": "姫子", @@ -345,8 +350,8 @@ "SilverWolf": "銀狼", "Sushang": "素裳", "Tingyun": "停雲", - "TrailblazerDestruction": "TrailblazerDestruction", - "TrailblazerPreservation": "TrailblazerPreservation", + "TrailblazerDestruction": "開拓者・壊滅", + "TrailblazerPreservation": "開拓者・存護", "Welt": "ヴェルト", "Yanqing": "彦卿", "Yukong": "御空" @@ -585,7 +590,9 @@ "Abandoned_and_Insulted": "燃素と金属（捨てられしものと傷つけられしもの）", "Spring_of_Life": "仮想粒子と固形純水（生命の泉）", "The_Land_of_Gold": "タンパク米と基本食材（黄金の大地）", - "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）" + "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）", + "Legend_of_the_Puppet_Master": "玉兆単元&廃棄された機巧部品（傀儡師伝説）", + "The_Wages_of_Humanity": "薬草抽出物&一人稲（人類扶養）" }, "Name_2": { "name": "依頼 2", @@ -602,7 +609,9 @@ "Abandoned_and_Insulted": "燃素と金属（捨てられしものと傷つけられしもの）", "Spring_of_Life": "仮想粒子と固形純水（生命の泉）", "The_Land_of_Gold": "タンパク米と基本食材（黄金の大地）", - "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）" + "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）", + "Legend_of_the_Puppet_Master": "玉兆単元&廃棄された機巧部品（傀儡師伝説）", + "The_Wages_of_Humanity": "薬草抽出物&一人稲（人類扶養）" }, "Name_3": { "name": "依頼 3", @@ -619,7 +628,9 @@ "Abandoned_and_Insulted": "燃素と金属（捨てられしものと傷つけられしもの）", "Spring_of_Life": "仮想粒子と固形純水（生命の泉）", "The_Land_of_Gold": "タンパク米と基本食材（黄金の大地）", - "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）" + "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）", + "Legend_of_the_Puppet_Master": "玉兆単元&廃棄された機巧部品（傀儡師伝説）", + "The_Wages_of_Humanity": "薬草抽出物&一人稲（人類扶養）" }, "Name_4": { "name": "依頼 4", @@ -636,7 +647,9 @@ "Abandoned_and_Insulted": "燃素と金属（捨てられしものと傷つけられしもの）", "Spring_of_Life": "仮想粒子と固形純水（生命の泉）", "The_Land_of_Gold": "タンパク米と基本食材（黄金の大地）", - "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）" + "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）", + "Legend_of_the_Puppet_Master": "玉兆単元&廃棄された機巧部品（傀儡師伝説）", + "The_Wages_of_Humanity": "薬草抽出物&一人稲（人類扶養）" }, "Duration": { "name": "派遣時間", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index ddcf77838..66fdf8950 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -190,7 +190,7 @@ "Calyx_Golden_Treasures": "材料：信用点（藏珍之蕾•拟造花萼金）", "Calyx_Crimson_Destruction": "行迹材料：毁灭（毁灭之蕾•拟造花萼赤）", "Calyx_Crimson_Preservation": "行迹材料：存护（存护之蕾•拟造花萼赤）", - "Calyx_Crimson_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", + "Calyx_Crimson_The_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", "Calyx_Crimson_Abundance": "行迹材料：丰饶（丰饶之蕾•拟造花萼赤）", "Calyx_Crimson_Erudition": "行迹材料：智识（智识之蕾•拟造花萼赤）", "Calyx_Crimson_Harmony": "行迹材料：同谐（同谐之蕾•拟造花萼赤）", @@ -204,6 +204,8 @@ "Stagnant_Shadow_Mirage": "角色晋阶材料：虚数（幻光之形•凝滞虚影）", "Stagnant_Shadow_Icicle": "角色晋阶材料：冰（冰棱之形•凝滞虚影）", "Stagnant_Shadow_Doom": "角色晋阶材料：雷（震厄之形•凝滞虚影）", + "Stagnant_Shadow_Puppetry": "角色晋阶材料：虚数（偃偶之形•凝滞虚影）", + "Stagnant_Shadow_Abomination": "角色晋阶材料：量子（孽兽之形•凝滞虚影）", "Stagnant_Shadow_Celestial": "角色晋阶材料：风（天人之形•凝滞虚影）", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "遗器：冰套+风套（霜风之径•侵蚀隧洞）", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遗器：物理套+击破套（迅拳之径•侵蚀隧洞）", @@ -222,7 +224,7 @@ "Calyx_Golden_Treasures": "材料：信用点（藏珍之蕾•拟造花萼金）", "Calyx_Crimson_Destruction": "行迹材料：毁灭（毁灭之蕾•拟造花萼赤）", "Calyx_Crimson_Preservation": "行迹材料：存护（存护之蕾•拟造花萼赤）", - "Calyx_Crimson_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", + "Calyx_Crimson_The_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", "Calyx_Crimson_Abundance": "行迹材料：丰饶（丰饶之蕾•拟造花萼赤）", "Calyx_Crimson_Erudition": "行迹材料：智识（智识之蕾•拟造花萼赤）", "Calyx_Crimson_Harmony": "行迹材料：同谐（同谐之蕾•拟造花萼赤）", @@ -270,7 +272,7 @@ "do_not_achieve": "不完成这个任务", "Calyx_Crimson_Destruction": "行迹材料：毁灭（毁灭之蕾•拟造花萼赤）", "Calyx_Crimson_Preservation": "行迹材料：存护（存护之蕾•拟造花萼赤）", - "Calyx_Crimson_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", + "Calyx_Crimson_The_Hunt": "行迹材料：巡猎（存护之蕾•拟造花萼赤）", "Calyx_Crimson_Abundance": "行迹材料：丰饶（丰饶之蕾•拟造花萼赤）", "Calyx_Crimson_Erudition": "行迹材料：智识（智识之蕾•拟造花萼赤）", "Calyx_Crimson_Harmony": "行迹材料：同谐（同谐之蕾•拟造花萼赤）", @@ -289,6 +291,8 @@ "Stagnant_Shadow_Mirage": "角色晋阶材料：虚数（幻光之形•凝滞虚影）", "Stagnant_Shadow_Icicle": "角色晋阶材料：冰（冰棱之形•凝滞虚影）", "Stagnant_Shadow_Doom": "角色晋阶材料：雷（震厄之形•凝滞虚影）", + "Stagnant_Shadow_Puppetry": "角色晋阶材料：虚数（偃偶之形•凝滞虚影）", + "Stagnant_Shadow_Abomination": "角色晋阶材料：量子（孽兽之形•凝滞虚影）", "Stagnant_Shadow_Celestial": "角色晋阶材料：风（天人之形•凝滞虚影）" }, "CavernOfCorrosion": { @@ -327,6 +331,7 @@ "Bronya": "布洛妮娅", "Clara": "克拉拉", "DanHeng": "丹恒", + "DanHengImbibitorLunae": "丹恒•饮月", "Gepard": "杰帕德", "Herta": "黑塔", "Himeko": "姬子", @@ -585,7 +590,9 @@ "Abandoned_and_Insulted": "燃素&金属（被废弃与损害的）", "Spring_of_Life": "虚粒子&固态净水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黄金大地）", - "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）" + "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆单元&废弃机巧零件（偃师传说）", + "The_Wages_of_Humanity": "药草提取物&一人嘉禾（赡养人类）" }, "Name_2": { "name": "第2个委托选择", @@ -602,7 +609,9 @@ "Abandoned_and_Insulted": "燃素&金属（被废弃与损害的）", "Spring_of_Life": "虚粒子&固态净水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黄金大地）", - "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）" + "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆单元&废弃机巧零件（偃师传说）", + "The_Wages_of_Humanity": "药草提取物&一人嘉禾（赡养人类）" }, "Name_3": { "name": "第3个委托选择", @@ -619,7 +628,9 @@ "Abandoned_and_Insulted": "燃素&金属（被废弃与损害的）", "Spring_of_Life": "虚粒子&固态净水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黄金大地）", - "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）" + "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆单元&废弃机巧零件（偃师传说）", + "The_Wages_of_Humanity": "药草提取物&一人嘉禾（赡养人类）" }, "Name_4": { "name": "第4个委托选择", @@ -636,7 +647,9 @@ "Abandoned_and_Insulted": "燃素&金属（被废弃与损害的）", "Spring_of_Life": "虚粒子&固态净水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黄金大地）", - "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）" + "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆单元&废弃机巧零件（偃师传说）", + "The_Wages_of_Humanity": "药草提取物&一人嘉禾（赡养人类）" }, "Duration": { "name": "派遣时长", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 49272650a..134e733f7 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -190,7 +190,7 @@ "Calyx_Golden_Treasures": "材料：信用點（藏珍之蕾•擬造花萼金）", "Calyx_Crimson_Destruction": "行跡材料：毀滅（毀滅之蕾•擬造花萼赤）", "Calyx_Crimson_Preservation": "行跡材料：存護（存護之蕾•擬造花萼赤）", - "Calyx_Crimson_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", + "Calyx_Crimson_The_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", "Calyx_Crimson_Abundance": "行跡材料：豐饒（豐饒之蕾•擬造花萼赤）", "Calyx_Crimson_Erudition": "行跡材料：智識（智識之蕾•擬造花萼赤）", "Calyx_Crimson_Harmony": "行跡材料：同諧（同諧之蕾•擬造花萼赤）", @@ -204,6 +204,8 @@ "Stagnant_Shadow_Mirage": "角色晉階材料：虛數（幻光之形•凝滯虛影）", "Stagnant_Shadow_Icicle": "角色晉階材料：冰（冰稜之形•凝滯虛影）", "Stagnant_Shadow_Doom": "角色晉階材料：雷（震厄之形•凝滯虛影）", + "Stagnant_Shadow_Puppetry": "角色晉階材料：虛數（偃偶之形•凝滯虛影）", + "Stagnant_Shadow_Abomination": "角色晉階材料：量子（孽獸之形•凝滯虛影）", "Stagnant_Shadow_Celestial": "角色晉階材料：風（天人之形•凝滯虛影）", "Cavern_of_Corrosion_Path_of_Gelid_Wind": "遺器：冰套+風套（霜風之徑•侵蝕隧洞）", "Cavern_of_Corrosion_Path_of_Jabbing_Punch": "遺器：物理套+擊破套（迅拳之徑•侵蝕隧洞）", @@ -222,7 +224,7 @@ "Calyx_Golden_Treasures": "材料：信用點（藏珍之蕾•擬造花萼金）", "Calyx_Crimson_Destruction": "行跡材料：毀滅（毀滅之蕾•擬造花萼赤）", "Calyx_Crimson_Preservation": "行跡材料：存護（存護之蕾•擬造花萼赤）", - "Calyx_Crimson_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", + "Calyx_Crimson_The_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", "Calyx_Crimson_Abundance": "行跡材料：豐饒（豐饒之蕾•擬造花萼赤）", "Calyx_Crimson_Erudition": "行跡材料：智識（智識之蕾•擬造花萼赤）", "Calyx_Crimson_Harmony": "行跡材料：同諧（同諧之蕾•擬造花萼赤）", @@ -270,7 +272,7 @@ "do_not_achieve": "不完成這個任務", "Calyx_Crimson_Destruction": "行跡材料：毀滅（毀滅之蕾•擬造花萼赤）", "Calyx_Crimson_Preservation": "行跡材料：存護（存護之蕾•擬造花萼赤）", - "Calyx_Crimson_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", + "Calyx_Crimson_The_Hunt": "行跡材料：巡獵（存護之蕾•擬造花萼赤）", "Calyx_Crimson_Abundance": "行跡材料：豐饒（豐饒之蕾•擬造花萼赤）", "Calyx_Crimson_Erudition": "行跡材料：智識（智識之蕾•擬造花萼赤）", "Calyx_Crimson_Harmony": "行跡材料：同諧（同諧之蕾•擬造花萼赤）", @@ -289,6 +291,8 @@ "Stagnant_Shadow_Mirage": "角色晉階材料：虛數（幻光之形•凝滯虛影）", "Stagnant_Shadow_Icicle": "角色晉階材料：冰（冰稜之形•凝滯虛影）", "Stagnant_Shadow_Doom": "角色晉階材料：雷（震厄之形•凝滯虛影）", + "Stagnant_Shadow_Puppetry": "角色晉階材料：虛數（偃偶之形•凝滯虛影）", + "Stagnant_Shadow_Abomination": "角色晉階材料：量子（孽獸之形•凝滯虛影）", "Stagnant_Shadow_Celestial": "角色晉階材料：風（天人之形•凝滯虛影）" }, "CavernOfCorrosion": { @@ -327,6 +331,7 @@ "Bronya": "布洛妮婭", "Clara": "克拉拉", "DanHeng": "丹恆", + "DanHengImbibitorLunae": "丹恆•飲月", "Gepard": "傑帕德", "Herta": "黑塔", "Himeko": "姬子", @@ -585,7 +590,9 @@ "Abandoned_and_Insulted": "燃素&金屬（被廢棄與損害的）", "Spring_of_Life": "虛粒子&固態淨水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黃金大地）", - "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）" + "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆單元&廢棄機巧零件（偃師傳說）", + "The_Wages_of_Humanity": "藥草萃取物&一人嘉禾（贍養人類）" }, "Name_2": { "name": "第2個委託選擇", @@ -602,7 +609,9 @@ "Abandoned_and_Insulted": "燃素&金屬（被廢棄與損害的）", "Spring_of_Life": "虛粒子&固態淨水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黃金大地）", - "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）" + "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆單元&廢棄機巧零件（偃師傳說）", + "The_Wages_of_Humanity": "藥草萃取物&一人嘉禾（贍養人類）" }, "Name_3": { "name": "第3個委託選擇", @@ -619,7 +628,9 @@ "Abandoned_and_Insulted": "燃素&金屬（被廢棄與損害的）", "Spring_of_Life": "虛粒子&固態淨水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黃金大地）", - "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）" + "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆單元&廢棄機巧零件（偃師傳說）", + "The_Wages_of_Humanity": "藥草萃取物&一人嘉禾（贍養人類）" }, "Name_4": { "name": "第4個委託選擇", @@ -636,7 +647,9 @@ "Abandoned_and_Insulted": "燃素&金屬（被廢棄與損害的）", "Spring_of_Life": "虛粒子&固態淨水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黃金大地）", - "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）" + "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）", + "Legend_of_the_Puppet_Master": "玉兆單元&廢棄機巧零件（偃師傳說）", + "The_Wages_of_Humanity": "藥草萃取物&一人嘉禾（贍養人類）" }, "Duration": { "name": "派遣時間", diff --git a/tasks/assignment/keywords/entry.py b/tasks/assignment/keywords/entry.py index 70f6b06b7..76817cdbd 100644 --- a/tasks/assignment/keywords/entry.py +++ b/tasks/assignment/keywords/entry.py @@ -107,3 +107,19 @@ The_Blossom_in_the_Storm = AssignmentEntry( en='The Blossom in the Storm', jp='嵐の中で咲き誇る花', ) +Legend_of_the_Puppet_Master = AssignmentEntry( + id=14, + name='Legend_of_the_Puppet_Master', + cn='偃师传说', + cht='偃師傳說', + en='Legend of the Puppet Master', + jp='傀儡師伝説', +) +The_Wages_of_Humanity = AssignmentEntry( + id=15, + name='The_Wages_of_Humanity', + cn='赡养人类', + cht='贍養人類', + en='The Wages of Humanity', + jp='人類扶養', +) diff --git a/tasks/character/keywords/character_list.py b/tasks/character/keywords/character_list.py index 997f67789..a791ec048 100644 --- a/tasks/character/keywords/character_list.py +++ b/tasks/character/keywords/character_list.py @@ -64,11 +64,19 @@ DanHengImbibitorLunae = CharacterList( name='DanHengImbibitorLunae', cn='丹恒•饮月', cht='丹恆•飲月', - en='Dan Heng•Imbibitor Lunae', + en='Dan Heng • Imbibitor Lunae', jp='丹恒・飲月', ) -Gepard = CharacterList( +FuXuan = CharacterList( id=9, + name='FuXuan', + cn='符玄', + cht='符玄', + en='Fu Xuan', + jp='符玄', +) +Gepard = CharacterList( + id=10, name='Gepard', cn='杰帕德', cht='傑帕德', @@ -76,7 +84,7 @@ Gepard = CharacterList( jp='ジェパード', ) Herta = CharacterList( - id=10, + id=11, name='Herta', cn='黑塔', cht='黑塔', @@ -84,7 +92,7 @@ Herta = CharacterList( jp='ヘルタ', ) Himeko = CharacterList( - id=11, + id=12, name='Himeko', cn='姬子', cht='姬子', @@ -92,7 +100,7 @@ Himeko = CharacterList( jp='姫子', ) Hook = CharacterList( - id=12, + id=13, name='Hook', cn='虎克', cht='虎克', @@ -100,7 +108,7 @@ Hook = CharacterList( jp='フック', ) JingYuan = CharacterList( - id=13, + id=14, name='JingYuan', cn='景元', cht='景元', @@ -108,7 +116,7 @@ JingYuan = CharacterList( jp='景元', ) Kafka = CharacterList( - id=14, + id=15, name='Kafka', cn='卡芙卡', cht='卡芙卡', @@ -116,7 +124,7 @@ Kafka = CharacterList( jp='カフカ', ) Luka = CharacterList( - id=15, + id=16, name='Luka', cn='卢卡', cht='盧卡', @@ -124,15 +132,23 @@ Luka = CharacterList( jp='ルカ', ) Luocha = CharacterList( - id=16, + id=17, name='Luocha', cn='罗刹', cht='羅剎', en='Luocha', jp='羅刹', ) +Lynx = CharacterList( + id=18, + name='Lynx', + cn='玲可', + cht='玲可', + en='Lynx', + jp='リンクス', +) March7th = CharacterList( - id=17, + id=19, name='March7th', cn='三月七', cht='三月七', @@ -140,7 +156,7 @@ March7th = CharacterList( jp='三月なのか', ) Natasha = CharacterList( - id=18, + id=20, name='Natasha', cn='娜塔莎', cht='娜塔莎', @@ -148,7 +164,7 @@ Natasha = CharacterList( jp='ナターシャ', ) Pela = CharacterList( - id=19, + id=21, name='Pela', cn='佩拉', cht='佩拉', @@ -156,7 +172,7 @@ Pela = CharacterList( jp='ペラ', ) Qingque = CharacterList( - id=20, + id=22, name='Qingque', cn='青雀', cht='青雀', @@ -164,7 +180,7 @@ Qingque = CharacterList( jp='青雀', ) Sampo = CharacterList( - id=21, + id=23, name='Sampo', cn='桑博', cht='桑博', @@ -172,7 +188,7 @@ Sampo = CharacterList( jp='サンポ', ) Seele = CharacterList( - id=22, + id=24, name='Seele', cn='希儿', cht='希兒', @@ -180,7 +196,7 @@ Seele = CharacterList( jp='ゼーレ', ) Serval = CharacterList( - id=23, + id=25, name='Serval', cn='希露瓦', cht='希露瓦', @@ -188,7 +204,7 @@ Serval = CharacterList( jp='セーバル', ) SilverWolf = CharacterList( - id=24, + id=26, name='SilverWolf', cn='银狼', cht='銀狼', @@ -196,7 +212,7 @@ SilverWolf = CharacterList( jp='銀狼', ) Sushang = CharacterList( - id=25, + id=27, name='Sushang', cn='素裳', cht='素裳', @@ -204,7 +220,7 @@ Sushang = CharacterList( jp='素裳', ) Tingyun = CharacterList( - id=26, + id=28, name='Tingyun', cn='停云', cht='停雲', @@ -212,7 +228,7 @@ Tingyun = CharacterList( jp='停雲', ) TrailblazerDestruction = CharacterList( - id=27, + id=29, name='TrailblazerDestruction', cn='Trailblazer•毁灭', cht='Trailblazer•毀滅', @@ -220,7 +236,7 @@ TrailblazerDestruction = CharacterList( jp='Trailblazer・壊滅', ) TrailblazerPreservation = CharacterList( - id=28, + id=30, name='TrailblazerPreservation', cn='Trailblazer•存护', cht='Trailblazer•存護', @@ -228,7 +244,7 @@ TrailblazerPreservation = CharacterList( jp='Trailblazer・存護', ) Welt = CharacterList( - id=29, + id=31, name='Welt', cn='瓦尔特', cht='瓦爾特', @@ -236,7 +252,7 @@ Welt = CharacterList( jp='ヴェルト', ) Yanqing = CharacterList( - id=30, + id=32, name='Yanqing', cn='彦卿', cht='彥卿', @@ -244,7 +260,7 @@ Yanqing = CharacterList( jp='彦卿', ) Yukong = CharacterList( - id=31, + id=33, name='Yukong', cn='驭空', cht='馭空', diff --git a/tasks/dungeon/keywords/dungeon.py b/tasks/dungeon/keywords/dungeon.py index 8ce0f034e..016106779 100644 --- a/tasks/dungeon/keywords/dungeon.py +++ b/tasks/dungeon/keywords/dungeon.py @@ -43,12 +43,12 @@ Calyx_Crimson_Preservation = DungeonList( en='Bud of Preservation', jp='疑似花萼（赤）・存護の蕾', ) -Calyx_Crimson_Hunt = DungeonList( +Calyx_Crimson_The_Hunt = DungeonList( id=6, - name='Calyx_Crimson_Hunt', + name='Calyx_Crimson_The_Hunt', cn='巡猎之蕾•拟造花萼（赤）', cht='巡獵之蕾•擬造花萼（赤）', - en='Bud of Hunt', + en='Bud of The Hunt', jp='疑似花萼（赤）・巡狩の蕾', ) Calyx_Crimson_Abundance = DungeonList( @@ -155,8 +155,24 @@ Stagnant_Shadow_Doom = DungeonList( en='Shape of Doom', jp='凝結虚影・震厄の形', ) -Stagnant_Shadow_Celestial = DungeonList( +Stagnant_Shadow_Puppetry = DungeonList( id=20, + name='Stagnant_Shadow_Puppetry', + cn='偃偶之形•凝滞虚影', + cht='偃偶之形•凝滯虛影', + en='Shape of Puppetry', + jp='凝結虚影・傀儡の形', +) +Stagnant_Shadow_Abomination = DungeonList( + id=21, + name='Stagnant_Shadow_Abomination', + cn='孽兽之形•凝滞虚影', + cht='孽獸之形•凝滯虛影', + en='Shape of Abomination', + jp='凝結虚影・厄獣の形', +) +Stagnant_Shadow_Celestial = DungeonList( + id=22, name='Stagnant_Shadow_Celestial', cn='天人之形•凝滞虚影', cht='天人之形•凝滯虛影', @@ -164,7 +180,7 @@ Stagnant_Shadow_Celestial = DungeonList( jp='凝結虚影・天人の形', ) Cavern_of_Corrosion_Path_of_Gelid_Wind = DungeonList( - id=21, + id=23, name='Cavern_of_Corrosion_Path_of_Gelid_Wind', cn='霜风之径•侵蚀隧洞', cht='霜風之徑•侵蝕隧洞', @@ -172,7 +188,7 @@ Cavern_of_Corrosion_Path_of_Gelid_Wind = DungeonList( jp='侵蝕トンネル・霜風の路', ) Cavern_of_Corrosion_Path_of_Jabbing_Punch = DungeonList( - id=22, + id=24, name='Cavern_of_Corrosion_Path_of_Jabbing_Punch', cn='迅拳之径•侵蚀隧洞', cht='迅拳之徑•侵蝕隧洞', @@ -180,7 +196,7 @@ Cavern_of_Corrosion_Path_of_Jabbing_Punch = DungeonList( jp='侵蝕トンネル・迅拳の路', ) Cavern_of_Corrosion_Path_of_Drifting = DungeonList( - id=23, + id=25, name='Cavern_of_Corrosion_Path_of_Drifting', cn='漂泊之径•侵蚀隧洞', cht='漂泊之徑•侵蝕隧洞', @@ -188,7 +204,7 @@ Cavern_of_Corrosion_Path_of_Drifting = DungeonList( jp='侵蝕トンネル・漂泊の路', ) Cavern_of_Corrosion_Path_of_Providence = DungeonList( - id=24, + id=26, name='Cavern_of_Corrosion_Path_of_Providence', cn='睿治之径•侵蚀隧洞', cht='睿治之徑•侵蝕隧洞', @@ -196,7 +212,7 @@ Cavern_of_Corrosion_Path_of_Providence = DungeonList( jp='侵蝕トンネル・睿治の路', ) Cavern_of_Corrosion_Path_of_Holy_Hymn = DungeonList( - id=25, + id=27, name='Cavern_of_Corrosion_Path_of_Holy_Hymn', cn='圣颂之径•侵蚀隧洞', cht='聖頌之徑•侵蝕隧洞', @@ -204,7 +220,7 @@ Cavern_of_Corrosion_Path_of_Holy_Hymn = DungeonList( jp='侵蝕トンネル・聖頌の路', ) Cavern_of_Corrosion_Path_of_Conflagration = DungeonList( - id=26, + id=28, name='Cavern_of_Corrosion_Path_of_Conflagration', cn='野焰之径•侵蚀隧洞', cht='野焰之徑•侵蝕隧洞', @@ -212,7 +228,7 @@ Cavern_of_Corrosion_Path_of_Conflagration = DungeonList( jp='侵蝕トンネル・野焔の路', ) Cavern_of_Corrosion_Path_of_Elixir_Seekers = DungeonList( - id=27, + id=29, name='Cavern_of_Corrosion_Path_of_Elixir_Seekers', cn='药使之径•侵蚀隧洞', cht='藥使之徑•侵蝕隧洞', @@ -220,7 +236,7 @@ Cavern_of_Corrosion_Path_of_Elixir_Seekers = DungeonList( jp='侵蝕トンネル・薬使の路', ) Echo_of_War_Destruction_Beginning = DungeonList( - id=28, + id=30, name='Echo_of_War_Destruction_Beginning', cn='毁灭的开端•历战余响', cht='毀滅的開端•歷戰餘響', @@ -228,7 +244,7 @@ Echo_of_War_Destruction_Beginning = DungeonList( jp='歴戦余韻・壊滅の始まり', ) Echo_of_War_End_of_the_Eternal_Freeze = DungeonList( - id=29, + id=31, name='Echo_of_War_End_of_the_Eternal_Freeze', cn='寒潮的落幕•历战余响', cht='寒潮的落幕•歷戰餘響', @@ -236,7 +252,7 @@ Echo_of_War_End_of_the_Eternal_Freeze = DungeonList( jp='歴戦余韻・寒波の幕切れ', ) Echo_of_War_Divine_Seed = DungeonList( - id=30, + id=32, name='Echo_of_War_Divine_Seed', cn='不死的神实•历战余响', cht='不死的神實•歷戰餘響', @@ -244,7 +260,7 @@ Echo_of_War_Divine_Seed = DungeonList( jp='歴戦余韻・不死の神実', ) Simulated_Universe_World_1 = DungeonList( - id=31, + id=33, name='Simulated_Universe_World_1', cn='第一世界•模拟宇宙', cht='第一世界•模擬宇宙', @@ -252,7 +268,7 @@ Simulated_Universe_World_1 = DungeonList( jp='第一世界・模擬宇宙', ) Simulated_Universe_World_3 = DungeonList( - id=32, + id=34, name='Simulated_Universe_World_3', cn='第三世界•模拟宇宙', cht='第三世界•模擬宇宙', @@ -260,7 +276,7 @@ Simulated_Universe_World_3 = DungeonList( jp='第三世界・模擬宇宙', ) Simulated_Universe_World_4 = DungeonList( - id=33, + id=35, name='Simulated_Universe_World_4', cn='第四世界•模拟宇宙', cht='第四世界•模擬宇宙', @@ -268,7 +284,7 @@ Simulated_Universe_World_4 = DungeonList( jp='第四世界・模擬宇宙', ) Simulated_Universe_World_5 = DungeonList( - id=34, + id=36, name='Simulated_Universe_World_5', cn='第五世界•模拟宇宙', cht='第五世界•模擬宇宙', @@ -276,7 +292,7 @@ Simulated_Universe_World_5 = DungeonList( jp='第五世界・模擬宇宙', ) Simulated_Universe_World_6 = DungeonList( - id=35, + id=37, name='Simulated_Universe_World_6', cn='第六世界•模拟宇宙', cht='第六世界•模擬宇宙', @@ -284,7 +300,7 @@ Simulated_Universe_World_6 = DungeonList( jp='第六世界・模擬宇宙', ) Simulated_Universe_World_7 = DungeonList( - id=36, + id=38, name='Simulated_Universe_World_7', cn='第七世界•模拟宇宙', cht='第七世界•模擬宇宙', @@ -292,7 +308,7 @@ Simulated_Universe_World_7 = DungeonList( jp='第七世界・模擬宇宙', ) The_Voyage_of_Navis_Astriger = DungeonList( - id=37, + id=39, name='The_Voyage_of_Navis_Astriger', cn='天艟求仙迷航录', cht='天艟求仙迷航錄', @@ -300,7 +316,7 @@ The_Voyage_of_Navis_Astriger = DungeonList( jp='天艟求仙放浪記', ) Favor_of_Amber = DungeonList( - id=38, + id=40, name='Favor_of_Amber', cn='琥珀恩赐•忘却之庭', cht='琥珀恩賜•忘卻之庭', @@ -308,7 +324,7 @@ Favor_of_Amber = DungeonList( jp='琥珀の賜物・忘却の庭', ) Frostscar_Reverie = DungeonList( - id=39, + id=41, name='Frostscar_Reverie', cn='霜痕旧梦•忘却之庭', cht='霜痕舊夢•忘卻之庭', @@ -316,7 +332,7 @@ Frostscar_Reverie = DungeonList( jp='霜跡に旧夢・忘却の庭', ) Everwinter_Trials = DungeonList( - id=40, + id=42, name='Everwinter_Trials', cn='永冬试炼•忘却之庭', cht='永冬試煉•忘卻之庭', @@ -324,7 +340,7 @@ Everwinter_Trials = DungeonList( jp='常冬の試練・忘却の庭', ) Coldiron_Tribulation = DungeonList( - id=41, + id=43, name='Coldiron_Tribulation', cn='寒铁砥砺•忘却之庭', cht='寒鐵砥礪•忘卻之庭', @@ -332,7 +348,7 @@ Coldiron_Tribulation = DungeonList( jp='寒鉄練磨・忘却の庭', ) Hyperborean_Search_for_Warmth = DungeonList( - id=42, + id=44, name='Hyperborean_Search_for_Warmth', cn='蹈冰寻火•忘却之庭', cht='蹈冰尋火•忘卻之庭', @@ -340,7 +356,7 @@ Hyperborean_Search_for_Warmth = DungeonList( jp='氷踏みて炎求む・忘却の庭', ) Stormquell = DungeonList( - id=43, + id=45, name='Stormquell', cn='风暴止息•忘却之庭', cht='風暴止息•忘卻之庭', @@ -348,7 +364,7 @@ Stormquell = DungeonList( jp='止息せし嵐・忘却の庭', ) Adrift_in_Astral_Seas = DungeonList( - id=44, + id=46, name='Adrift_in_Astral_Seas', cn='孤航天海•忘却之庭', cht='孤航太海•忘卻之庭', @@ -356,7 +372,7 @@ Adrift_in_Astral_Seas = DungeonList( jp='天海の孤航・忘却の庭', ) Raintear_Strife = DungeonList( - id=45, + id=47, name='Raintear_Strife', cn='泪雨长战•忘却之庭', cht='淚雨長戰•忘卻之庭', @@ -364,15 +380,39 @@ Raintear_Strife = DungeonList( jp='涙雨戦争・忘却の庭', ) Traces_of_Sanctus_Medicus = DungeonList( - id=46, + id=48, name='Traces_of_Sanctus_Medicus', cn='药王垂迹•忘却之庭', cht='藥王垂跡•忘卻之庭', en='Traces of Sanctus Medicus', jp='薬王の垂迹・忘却の庭', ) +Ethereal_Shipcraft_Forgotten_Hall = DungeonList( + id=49, + name='Ethereal_Shipcraft_Forgotten_Hall', + cn='迷梦造舸•忘却之庭', + cht='迷夢造舸•忘卻之庭', + en='Ethereal Shipcraft — Forgotten Hall', + jp='迷夢造舟・忘却の庭', +) +A_Shot_From_the_Sky_Forgotten_Hall = DungeonList( + id=50, + name='A_Shot_From_the_Sky_Forgotten_Hall', + cn='天裂一射•忘却之庭', + cht='天裂一射•忘卻之庭', + en='A Shot From the Sky — Forgotten Hall', + jp='天裂の一射・忘却の庭', +) +Mara_and_Null_Forgotten_Hall = DungeonList( + id=51, + name='Mara_and_Null_Forgotten_Hall', + cn='魔阴空劫•忘却之庭', + cht='魔陰空劫•忘卻之庭', + en='Mara and Null — Forgotten Hall', + jp='魔陰空劫・忘却の庭', +) The_Last_Vestiges_of_Towering_Citadel = DungeonList( - id=47, + id=52, name='The_Last_Vestiges_of_Towering_Citadel', cn='永屹之城遗秘', cht='永屹之城遺秘',