From 8c07ca8c811de8ff69c1487bcb29498fd1fcdbcd Mon Sep 17 00:00:00 2001 From: MarioSpore Date: Tue, 26 Aug 2025 22:38:39 -0400 Subject: [PATCH] Fix Sleigh Room door issues --- worlds/grinch/Client.py | 8 +------- worlds/grinch/Items.py | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/worlds/grinch/Client.py b/worlds/grinch/Client.py index 3bea6517..41c199e9 100644 --- a/worlds/grinch/Client.py +++ b/worlds/grinch/Client.py @@ -177,17 +177,11 @@ class GrinchClient(BizHawkClient): async def constant_address_update(self, ctx: "BizHawkClientContext"): list_recv_itemids: list[int] = [netItem.item for netItem in ctx.items_received] - items_to_check: dict[str, GrinchItemData] = {**SLEIGH_PARTS_TABLE, **MISSION_ITEMS_TABLE} #, **GADGETS_TABLE, **KEYS_TABLE + items_to_check: dict[str, GrinchItemData] = {**SLEIGH_PARTS_TABLE, **MISSION_ITEMS_TABLE, **GADGETS_TABLE, **KEYS_TABLE} heart_count = len(list(item_id for item_id in list_recv_itemids if item_id == 42570)) heart_item_data = ALL_ITEMS_TABLE["Heart of Stone"] await self.update_and_validate_address(ctx, heart_item_data.update_ram_addr[0].ram_address, min(heart_count, 4), 1) - # has_sleigh_key = any(list(item_id for item_id in list_recv_itemids if item_id == 42479)) - # if not has_sleigh_key: - # sleigh_key_item_data = ALL_ITEMS_TABLE["Sleigh Room Key"] - # # TODO Game sets value to 3 at some point. If this breaks at some point, go back into this. - # await self.update_and_validate_address(ctx, sleigh_key_item_data.update_ram_addr[0].ram_address, 3, 1) - for (item_name, item_data) in items_to_check.items(): # If item is an event or already been received, ignore. if item_data.id is None or GrinchLocation.get_apid(item_data.id) in list_recv_itemids: diff --git a/worlds/grinch/Items.py b/worlds/grinch/Items.py index bf2e67f3..7ff4dde6 100644 --- a/worlds/grinch/Items.py +++ b/worlds/grinch/Items.py @@ -152,7 +152,7 @@ KEYS_TABLE: dict[str, GrinchItemData] = { # "Bike Race Access": GrinchItemData("Supadow Door Unlocks", 409, IC.progression, # [GrinchRamData()]) "Sleigh Room Key": GrinchItemData("Sleigh Room", 410, IC.progression_skip_balancing, - [GrinchRamData(0x010200, value=99), GrinchRamData(0x0100AA, binary_bit_pos=5)]) + [GrinchRamData(0x0FBF25, binary_bit_pos=1), GrinchRamData(0x0100AA, binary_bit_pos=5)]) } #Misc Items