From 61885767d5ec53db4091676171cf63db85f805d6 Mon Sep 17 00:00:00 2001
From: MarioSpore <ironmariospore@gmail.com>
Date: Sun, 31 Aug 2025 10:44:30 -0400
Subject: [PATCH] Adds sleigh part collections as locations

---
 worlds/grinch/Locations.py | 14 ++++++++++----
 worlds/grinch/Rules.py     | 24 ++++++++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/worlds/grinch/Locations.py b/worlds/grinch/Locations.py
index 55422bb3..9d95a422 100644
--- a/worlds/grinch/Locations.py
+++ b/worlds/grinch/Locations.py
@@ -159,10 +159,10 @@ grinch_locations = {
         "Stealing All Gifts": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1300, [GrinchRamData(0x0100BF, binary_bit_pos=6)]),
         "Neutralizing Santa": GrinchLocationData("Sleigh Room", "Sleigh Ride", None, [GrinchRamData(0x0100BF, binary_bit_pos=7)]),
 #Heart of Stones
-        "Heart of Stone - Whoville": GrinchLocationData("Post Office", "Heart of Stones", 1400, [GrinchRamData(0x0101FA, binary_bit_pos=6)]),
-        "Heart of Stone - Who Forest": GrinchLocationData("Ski Resort", "Heart of Stones", 1401, [GrinchRamData(0x0101FA, binary_bit_pos=7)]),
-        "Heart of Stone - Who Dump": GrinchLocationData("Minefield", "Heart of Stones", 1402, [GrinchRamData(0x0101FB, binary_bit_pos=0)]),
-        "Heart of Stone - Who Lake": GrinchLocationData("North Shore", "Heart of Stones", 1403, [GrinchRamData(0x0101FB, binary_bit_pos=1)]),
+        "Heart of Stone - Whoville's Post Office": GrinchLocationData("Post Office", "Heart of Stones", 1400, [GrinchRamData(0x0101FA, binary_bit_pos=6)]),
+        "Heart of Stone - Who Forest's Ski Resort": GrinchLocationData("Ski Resort", "Heart of Stones", 1401, [GrinchRamData(0x0101FA, binary_bit_pos=7)]),
+        "Heart of Stone - Who Dump's Minefield": GrinchLocationData("Minefield", "Heart of Stones", 1402, [GrinchRamData(0x0101FB, binary_bit_pos=0)]),
+        "Heart of Stone - Who Lake's North Shore": GrinchLocationData("North Shore", "Heart of Stones", 1403, [GrinchRamData(0x0101FB, binary_bit_pos=1)]),
 #Supadow Minigames
         # "Spin N' Win - Easy": GrinchLocationData("Spin N' Win Supadow", "Supadow Minigames", 1500, [GrinchRamData()]),
         # "Spin N' Win - Hard": GrinchLocationData("Spin N' Win Supadow", "Supadow Minigames", 1501, [GrinchRamData()]),
@@ -176,6 +176,12 @@ grinch_locations = {
         # "Bike Race - 1st Place":  GrinchLocationData("Bike Race", "Supadow Minigames", 1509, [GrinchRamData()]),
         # "Bike Race - Top 2": GrinchLocationData("Bike Race", "Supadow Minigames", 1510, [GrinchRamData()]),
         # "Bike Race - Top 3": GrinchLocationData("Bike Race", "Supadow Minigames", 1511, [GrinchRamData()]),
+# Sleigh Part Locations
+        "Exhaust Pipes in Whoville": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1600, [GrinchRamData(0x0101FB, binary_bit_pos=2)]),
+        "Skis in Who Forest": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1601, [GrinchRamData(0x0101FB, binary_bit_pos=3)]),
+        "Tires in Who Dump": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1602, [GrinchRamData(0x0101FB, binary_bit_pos=4)]),
+        "Twin-End Tuba in Submarine World": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1603, [GrinchRamData(0x0101FB, binary_bit_pos=6)]),
+        "GPS in Who Lake": GrinchLocationData("Sleigh Room", "Sleigh Ride", 1604, [GrinchRamData(0x0101FB, binary_bit_pos=5)]),
 }
 
 def grinch_locations_to_id() -> dict[str,int]:
diff --git a/worlds/grinch/Rules.py b/worlds/grinch/Rules.py
index 5c5b773a..d9493efa 100644
--- a/worlds/grinch/Rules.py
+++ b/worlds/grinch/Rules.py
@@ -428,17 +428,17 @@ rules_dict: dict[str,list[list[str]]] = {
     "Neutralizing Santa": [
         ["Exhaust Pipes", "Tires", "Skis", "Twin-End Tuba"]
     ],
-    "Heart of Stone - Whoville": [
+    "Heart of Stone - Whoville's Post Office": [
         []
     ],
-    "Heart of Stone - Who Forest": [
+    "Heart of Stone - Who Forest's Ski Resort": [
         []
     ],
-    "Heart of Stone - Who Dump": [
+    "Heart of Stone - Who Dump's Minefield": [
         ["Grinch Copter"],
         ["Rotten Egg Launcher", "Slime Shooter", "Rocket Spring"]
     ],
-    "Heart of Stone - Who Lake": [
+    "Heart of Stone - Who Lake's North Shore": [
         []
         # ["Max"]
     ],
@@ -478,6 +478,22 @@ rules_dict: dict[str,list[list[str]]] = {
     "Bike Race - Top 3": [
         []
     ],
+    "Exhaust Pipes in Whoville": [
+        ["Rotten Egg Launcher"]
+    ],
+    "Skis in Who Forest": [
+        ["Who Forest Vacuum Access"]
+    ],
+    "Tires in Who Dump": [
+        ["Who Dump Vacuum Access", "Rocket Spring", "Rotten Egg Launcher"],
+        ["Who Dump Vacuum Access", "Rocket Spring", "Slime Shooter"]
+    ],
+    "Twin-End Tuba in Submarine World": [
+        ["Who Lake Vacuum Access", "Marine Mobile"]
+    ],
+    "GPS in Who Lake": [
+        ["Who Lake Vacuum Access", "Rotten Egg Launcher"]
+    ],
 }