Opt: Simplify rogue default settings

This commit is contained in:
LmeSzinc 2023-12-18 23:30:48 +08:00
parent 6b8aff93da
commit 6576a3ebd0
13 changed files with 167 additions and 335 deletions

View File

@ -183,19 +183,13 @@
"UseStamina": false "UseStamina": false
}, },
"RogueBlessing": { "RogueBlessing": {
"PresetBlessingFilter": "preset-1", "PresetBlessingFilter": "preset",
"BlessingSelectionStrategy": "follow-presets", "CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random",
"CustomBlessingFilter": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" "PresetCurioFilter": "preset",
}, "CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random",
"RogueCurio": { "PresetResonanceFilter": "preset",
"PresetCurioFilter": "preset-1", "CustomResonanceFilter": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random",
"CurioSelectionStrategy": "follow-presets", "SelectionStrategy": "before-random"
"CustomCurioFilter": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random"
},
"RoguePath": {
"PresetResonanceFilter": "preset-1",
"ResonanceSelectionStrategy": "follow-presets",
"CustomResonanceFilter": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random"
}, },
"RogueDebug": { "RogueDebug": {
"DebugMode": false "DebugMode": false

View File

@ -1241,70 +1241,48 @@
"RogueBlessing": { "RogueBlessing": {
"PresetBlessingFilter": { "PresetBlessingFilter": {
"type": "select", "type": "select",
"value": "preset-1", "value": "preset",
"option": [ "option": [
"preset-1", "preset",
"custom" "custom"
] ]
}, },
"BlessingSelectionStrategy": {
"type": "select",
"value": "follow-presets",
"option": [
"follow-presets",
"unrecorded-first",
"before-random"
]
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"type": "textarea", "type": "textarea",
"value": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random" "value": "巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random"
} },
},
"RogueCurio": {
"PresetCurioFilter": { "PresetCurioFilter": {
"type": "select", "type": "select",
"value": "preset-1", "value": "preset",
"option": [ "option": [
"preset-1", "preset",
"custom" "custom"
] ]
}, },
"CurioSelectionStrategy": {
"type": "select",
"value": "follow-presets",
"option": [
"follow-presets",
"unrecorded-first",
"before-random"
]
},
"CustomCurioFilter": { "CustomCurioFilter": {
"type": "textarea", "type": "textarea",
"value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" "value": "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random"
} },
},
"RoguePath": {
"PresetResonanceFilter": { "PresetResonanceFilter": {
"type": "select", "type": "select",
"value": "preset-1", "value": "preset",
"option": [ "option": [
"preset-1", "preset",
"custom" "custom"
] ]
}, },
"ResonanceSelectionStrategy": {
"type": "select",
"value": "follow-presets",
"option": [
"follow-presets",
"unrecorded-first",
"before-random"
]
},
"CustomResonanceFilter": { "CustomResonanceFilter": {
"type": "textarea", "type": "textarea",
"value": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random" "value": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random"
},
"SelectionStrategy": {
"type": "select",
"value": "before-random",
"option": [
"follow-presets",
"unrecorded-first",
"before-random"
]
} }
}, },
"RogueDebug": { "RogueDebug": {

View File

@ -222,13 +222,21 @@ RogueWorld:
UseImmersifier: true UseImmersifier: true
UseStamina: false UseStamina: false
RoguePath: RogueBlessing:
PresetBlessingFilter:
value: preset
option: [ preset, custom ]
CustomBlessingFilter: |-
巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3
> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random
PresetCurioFilter:
value: preset
option: [ preset, custom ]
CustomCurioFilter: |-
博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random
PresetResonanceFilter: PresetResonanceFilter:
value: preset-1 value: preset
option: [ preset-1, custom ] option: [ preset, custom ]
ResonanceSelectionStrategy:
value: follow-presets
option: [ follow-presets, unrecorded-first, before-random ]
CustomResonanceFilter: |- CustomResonanceFilter: |-
回响构音:均晶转变 > 回响构音:零维强化 回响构音:均晶转变 > 回响构音:零维强化
> 回响构音:第二次初恋 > 回响构音:体验的富翁 > 回响构音:第二次初恋 > 回响构音:体验的富翁
@ -238,27 +246,9 @@ RoguePath:
> 回响构音:激变变星 > 回响构音:极端氦闪 > 回响构音:激变变星 > 回响构音:极端氦闪
> 回响构音:末日狂欢 > 回响构音:树苗长高舞 > 回响构音:末日狂欢 > 回响构音:树苗长高舞
> random > random
SelectionStrategy:
RogueBlessing: value: before-random
PresetBlessingFilter:
value: preset-1
option: [ preset-1, custom ]
BlessingSelectionStrategy:
value: follow-presets
option: [ follow-presets, unrecorded-first, before-random ] option: [ follow-presets, unrecorded-first, before-random ]
CustomBlessingFilter: |-
巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3
> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random
RogueCurio:
PresetCurioFilter:
value: preset-1
option: [ preset-1, custom ]
CurioSelectionStrategy:
value: follow-presets
option: [ follow-presets, unrecorded-first, before-random ]
CustomCurioFilter: |-
博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random
RogueDebug: RogueDebug:
DebugMode: false DebugMode: false

View File

@ -58,7 +58,7 @@
"stored": "StoredBattlePassLevel", "stored": "StoredBattlePassLevel",
"attrs": { "attrs": {
"time": "2020-01-01 00:00:00", "time": "2020-01-01 00:00:00",
"total": 50, "total": 70,
"value": 0 "value": 0
}, },
"order": 5, "order": 5,

View File

@ -125,20 +125,14 @@ class GeneratedConfig:
RogueWorld_UseImmersifier = True RogueWorld_UseImmersifier = True
RogueWorld_UseStamina = False RogueWorld_UseStamina = False
# Group `RoguePath`
RoguePath_PresetResonanceFilter = 'preset-1' # preset-1, custom
RoguePath_ResonanceSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random
RoguePath_CustomResonanceFilter = '回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random'
# Group `RogueBlessing` # Group `RogueBlessing`
RogueBlessing_PresetBlessingFilter = 'preset-1' # preset-1, custom RogueBlessing_PresetBlessingFilter = 'preset' # preset, custom
RogueBlessing_BlessingSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random
RogueBlessing_CustomBlessingFilter = '巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random' RogueBlessing_CustomBlessingFilter = '巡猎-3 > 《冠军晚餐·猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 \n> 火堆外的夜 > 巡猎-2 > 毁灭-2 > 巡猎 > reset > random'
RogueBlessing_PresetCurioFilter = 'preset' # preset, custom
# Group `RogueCurio` RogueBlessing_CustomCurioFilter = '博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random'
RogueCurio_PresetCurioFilter = 'preset-1' # preset-1, custom RogueBlessing_PresetResonanceFilter = 'preset' # preset, custom
RogueCurio_CurioSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random RogueBlessing_CustomResonanceFilter = '回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random'
RogueCurio_CustomCurioFilter = '博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random' RogueBlessing_SelectionStrategy = 'before-random' # follow-presets, unrecorded-first, before-random
# Group `RogueDebug` # Group `RogueDebug`
RogueDebug_DebugMode = False RogueDebug_DebugMode = False

View File

@ -776,8 +776,12 @@ class ConfigUpdater:
Yields: Yields:
str: Arg path that should be hidden str: Arg path that should be hidden
""" """
if deep_get(data, 'Rogue.RoguePath.PresetResonanceFilter') != 'custom': if deep_get(data, 'Rogue.RogueBlessing.PresetBlessingFilter') != 'custom':
yield 'Rogue.RoguePath.CustomResonanceFilter' yield 'Rogue.RogueBlessing.CustomBlessingFilter'
if deep_get(data, 'Rogue.RogueBlessing.PresetResonanceFilter') != 'custom':
yield 'Rogue.RogueBlessing.CustomResonanceFilter'
if deep_get(data, 'Rogue.RogueBlessing.PresetCurioFilter') != 'custom':
yield 'Rogue.RogueBlessing.CustomCurioFilter'
def get_hidden_args(self, data) -> t.Set[str]: def get_hidden_args(self, data) -> t.Set[str]:
""" """

View File

@ -831,29 +831,6 @@
"help": "Task \"Dungeon\" will no longer run, and all trailblaze power will be used first to claim immersion rewards, except for double events." "help": "Task \"Dungeon\" will no longer run, and all trailblaze power will be used first to claim immersion rewards, except for double events."
} }
}, },
"RoguePath": {
"_info": {
"name": "Path Settings",
"help": ""
},
"PresetResonanceFilter": {
"name": "Preset Resonance Filter",
"help": "",
"preset-1": "preset-1",
"custom": "custom"
},
"ResonanceSelectionStrategy": {
"name": "Index Locked Blessing",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomResonanceFilter": {
"name": "Custom Resonance Filter",
"help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\""
}
},
"RogueBlessing": { "RogueBlessing": {
"_info": { "_info": {
"name": "Blessing Settings", "name": "Blessing Settings",
@ -862,42 +839,39 @@
"PresetBlessingFilter": { "PresetBlessingFilter": {
"name": "Preset Blessing Filter", "name": "Preset Blessing Filter",
"help": "", "help": "",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"BlessingSelectionStrategy": {
"name": "Index Locked Blessing",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"name": "Custom Blessing Filter", "name": "Custom Blessing Filter",
"help": "Only takes effect when \"Preset Blessing Filter\" is \"custom\"" "help": "Only takes effect when \"Preset Blessing Filter\" is \"custom\""
}
},
"RogueCurio": {
"_info": {
"name": "Curio Settings",
"help": ""
}, },
"PresetCurioFilter": { "PresetCurioFilter": {
"name": "Preset Curio Filter", "name": "Preset Curio Filter",
"help": "", "help": "",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"CurioSelectionStrategy": {
"name": "Index Locked Curio",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomCurioFilter": { "CustomCurioFilter": {
"name": "Custom Curio Filter", "name": "Custom Curio Filter",
"help": "Only takes effect when \"Preset Curio Filter\" is \"custom\"" "help": "Only takes effect when \"Preset Curio Filter\" is \"custom\""
},
"PresetResonanceFilter": {
"name": "Preset Resonance Filter",
"help": "",
"preset": "preset",
"custom": "custom"
},
"CustomResonanceFilter": {
"name": "Custom Resonance Filter",
"help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\""
},
"SelectionStrategy": {
"name": "Index Locked",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
} }
}, },
"RogueDebug": { "RogueDebug": {
@ -907,7 +881,7 @@
}, },
"DebugMode": { "DebugMode": {
"name": "Debug Mode", "name": "Debug Mode",
"help": "" "help": "For development only, don't enable if you don't know what this is"
} }
}, },
"Gui": { "Gui": {

View File

@ -831,29 +831,6 @@
"help": "La tarea de mazmorra ya no se ejecutará y todo el poder trazacaminos se usará primero para reclamar recompensas de inmersión, excepto para eventos dobles" "help": "La tarea de mazmorra ya no se ejecutará y todo el poder trazacaminos se usará primero para reclamar recompensas de inmersión, excepto para eventos dobles"
} }
}, },
"RoguePath": {
"_info": {
"name": "Ajustes de Vía",
"help": ""
},
"PresetResonanceFilter": {
"name": "Filtro de preajuste de resonancia",
"help": "",
"preset-1": "preset-1",
"custom": "custom"
},
"ResonanceSelectionStrategy": {
"name": "Index Locked Blessing",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomResonanceFilter": {
"name": "Custom Resonance Filter",
"help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\""
}
},
"RogueBlessing": { "RogueBlessing": {
"_info": { "_info": {
"name": "Blessing Settings", "name": "Blessing Settings",
@ -862,42 +839,39 @@
"PresetBlessingFilter": { "PresetBlessingFilter": {
"name": "Preset Blessing Filter", "name": "Preset Blessing Filter",
"help": "", "help": "",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"BlessingSelectionStrategy": {
"name": "Index Locked Blessing",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"name": "Custom Blessing Filter", "name": "Custom Blessing Filter",
"help": "Only takes effect when \"Preset Blessing Filter\" is \"custom\"" "help": "Only takes effect when \"Preset Blessing Filter\" is \"custom\""
}
},
"RogueCurio": {
"_info": {
"name": "Ajustes de Objeto raro",
"help": ""
}, },
"PresetCurioFilter": { "PresetCurioFilter": {
"name": "Filtro de preajuste de Objeto raro", "name": "Preset Curio Filter",
"help": "", "help": "",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"CurioSelectionStrategy": {
"name": "Index Locked Curio",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
},
"CustomCurioFilter": { "CustomCurioFilter": {
"name": "Custom Curio Filter", "name": "Custom Curio Filter",
"help": "Only takes effect when \"Preset Curio Filter\" is \"custom\"" "help": "Only takes effect when \"Preset Curio Filter\" is \"custom\""
},
"PresetResonanceFilter": {
"name": "Preset Resonance Filter",
"help": "",
"preset": "preset",
"custom": "custom"
},
"CustomResonanceFilter": {
"name": "Custom Resonance Filter",
"help": "Only takes effect when \"Preset Resonance Filter\" is \"custom\""
},
"SelectionStrategy": {
"name": "Index Locked",
"help": "",
"follow-presets": "Don't affect choice",
"unrecorded-first": "Select first",
"before-random": "Select only when nothing satisfy the filter"
} }
}, },
"RogueDebug": { "RogueDebug": {
@ -907,7 +881,7 @@
}, },
"DebugMode": { "DebugMode": {
"name": "Modo de depuración", "name": "Modo de depuración",
"help": "" "help": "Solo para desarrollo, no lo habilites si no sabes qué es"
} }
}, },
"Gui": { "Gui": {

View File

@ -831,29 +831,6 @@
"help": "RogueWorld.UseStamina.help" "help": "RogueWorld.UseStamina.help"
} }
}, },
"RoguePath": {
"_info": {
"name": "RoguePath._info.name",
"help": "RoguePath._info.help"
},
"PresetResonanceFilter": {
"name": "RoguePath.PresetResonanceFilter.name",
"help": "RoguePath.PresetResonanceFilter.help",
"preset-1": "preset-1",
"custom": "custom"
},
"ResonanceSelectionStrategy": {
"name": "RoguePath.ResonanceSelectionStrategy.name",
"help": "RoguePath.ResonanceSelectionStrategy.help",
"follow-presets": "follow-presets",
"unrecorded-first": "unrecorded-first",
"before-random": "before-random"
},
"CustomResonanceFilter": {
"name": "RoguePath.CustomResonanceFilter.name",
"help": "RoguePath.CustomResonanceFilter.help"
}
},
"RogueBlessing": { "RogueBlessing": {
"_info": { "_info": {
"name": "RogueBlessing._info.name", "name": "RogueBlessing._info.name",
@ -862,42 +839,39 @@
"PresetBlessingFilter": { "PresetBlessingFilter": {
"name": "RogueBlessing.PresetBlessingFilter.name", "name": "RogueBlessing.PresetBlessingFilter.name",
"help": "RogueBlessing.PresetBlessingFilter.help", "help": "RogueBlessing.PresetBlessingFilter.help",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"BlessingSelectionStrategy": {
"name": "RogueBlessing.BlessingSelectionStrategy.name",
"help": "RogueBlessing.BlessingSelectionStrategy.help",
"follow-presets": "follow-presets",
"unrecorded-first": "unrecorded-first",
"before-random": "before-random"
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"name": "RogueBlessing.CustomBlessingFilter.name", "name": "RogueBlessing.CustomBlessingFilter.name",
"help": "RogueBlessing.CustomBlessingFilter.help" "help": "RogueBlessing.CustomBlessingFilter.help"
}
},
"RogueCurio": {
"_info": {
"name": "RogueCurio._info.name",
"help": "RogueCurio._info.help"
}, },
"PresetCurioFilter": { "PresetCurioFilter": {
"name": "RogueCurio.PresetCurioFilter.name", "name": "RogueBlessing.PresetCurioFilter.name",
"help": "RogueCurio.PresetCurioFilter.help", "help": "RogueBlessing.PresetCurioFilter.help",
"preset-1": "preset-1", "preset": "preset",
"custom": "custom" "custom": "custom"
}, },
"CurioSelectionStrategy": { "CustomCurioFilter": {
"name": "RogueCurio.CurioSelectionStrategy.name", "name": "RogueBlessing.CustomCurioFilter.name",
"help": "RogueCurio.CurioSelectionStrategy.help", "help": "RogueBlessing.CustomCurioFilter.help"
},
"PresetResonanceFilter": {
"name": "RogueBlessing.PresetResonanceFilter.name",
"help": "RogueBlessing.PresetResonanceFilter.help",
"preset": "preset",
"custom": "custom"
},
"CustomResonanceFilter": {
"name": "RogueBlessing.CustomResonanceFilter.name",
"help": "RogueBlessing.CustomResonanceFilter.help"
},
"SelectionStrategy": {
"name": "RogueBlessing.SelectionStrategy.name",
"help": "RogueBlessing.SelectionStrategy.help",
"follow-presets": "follow-presets", "follow-presets": "follow-presets",
"unrecorded-first": "unrecorded-first", "unrecorded-first": "unrecorded-first",
"before-random": "before-random" "before-random": "before-random"
},
"CustomCurioFilter": {
"name": "RogueCurio.CustomCurioFilter.name",
"help": "RogueCurio.CustomCurioFilter.help"
} }
}, },
"RogueDebug": { "RogueDebug": {

View File

@ -831,29 +831,6 @@
"help": "每日副本任务将不再打本,所有开拓力将优先被用于领取浸器奖励,双倍活动时除外" "help": "每日副本任务将不再打本,所有开拓力将优先被用于领取浸器奖励,双倍活动时除外"
} }
}, },
"RoguePath": {
"_info": {
"name": "命途设置",
"help": ""
},
"PresetResonanceFilter": {
"name": "回响构音过滤器",
"help": "",
"preset-1": "预设 1",
"custom": "自定义"
},
"ResonanceSelectionStrategy": {
"name": "图鉴未解锁的回响构音",
"help": "",
"follow-presets": "不影响选择",
"unrecorded-first": "优先选择",
"before-random": "无回响构音满足过滤器设置时才选择"
},
"CustomResonanceFilter": {
"name": "自定义回响构音过滤器",
"help": "仅在\"回响构音过滤器\"设置为\"自定义\"时生效"
}
},
"RogueBlessing": { "RogueBlessing": {
"_info": { "_info": {
"name": "祝福设置", "name": "祝福设置",
@ -862,42 +839,39 @@
"PresetBlessingFilter": { "PresetBlessingFilter": {
"name": "祝福过滤器", "name": "祝福过滤器",
"help": "", "help": "",
"preset-1": "预设 1", "preset": "预设",
"custom": "自定义" "custom": "自定义"
}, },
"BlessingSelectionStrategy": {
"name": "图鉴未解锁的祝福",
"help": "",
"follow-presets": "不影响选择",
"unrecorded-first": "优先选择",
"before-random": "无祝福满足过滤器设置时才选择"
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"name": "自定义祝福过滤器", "name": "自定义祝福过滤器",
"help": "仅在\"祝福过滤器\"设置为\"自定义\"时生效" "help": "仅在\"祝福过滤器\"设置为\"自定义\"时生效"
}
},
"RogueCurio": {
"_info": {
"name": "奇物设置",
"help": ""
}, },
"PresetCurioFilter": { "PresetCurioFilter": {
"name": "奇物过滤器", "name": "奇物过滤器",
"help": "", "help": "",
"preset-1": "预设 1", "preset": "预设",
"custom": "自定义" "custom": "自定义"
}, },
"CurioSelectionStrategy": {
"name": "图鉴未解锁的奇物",
"help": "",
"follow-presets": "不影响选择",
"unrecorded-first": "优先选择",
"before-random": "无奇物满足过滤器设置时才选择"
},
"CustomCurioFilter": { "CustomCurioFilter": {
"name": "自定义奇物过滤器", "name": "自定义奇物过滤器",
"help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效" "help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效"
},
"PresetResonanceFilter": {
"name": "回响构音过滤器",
"help": "",
"preset": "预设",
"custom": "自定义"
},
"CustomResonanceFilter": {
"name": "自定义奇物过滤器",
"help": "仅在\"奇物过滤器\"设置为\"自定义\"时生效"
},
"SelectionStrategy": {
"name": "对于未解锁的图鉴",
"help": "",
"follow-presets": "不影响选择",
"unrecorded-first": "优先选择",
"before-random": "无法满足过滤器时才选择"
} }
}, },
"RogueDebug": { "RogueDebug": {
@ -907,7 +881,7 @@
}, },
"DebugMode": { "DebugMode": {
"name": "调试模式", "name": "调试模式",
"help": "" "help": "仅用于开发,如果你不知道这是什么,不要打开"
} }
}, },
"Gui": { "Gui": {

View File

@ -831,29 +831,6 @@
"help": "每日副本任務將不再打本,所有開拓力將優先被用於領取浸器獎勵,雙倍活動時除外" "help": "每日副本任務將不再打本,所有開拓力將優先被用於領取浸器獎勵,雙倍活動時除外"
} }
}, },
"RoguePath": {
"_info": {
"name": "命途設定",
"help": ""
},
"PresetResonanceFilter": {
"name": "迴響構音過濾器",
"help": "",
"preset-1": "預設 1",
"custom": "自訂"
},
"ResonanceSelectionStrategy": {
"name": "圖鑑未解鎖的迴響構音",
"help": "",
"follow-presets": "不影響選擇",
"unrecorded-first": "優先選擇",
"before-random": "無迴響構音滿足過濾器設定時才選擇"
},
"CustomResonanceFilter": {
"name": "自訂迴響構音過濾器",
"help": "僅在\"迴響構音過濾器\"設定為\"自訂\"時生效"
}
},
"RogueBlessing": { "RogueBlessing": {
"_info": { "_info": {
"name": "祝福設定", "name": "祝福設定",
@ -862,42 +839,39 @@
"PresetBlessingFilter": { "PresetBlessingFilter": {
"name": "祝福過濾器", "name": "祝福過濾器",
"help": "", "help": "",
"preset-1": "預設 1", "preset": "預設",
"custom": "自訂" "custom": "自訂"
}, },
"BlessingSelectionStrategy": {
"name": "圖鑑未解鎖的祝福",
"help": "",
"follow-presets": "不影響選擇",
"unrecorded-first": "優先選擇",
"before-random": "無祝福滿足過濾器設定時才選擇"
},
"CustomBlessingFilter": { "CustomBlessingFilter": {
"name": "自訂祝福過濾器", "name": "自訂祝福過濾器",
"help": "僅在\"祝福過濾器\"設定為\"自訂\"時生效" "help": "僅在\"祝福過濾器\"設定為\"自訂\"時生效"
}
},
"RogueCurio": {
"_info": {
"name": "奇物設定",
"help": ""
}, },
"PresetCurioFilter": { "PresetCurioFilter": {
"name": "奇物過濾器", "name": "奇物過濾器",
"help": "", "help": "",
"preset-1": "預設 1", "preset": "預設",
"custom": "自訂" "custom": "自訂"
}, },
"CurioSelectionStrategy": {
"name": "圖鑑未解鎖的奇物",
"help": "",
"follow-presets": "不影響選擇",
"unrecorded-first": "優先選擇",
"before-random": "無奇物滿足過濾器設定時才選擇"
},
"CustomCurioFilter": { "CustomCurioFilter": {
"name": "自訂奇物過濾器", "name": "自訂奇物過濾器",
"help": "僅在\"奇物過濾器\"設定為\"自訂\"時生效" "help": "僅在\"奇物過濾器\"設定為\"自訂\"時生效"
},
"PresetResonanceFilter": {
"name": "迴響構音過濾器",
"help": "",
"preset": "預設",
"custom": "自訂"
},
"CustomResonanceFilter": {
"name": "自訂迴響構音過濾器",
"help": "僅在\"迴響構音過濾器\"設定為\"自訂\"時生效"
},
"SelectionStrategy": {
"name": "對於未解鎖的圖鑑",
"help": "",
"follow-presets": "不影響選擇",
"unrecorded-first": "優先選擇",
"before-random": "無法滿足過濾器時才選擇"
} }
}, },
"RogueDebug": { "RogueDebug": {
@ -907,7 +881,7 @@
}, },
"DebugMode": { "DebugMode": {
"name": "偵錯模式", "name": "偵錯模式",
"help": "" "help": "只用於開發,如果你不知道這是什麼,不要打開"
} }
}, },
"Gui": { "Gui": {

View File

@ -293,19 +293,19 @@ class RogueBlessingSelector(RogueSelector):
RogueBlessing: { RogueBlessing: {
"filter_": BLESSING_FILTER, "filter_": BLESSING_FILTER,
"preset_config": self.main.config.RogueBlessing_PresetBlessingFilter, "preset_config": self.main.config.RogueBlessing_PresetBlessingFilter,
"strategy_config": self.main.config.RogueBlessing_BlessingSelectionStrategy, "strategy_config": self.main.config.RogueBlessing_SelectionStrategy,
"preset_values": { "preset_values": {
'preset-1': BLESSING_PRESET_1, 'preset': BLESSING_PRESET_1,
'custom': self.main.config.RogueBlessing_CustomBlessingFilter 'custom': self.main.config.RogueBlessing_CustomBlessingFilter
}, },
}, },
RogueResonance: { RogueResonance: {
"filter_": RESONANCE_FILTER, "filter_": RESONANCE_FILTER,
"preset_config": self.main.config.RoguePath_PresetResonanceFilter, "preset_config": self.main.config.RogueBlessing_PresetResonanceFilter,
"strategy_config": self.main.config.RoguePath_ResonanceSelectionStrategy, "strategy_config": self.main.config.RogueBlessing_SelectionStrategy,
"preset_values": { "preset_values": {
'preset-1': RESONANCE_PRESET_1, 'preset': RESONANCE_PRESET_1,
'custom': self.main.config.RoguePath_PresetResonanceFilter, 'custom': self.main.config.RogueBlessing_PresetResonanceFilter,
}, },
} }
} }

View File

@ -146,14 +146,16 @@ class RogueCurioSelector(RogueSelector):
def load_filter(self): def load_filter(self):
filter_ = CURIO_FILTER filter_ = CURIO_FILTER
string = "" string = ""
match self.main.config.RogueCurio_PresetCurioFilter: match self.main.config.RogueBlessing_PresetCurioFilter:
case 'preset-1': case 'preset':
string = CURIO_PRESET_1 string = CURIO_PRESET_1
case 'custom': case 'custom':
string = self.main.config.RogueCurio_CustomCurioFilter string = self.main.config.RogueBlessing_CustomCurioFilter
string = parse_name(string) string = parse_name(string)
match self.main.config.RogueCurio_CurioSelectionStrategy: if not string.endswith('random'):
string += '> random'
match self.main.config.RogueBlessing_SelectionStrategy:
case 'unrecorded-first': case 'unrecorded-first':
string = 'unrecorded > ' + string string = 'unrecorded > ' + string
case 'before-random': case 'before-random':