morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Made Progressive Vacuum disabled by default due to not implemented functionality yet.

Browse Source 
Also, changed a couple for loops in Regions
This commit is contained in:
MarioSpore
2025-08-03 14:37:52 -04:00
parent cf921a8f54
commit b0a9831082
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
worlds/grinch/Options.py
View File

@@ -4,7 +4,7 @@ from Options import FreeText, NumericOption, Toggle, DefaultOnToggle, Choice, Te
PerGameCommonOptions PerGameCommonOptions
class ProgressiveVacuum(DefaultOnToggle): class ProgressiveVacuum(Toggle):
""" """
Determines whether you get access to main areas progressively Determines whether you get access to main areas progressively
@@ -36,6 +36,7 @@ class Missionsanity(Choice):
# option_who_forest = 1 # option_who_forest = 1
# option_who_dump = 2 # option_who_dump = 2
# option_who_lake = 3 # option_who_lake = 3
# default = 0
# display_name = "Starting Area" # display_name = "Starting Area"
# class Supadow(Toggle): # class Supadow(Toggle):

13
worlds/grinch/Regions.py
View File

@@ -1,8 +1,5 @@
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from BaseClasses import Region, MultiWorld
from .Locations import GrinchLocation, grinch_locations
from .Options import GrinchOptions
from BaseClasses import Region from BaseClasses import Region
from .Rules import access_rules_dict, interpret_rule from .Rules import access_rules_dict, interpret_rule
@@ -62,8 +59,14 @@ def grinchconnect(world: "GrinchWorld", current_region_name: str, connected_regi
# Goes from connected to current # Goes from connected to current
connected_region.connect(current_region) connected_region.connect(current_region)
for access_rule in rule_list: for access_rule in rule_list:
add_rule(current_region.entrances[current_region.entrances.index(next(loc_entrance for loc_entrance in current_region.entrances if loc_entrance.name.startswith(connected_region_name)))], access_rule) for region_entrance in current_region.entrances:
add_rule(connected_region.entrances[connected_region.entrances.index(next(loc_entrance for loc_entrance in connected_region.entrances if loc_entrance.name.startswith(current_region_name)))], access_rule) if region_entrance.connected_region.name == current_region_name and \
region_entrance.parent_region.name == connected_region_name:
add_rule(region_entrance, access_rule)
for region_entrance in connected_region.entrances:
if region_entrance.connected_region.name == connected_region_name and \
region_entrance.parent_region.name == current_region_name:
add_rule(region_entrance, access_rule)
def connect_regions(world: "GrinchWorld"): def connect_regions(world: "GrinchWorld"):
grinchconnect(world, "Mount Crumpit", "Whoville") grinchconnect(world, "Mount Crumpit", "Whoville")