From 197bfa9613b99b0ecccd18a115c5f8cd3f202d0c Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Sun, 27 Aug 2023 17:44:22 +0800 Subject: [PATCH] Opt: Move assignment duration to the last --- config/template.json | 4 ++-- module/config/argument/args.json | 20 ++++++++++---------- module/config/argument/argument.yaml | 16 ++++++++-------- module/config/config_generated.py | 2 +- module/config/i18n/en-US.json | 16 ++++++++-------- module/config/i18n/ja-JP.json | 16 ++++++++-------- module/config/i18n/zh-CN.json | 16 ++++++++-------- module/config/i18n/zh-TW.json | 16 ++++++++-------- 8 files changed, 53 insertions(+), 53 deletions(-) diff --git a/config/template.json b/config/template.json index 19bf454fe..4096a9951 100644 --- a/config/template.json +++ b/config/template.json @@ -114,11 +114,11 @@ "ServerUpdate": "04:00" }, "Assignment": { - "Duration": 20, "Name_1": "Nameless_Land_Nameless_People", "Name_2": "Akashic_Records", "Name_3": "The_Invisible_Hand", - "Name_4": "Nine_Billion_Names" + "Name_4": "Nine_Billion_Names", + "Duration": 20 } } } \ No newline at end of file diff --git a/module/config/argument/args.json b/module/config/argument/args.json index b1e0f49eb..f9f511d6d 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -819,16 +819,6 @@ } }, "Assignment": { - "Duration": { - "type": "select", - "value": 20, - "option": [ - 4, - 8, - 12, - 20 - ] - }, "Name_1": { "type": "select", "value": "Nameless_Land_Nameless_People", @@ -904,6 +894,16 @@ "The_Land_of_Gold", "The_Blossom_in_the_Storm" ] + }, + "Duration": { + "type": "select", + "value": 20, + "option": [ + 4, + 8, + 12, + 20 + ] } } } diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index ff472fd20..d4a54ae7a 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -110,7 +110,7 @@ DungeonStorage: stored: StoredDungeonDouble AchievableQuest: - # Quests will be injected in config updater +# Quests will be injected in config updater # Complete_1_Daily_Mission: # type: state # value: achievable @@ -123,19 +123,19 @@ DailyStorage: stored: StoredDaily Assignment: - Duration: - value: 20 - option: [4, 8, 12, 20] # Options in Name_x will be injected in config updater Name_1: value: Nameless_Land_Nameless_People - option: [Nameless_Land_Nameless_People, ] + option: [ Nameless_Land_Nameless_People, ] Name_2: value: Akashic_Records - option: [Nameless_Land_Nameless_People, ] + option: [ Nameless_Land_Nameless_People, ] Name_3: value: The_Invisible_Hand - option: [Nameless_Land_Nameless_People, ] + option: [ Nameless_Land_Nameless_People, ] Name_4: value: Nine_Billion_Names - option: [Nameless_Land_Nameless_People, ] \ No newline at end of file + option: [ Nameless_Land_Nameless_People, ] + Duration: + value: 20 + option: [ 4, 8, 12, 20 ] \ No newline at end of file diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 2f9b32380..bac4da7b9 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -89,8 +89,8 @@ class GeneratedConfig: DailyStorage_DailyQuest = {} # Group `Assignment` - Assignment_Duration = 20 # 4, 8, 12, 20 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_Duration = 20 # 4, 8, 12, 20 diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index bceddc3cf..447870665 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -560,14 +560,6 @@ "name": "Assignment Settings", "help": "Claim rewards and dispatch, handling specified assignments first\nIf the assignment limit is not reached after that, others will be dispatched according to preset priority (EXP Materials/Credits → Character Materials → Synthesis Materials)" }, - "Duration": { - "name": "Dispatch Duration", - "help": "", - "4": "4", - "8": "8", - "12": "12", - "20": "20" - }, "Name_1": { "name": "Assignment 1 Preference", "help": "", @@ -635,6 +627,14 @@ "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)" + }, + "Duration": { + "name": "Dispatch Duration", + "help": "", + "4": "4 Hours", + "8": "8 Hours", + "12": "12 Hours", + "20": "20 Hours" } }, "Gui": { diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index ecfd1396a..343ba5bd6 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -560,14 +560,6 @@ "name": "依頼設定", "help": "" }, - "Duration": { - "name": "派遣時間", - "help": "", - "4": "4", - "8": "8", - "12": "12", - "20": "20" - }, "Name_1": { "name": "依頼 1", "help": "", @@ -635,6 +627,14 @@ "Spring_of_Life": "仮想粒子と固形純水（生命の泉）", "The_Land_of_Gold": "タンパク米と基本食材（黄金の大地）", "The_Blossom_in_the_Storm": "気態流体と種子（嵐の中で咲き誇る花）" + }, + "Duration": { + "name": "派遣時間", + "help": "", + "4": "4", + "8": "8", + "12": "12", + "20": "20" } }, "Gui": { diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 0c1d2d24f..685be4cd8 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -560,14 +560,6 @@ "name": "委托设置", "help": "领取奖励并派遣，优先处理指定委托\n若处理指定委托之后未达到上限，则按经验材料 → 角色专属素材 → 合成材料的顺序来派遣委托" }, - "Duration": { - "name": "派遣时长", - "help": "", - "4": "4", - "8": "8", - "12": "12", - "20": "20" - }, "Name_1": { "name": "第1个委托选择", "help": "", @@ -635,6 +627,14 @@ "Spring_of_Life": "虚粒子&固态净水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黄金大地）", "The_Blossom_in_the_Storm": "气态流体&种子（风暴中怒放的花）" + }, + "Duration": { + "name": "派遣时长", + "help": "", + "4": "4小时", + "8": "8小时", + "12": "12小时", + "20": "20小时" } }, "Gui": { diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index d71c374ea..3c3c381a1 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -560,14 +560,6 @@ "name": "委託設定", "help": "領取獎勵並派遣，優先處理指定委託\n若處理指定委託之後未達到上限，則按經驗材料 → 角色專屬素材 → 合成材料的順序來派遣委託" }, - "Duration": { - "name": "派遣時間", - "help": "", - "4": "4", - "8": "8", - "12": "12", - "20": "20" - }, "Name_1": { "name": "第1個委託選擇", "help": "", @@ -635,6 +627,14 @@ "Spring_of_Life": "虛粒子&固態淨水（生命之泉）", "The_Land_of_Gold": "蛋白米&基本食材（黃金大地）", "The_Blossom_in_the_Storm": "氣態流體&種子（風暴中怒放的花）" + }, + "Duration": { + "name": "派遣時間", + "help": "", + "4": "4小時", + "8": "8小時", + "12": "12小時", + "20": "20小時" } }, "Gui": {