From ae195133a1b7e003e99d84701dd95992ccf2724d Mon Sep 17 00:00:00 2001 From: qwint Date: Thu, 5 Dec 2024 10:37:55 -0600 Subject: [PATCH] revert schema changes because it's checked after random resolution anyways --- worlds/hk/Options.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/worlds/hk/Options.py b/worlds/hk/Options.py index db6c74fa78a1..b9f34f8a531b 100644 --- a/worlds/hk/Options.py +++ b/worlds/hk/Options.py @@ -4,7 +4,7 @@ from .ExtractedData import logic_options, starts, pool_options from .Rules import cost_terms -from schema import And, Or, Schema, Optional +from schema import And, Schema, Optional from Options import Option, DefaultOnToggle, Toggle, Choice, Range, OptionDict, NamedRange, DeathLink, PerGameCommonOptions from .Charms import vanilla_costs, names as charm_names @@ -304,12 +304,7 @@ class PlandoCharmCosts(OptionDict): display_name = "Charm Notch Cost Plando" valid_keys = frozenset(charm_names) schema = Schema({ - Optional(name): Or( - And(str, lambda n: n.startswith("random")), - And(int, lambda n: 6 >= n >= 0), - error="Charm costs must be integers in the range 0-6 or use a random prefixed string." - ) - for name in charm_names + Optional(name): And(int, lambda n: 6 >= n >= 0, error="Charm costs must be integers in the range 0-6.") for name in charm_names }) def __init__(self, value):