Fix: Always have a random at the end of filter

This commit is contained in:
LmeSzinc 2023-10-20 23:19:37 +08:00
parent 6f1e61b140
commit 915cd05f42
7 changed files with 39 additions and 27 deletions

View File

@ -185,7 +185,7 @@
"RoguePath": { "RoguePath": {
"PresetResonanceFilter": "preset-1", "PresetResonanceFilter": "preset-1",
"ResonanceSelectionStrategy": "follow-presets", "ResonanceSelectionStrategy": "follow-presets",
"CustomResonanceFilter": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞" "CustomResonanceFilter": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random"
}, },
"RogueBlessing": { "RogueBlessing": {
"PresetBlessingFilter": "preset-1", "PresetBlessingFilter": "preset-1",

View File

@ -1256,7 +1256,7 @@
}, },
"CustomResonanceFilter": { "CustomResonanceFilter": {
"type": "textarea", "type": "textarea",
"value": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞" "value": "回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random"
} }
}, },
"RogueBlessing": { "RogueBlessing": {

View File

@ -240,6 +240,7 @@ RoguePath:
> 回响构音:射不主皮 > 回响构音:柘弓危矢 > 回响构音:射不主皮 > 回响构音:柘弓危矢
> 回响构音:激变变星 > 回响构音:极端氦闪 > 回响构音:激变变星 > 回响构音:极端氦闪
> 回响构音:末日狂欢 > 回响构音:树苗长高舞 > 回响构音:末日狂欢 > 回响构音:树苗长高舞
> random
RogueBlessing: RogueBlessing:
PresetBlessingFilter: PresetBlessingFilter:

View File

@ -128,7 +128,7 @@ class GeneratedConfig:
# Group `RoguePath` # Group `RoguePath`
RoguePath_PresetResonanceFilter = 'preset-1' # preset-1, custom RoguePath_PresetResonanceFilter = 'preset-1' # preset-1, custom
RoguePath_ResonanceSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random RoguePath_ResonanceSelectionStrategy = 'follow-presets' # follow-presets, unrecorded-first, before-random
RoguePath_CustomResonanceFilter = '回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞' RoguePath_CustomResonanceFilter = '回响构音:均晶转变 > 回响构音:零维强化\n> 回响构音:第二次初恋 > 回响构音:体验的富翁\n> 回响构音:局外人 > 回响构音:怀疑的四重根\n> 回响构音:诸法无我 > 回响构音:诸行无常\n> 回响构音:射不主皮 > 回响构音:柘弓危矢\n> 回响构音:激变变星 > 回响构音:极端氦闪\n> 回响构音:末日狂欢 > 回响构音:树苗长高舞\n> random'
# Group `RogueBlessing` # Group `RogueBlessing`
RogueBlessing_PresetBlessingFilter = 'preset-1' # preset-1, custom RogueBlessing_PresetBlessingFilter = 'preset-1' # preset-1, custom

View File

@ -301,6 +301,8 @@ class RogueBlessingSelector(RogueSelector):
string = parse_name(string) string = parse_name(string)
# strategy # strategy
if not string.endswith('random'):
string += '> random'
strategy_config = config['strategy_config'] strategy_config = config['strategy_config']
if strategy_config == 'unrecorded-first': if strategy_config == 'unrecorded-first':
string = "unrecorded > " + string string = "unrecorded > " + string

View File

@ -1,10 +1,19 @@
BLESSING_PRESET_1 = ("巡猎-3 > 《冠军晚餐•猫的摇篮》 > 丰饶众生,一法界心 > 毁灭-3 " BLESSING_PRESET_1 = """
"> 火堆外的夜 > 巡猎-2 > 戒律性闪变 > 巡猎 > 存护-2 > reset > random") 巡猎-3 > 冠军晚餐猫的摇篮 > 丰饶众生一法界心 > 毁灭-3
RESONANCE_PRESET_1 = ("回响构音:均晶转变 > 回响构音:零维强化" > 火堆外的夜 > 巡猎-2 > 戒律性闪变 > 巡猎 > 存护-2
"> 回响构音:第二次初恋 > 回响构音:体验的富翁" > reset > random
"> 回响构音:局外人 > 回响构音:怀疑的四重根" """
"> 回响构音:诸法无我 > 回响构音:诸行无常" RESONANCE_PRESET_1 = """
"> 回响构音:射不主皮 > 回响构音:柘弓危矢" 回响构音均晶转变 > 回响构音零维强化
"> 回响构音:激变变星 > 回响构音:极端氦闪" > 回响构音第二次初恋 > 回响构音体验的富翁
"> 回响构音:末日狂欢 > 回响构音:树苗长高舞") > 回响构音局外人 > 回响构音怀疑的四重根
CURIO_PRESET_1 = "博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵 > random" > 回响构音诸法无我 > 回响构音诸行无常
> 回响构音射不主皮 > 回响构音柘弓危矢
> 回响构音激变变星 > 回响构音极端氦闪
> 回响构音末日狂欢 > 回响构音树苗长高舞
> random
"""
CURIO_PRESET_1 = """
博士之袍 > 福灵胶 > 分裂金币 > 信仰债券 > 换境桂冠 > 俱乐部券 > 碎星芳饵
> random
"""