mirror of
https://github.com/MarioSpore/Grinch-AP.git
synced 2025-10-21 12:11:33 -06:00
Core: Support inequality operators ("less than") for Choice option string comparisons (#3769)
* add some unit tests to it * fix * Update Options.py Co-authored-by: qwint <qwint.42@gmail.com> * Update Options.py --------- Co-authored-by: qwint <qwint.42@gmail.com>
This commit is contained in:
@@ -257,7 +257,7 @@ class WitnessWorld(World):
|
||||
needed_size = 2
|
||||
needed_size += self.options.puzzle_randomization == "sigma_expert"
|
||||
needed_size += self.options.shuffle_symbols
|
||||
needed_size += self.options.shuffle_doors > 0
|
||||
needed_size += self.options.shuffle_doors != "off"
|
||||
|
||||
# Then, add checks in order until the required amount of sphere 1 checks is met.
|
||||
|
||||
|
@@ -129,7 +129,7 @@ def get_priority_hint_items(world: "WitnessWorld") -> List[str]:
|
||||
"Shadows Laser",
|
||||
]
|
||||
|
||||
if world.options.shuffle_doors >= 2:
|
||||
if world.options.shuffle_doors >= "doors":
|
||||
priority.add("Desert Laser")
|
||||
priority.update(world.random.sample(lasers, 5))
|
||||
|
||||
|
@@ -435,7 +435,7 @@ class WitnessPlayerLogic:
|
||||
postgame_adjustments = []
|
||||
|
||||
# Make some quick references to some options
|
||||
remote_doors = world.options.shuffle_doors >= 2 # "Panels" mode has no region accessibility implications.
|
||||
remote_doors = world.options.shuffle_doors >= "doors" # "Panels" mode has no region accessibility implications.
|
||||
early_caves = world.options.early_caves
|
||||
victory = world.options.victory_condition
|
||||
mnt_lasers = world.options.mountain_lasers
|
||||
@@ -592,7 +592,7 @@ class WitnessPlayerLogic:
|
||||
|
||||
# Make condensed references to some options
|
||||
|
||||
remote_doors = world.options.shuffle_doors >= 2 # "Panels" mode has no overarching region access implications.
|
||||
remote_doors = world.options.shuffle_doors >= "doors" # "Panels" mode has no region access implications.
|
||||
lasers = world.options.shuffle_lasers
|
||||
victory = world.options.victory_condition
|
||||
mnt_lasers = world.options.mountain_lasers
|
||||
|
Reference in New Issue
Block a user