From a2db3daa03f0b7aca4f225a70c586159cd61b1fb Mon Sep 17 00:00:00 2001 From: 0O0o0oOoO00 <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Thu, 11 Sep 2025 23:12:25 +0800 Subject: [PATCH] add: add power limit setting --- config/template.json | 10 ++++++++++ module/config/argument/args.json | 24 ++++++++++++++++++++++++ module/config/argument/argument.yaml | 5 ++++- module/config/argument/menu.json | 1 + module/config/argument/task.yaml | 2 ++ module/config/config_generated.py | 5 +++++ module/config/full_config_generated.py | 6 ++++++ module/config/i18n/en-US.json | 22 ++++++++++++++++++++++ module/config/i18n/ja-JP.json | 22 ++++++++++++++++++++++ module/config/i18n/zh-CN.json | 22 ++++++++++++++++++++++ module/config/i18n/zh-TW.json | 22 ++++++++++++++++++++++ 11 files changed, 140 insertions(+), 1 deletion(-) diff --git a/config/template.json b/config/template.json index 865a0a7b0..ef920011e 100644 --- a/config/template.json +++ b/config/template.json @@ -87,6 +87,16 @@ "Storage": {} } }, + "PowerLimit": { + "PowerLimit": { + "Exercise": 25000, + "Raid": 25000, + "Ash": 25000 + }, + "Storage": { + "Storage": {} + } + }, "Hook": { "HookGeneral": { "Enable": false, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index f826e1373..4643123b4 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -450,6 +450,30 @@ } } }, + "PowerLimit": { + "PowerLimit": { + "Exercise": { + "type": "input", + "value": 25000 + }, + "Raid": { + "type": "input", + "value": 25000 + }, + "Ash": { + "type": "input", + "value": 25000 + } + }, + "Storage": { + "Storage": { + "type": "storage", + "value": {}, + "valuetype": "ignore", + "display": "disabled" + } + } + }, "Hook": { "HookGeneral": { "Enable": { diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index cbc556a8c..b9b436d35 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -832,7 +832,10 @@ Misc: SkipBattleCelebrate: false # ==================== Cheat ==================== - +PowerLimit: + Exercise: 25000 + Raid: 25000 + Ash: 25000 GameRestart: Enable: false MaxRetryTimes: 5 diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 81cb80ccc..0035f8a88 100644 --- a/module/config/argument/menu.json +++ b/module/config/argument/menu.json @@ -12,6 +12,7 @@ "menu": "collapse", "page": "setting", "tasks": [ + "PowerLimit", "Hook" ] }, diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index b2efb9e58..03c90f2b9 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -30,6 +30,8 @@ Cheat: menu: 'collapse' page: 'setting' tasks: + PowerLimit: + - PowerLimit Hook: - HookGeneral - Misc diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 9f763422e..d75a809e4 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -509,6 +509,11 @@ class GeneratedConfig: Misc_MonsterKillSelf = False Misc_SkipBattleCelebrate = False + # Group `PowerLimit` + PowerLimit_Exercise = 25000 + PowerLimit_Raid = 25000 + PowerLimit_Ash = 25000 + # Group `GameRestart` GameRestart_Enable = False GameRestart_MaxRetryTimes = 5 diff --git a/module/config/full_config_generated.py b/module/config/full_config_generated.py index 71f82f6b5..2e8579c1e 100644 --- a/module/config/full_config_generated.py +++ b/module/config/full_config_generated.py @@ -65,6 +65,12 @@ class FullGeneratedConfig: Restart_InstanceRestart_Notify = None Restart_Storage_Storage = None + # Task `PowerLimit` + PowerLimit_PowerLimit_Exercise = None + PowerLimit_PowerLimit_Raid = None + PowerLimit_PowerLimit_Ash = None + PowerLimit_Storage_Storage = None + # Task `Hook` Hook_HookGeneral_Enable = None Hook_HookGeneral_PushEveryTime = None diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index ce6e66ee6..1ce8e1c56 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -50,6 +50,10 @@ "name": "Restart", "help": "" }, + "PowerLimit": { + "name": "Task.PowerLimit.name", + "help": "Task.PowerLimit.help" + }, "Hook": { "name": "Task.Hook.name", "help": "Task.Hook.help" @@ -2867,6 +2871,24 @@ "help": "Misc.SkipBattleCelebrate.help" } }, + "PowerLimit": { + "_info": { + "name": "PowerLimit._info.name", + "help": "PowerLimit._info.help" + }, + "Exercise": { + "name": "PowerLimit.Exercise.name", + "help": "PowerLimit.Exercise.help" + }, + "Raid": { + "name": "PowerLimit.Raid.name", + "help": "PowerLimit.Raid.help" + }, + "Ash": { + "name": "PowerLimit.Ash.name", + "help": "PowerLimit.Ash.help" + } + }, "GameRestart": { "_info": { "name": "GameRestart._info.name", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index c434e8804..8bbbe8a62 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -50,6 +50,10 @@ "name": "再起動設定", "help": "" }, + "PowerLimit": { + "name": "Task.PowerLimit.name", + "help": "Task.PowerLimit.help" + }, "Hook": { "name": "Task.Hook.name", "help": "Task.Hook.help" @@ -2867,6 +2871,24 @@ "help": "Misc.SkipBattleCelebrate.help" } }, + "PowerLimit": { + "_info": { + "name": "PowerLimit._info.name", + "help": "PowerLimit._info.help" + }, + "Exercise": { + "name": "PowerLimit.Exercise.name", + "help": "PowerLimit.Exercise.help" + }, + "Raid": { + "name": "PowerLimit.Raid.name", + "help": "PowerLimit.Raid.help" + }, + "Ash": { + "name": "PowerLimit.Ash.name", + "help": "PowerLimit.Ash.help" + } + }, "GameRestart": { "_info": { "name": "GameRestart._info.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 50d7852f6..c6ef63d80 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -50,6 +50,10 @@ "name": "重启设置", "help": "" }, + "PowerLimit": { + "name": "战力限制", + "help": "" + }, "Hook": { "name": "Hook", "help": "" @@ -2867,6 +2871,24 @@ "help": "" } }, + "PowerLimit": { + "_info": { + "name": "战力限制", + "help": "敏感项目前的最后一道保险\n若前排战力高于此值强制重启，并视为需要使用GG（打开GG开关以及GG自动重启倍率开关）" + }, + "Exercise": { + "name": "演习", + "help": "" + }, + "Raid": { + "name": "共斗", + "help": "" + }, + "Ash": { + "name": "余烬信标", + "help": "" + } + }, "GameRestart": { "_info": { "name": "游戏重启", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index a764fd838..af79a16e1 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -50,6 +50,10 @@ "name": "重啟設定", "help": "" }, + "PowerLimit": { + "name": "Task.PowerLimit.name", + "help": "Task.PowerLimit.help" + }, "Hook": { "name": "Task.Hook.name", "help": "Task.Hook.help" @@ -2867,6 +2871,24 @@ "help": "Misc.SkipBattleCelebrate.help" } }, + "PowerLimit": { + "_info": { + "name": "PowerLimit._info.name", + "help": "PowerLimit._info.help" + }, + "Exercise": { + "name": "PowerLimit.Exercise.name", + "help": "PowerLimit.Exercise.help" + }, + "Raid": { + "name": "PowerLimit.Raid.name", + "help": "PowerLimit.Raid.help" + }, + "Ash": { + "name": "PowerLimit.Ash.name", + "help": "PowerLimit.Ash.help" + } + }, "GameRestart": { "_info": { "name": "GameRestart._info.name",