From ad86cc6f6ce4636dc06be5abc5e66f077863a572 Mon Sep 17 00:00:00 2001 From: Zebartin <16185081+Zebartin@users.noreply.github.com> Date: Mon, 25 Sep 2023 15:26:18 +0800 Subject: [PATCH] Add: Config for event assignments --- config/template.json | 1 + module/config/argument/args.json | 8 ++++++++ module/config/argument/argument.yaml | 3 +++ module/config/config_generated.py | 1 + module/config/i18n/en-US.json | 6 ++++++ module/config/i18n/ja-JP.json | 6 ++++++ module/config/i18n/zh-CN.json | 6 ++++++ module/config/i18n/zh-TW.json | 6 ++++++ 8 files changed, 37 insertions(+) diff --git a/config/template.json b/config/template.json index 41dfb1136..908475774 100644 --- a/config/template.json +++ b/config/template.json @@ -121,6 +121,7 @@ "ServerUpdate": "04:00" }, "Assignment": { + "WhenEventAssignmentsArePresent": "event_first", "Name_1": "Nameless_Land_Nameless_People", "Name_2": "Akashic_Records", "Name_3": "The_Invisible_Hand", diff --git a/module/config/argument/args.json b/module/config/argument/args.json index adf07c25f..acfc03115 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -893,6 +893,14 @@ } }, "Assignment": { + "WhenEventAssignmentsArePresent": { + "type": "select", + "value": "event_first", + "option": [ + "event_first", + "do_not_participate" + ] + }, "Name_1": { "type": "select", "value": "Nameless_Land_Nameless_People", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index fb10caf59..5272c264e 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -147,6 +147,9 @@ BattlePassStorage: stored: StoredBattlePassTodayQuest Assignment: + WhenEventAssignmentsArePresent: + value: event_first + option: [event_first, do_not_participate] # Options in Name_x will be injected in config updater Name_1: value: Nameless_Land_Nameless_People diff --git a/module/config/config_generated.py b/module/config/config_generated.py index da2b7a8da..c27941895 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -96,6 +96,7 @@ class GeneratedConfig: BattlePassStorage_BattlePassTodayQuest = {} # Group `Assignment` + Assignment_WhenEventAssignmentsArePresent = 'event_first' # event_first, do_not_participate 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 diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 81c5be155..6d81b4980 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -613,6 +613,12 @@ "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)" }, + "WhenEventAssignmentsArePresent": { + "name": "When Event Assignments are Present", + "help": "", + "event_first": "Complete Event Assignments First", + "do_not_participate": "Dont Participate in Event" + }, "Name_1": { "name": "Assignment 1 Preference", "help": "", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index f20352d19..33a3032c6 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -613,6 +613,12 @@ "name": "依頼設定", "help": "" }, + "WhenEventAssignmentsArePresent": { + "name": "Assignment.WhenEventAssignmentsArePresent.name", + "help": "Assignment.WhenEventAssignmentsArePresent.help", + "event_first": "event_first", + "do_not_participate": "do_not_participate" + }, "Name_1": { "name": "依頼 1", "help": "", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index a951bd771..aee02796a 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -613,6 +613,12 @@ "name": "委托设置", "help": "领取奖励并派遣，优先处理指定委托\n若处理指定委托之后未达到上限，则按经验材料 → 角色专属素材 → 合成材料的顺序来派遣委托" }, + "WhenEventAssignmentsArePresent": { + "name": "有特别委托活动时", + "help": "", + "event_first": "优先活动委托", + "do_not_participate": "不参加活动" + }, "Name_1": { "name": "第1个委托选择", "help": "", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 762665f90..671e269d5 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -613,6 +613,12 @@ "name": "委託設定", "help": "領取獎勵並派遣，優先處理指定委託\n若處理指定委託之後未達到上限，則按經驗材料 → 角色專屬素材 → 合成材料的順序來派遣委託" }, + "WhenEventAssignmentsArePresent": { + "name": "有特別委託活動時", + "help": "", + "event_first": "優先活動委託", + "do_not_participate": "不參加活動" + }, "Name_1": { "name": "第1個委託選擇", "help": "",