diff --git a/worlds/grinch/Locations.py b/worlds/grinch/Locations.py index 8b57f527..18a9e07f 100644 --- a/worlds/grinch/Locations.py +++ b/worlds/grinch/Locations.py @@ -189,11 +189,11 @@ grinch_locations = { # "Bike Race - Top 2": GrinchLocationData("Bike Race", ["Supadow Minigames", "Bike Race"], 1510, [GrinchRamData()]), # "Bike Race - Top 3": GrinchLocationData("Bike Race", ["Supadow Minigames", "Bike Race"], 1511, [GrinchRamData()]), # Sleigh Part Locations - "WV - Exhaust Pipes": GrinchLocationData("Sleigh Room", ["Sleigh Ride", "Whoville"], 1600, [GrinchRamData(0x0101FB, binary_bit_pos=2)]), - "WF - Skis": GrinchLocationData("Sleigh Room", ["Sleigh Ride", "Who Forest"], 1601, [GrinchRamData(0x0101FB, binary_bit_pos=3)]), - "WD - Tires": GrinchLocationData("Sleigh Room", ["Sleigh Ride", "Who Dump"], 1602, [GrinchRamData(0x0101FB, binary_bit_pos=4)]), - "WL - Submarine World - Twin-End Tuba": GrinchLocationData("Sleigh Room", ["Sleigh Ride", "Who Lake", "South Shore"], 1603, [GrinchRamData(0x0101FB, binary_bit_pos=6)]), - "WL - South Shore - GPS": GrinchLocationData("Sleigh Room", ["Sleigh Ride", "Who Lake", "Submarine World"], 1604, [GrinchRamData(0x0101FB, binary_bit_pos=5)]), + "WV - Exhaust Pipes": GrinchLocationData("Whoville", ["Sleigh Ride", "Whoville"], 1600, [GrinchRamData(0x0101FB, binary_bit_pos=2)]), + "WF - Skis": GrinchLocationData("Who Forest", ["Sleigh Ride", "Who Forest"], 1601, [GrinchRamData(0x0101FB, binary_bit_pos=3)]), + "WD - Tires": GrinchLocationData("Who Dump", ["Sleigh Ride", "Who Dump"], 1602, [GrinchRamData(0x0101FB, binary_bit_pos=4)]), + "WL - Submarine World - Twin-End Tuba": GrinchLocationData("Submarine World", ["Sleigh Ride", "Who Lake", "South Shore"], 1603, [GrinchRamData(0x0101FB, binary_bit_pos=6)]), + "WL - South Shore - GPS": GrinchLocationData("Who Lake", ["Sleigh Ride", "Who Lake", "Submarine World"], 1604, [GrinchRamData(0x0101FB, binary_bit_pos=5)]), # Mount Crumpit Locations "MC - 1st Crate Squashed": GrinchLocationData("Mount Crumpit", ["Mount Crumpit"], 1700, [GrinchRamData(0x095343, value=1)]), "MC - 2nd Crate Squashed": GrinchLocationData("Mount Crumpit", ["Mount Crumpit"], 1701, [GrinchRamData(0x095343, value=2)]), diff --git a/worlds/grinch/Rules.py b/worlds/grinch/Rules.py index 15d248db..96bb149a 100644 --- a/worlds/grinch/Rules.py +++ b/worlds/grinch/Rules.py @@ -512,19 +512,19 @@ rules_dict: dict[str,list[list[str]]] = { [] ], "WV - Exhaust Pipes": [ - [WV, REL] + [WV, REL, SR] ], "WF - Skis": [ - [WF] + [WF, SR] ], "WD - Tires": [ - [WD, RS, REL] + [WD, RS, REL, SR] ], "WL - Submarine World - Twin-End Tuba": [ - [WL, MM] + [WL, MM, SR] ], "WL - South Shore - GPS": [ - [WL, REL] + [WL, REL, SR] ], "MC - 1st Crate Squashed": [ []