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

Fix Sleigh Room door issues

Browse Source
This commit is contained in:
MarioSpore
2025-08-26 22:38:39 -04:00
parent fc31e2f442
commit 8c07ca8c81
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/grinch/Client.py
View File

@@ -177,17 +177,11 @@ class GrinchClient(BizHawkClient):
async def constant_address_update(self, ctx: "BizHawkClientContext"): async def constant_address_update(self, ctx: "BizHawkClientContext"):
list_recv_itemids: list[int] = [netItem.item for netItem in ctx.items_received] 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_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"] 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) 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(): for (item_name, item_data) in items_to_check.items():
# If item is an event or already been received, ignore. # 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: if item_data.id is None or GrinchLocation.get_apid(item_data.id) in list_recv_itemids:

2
worlds/grinch/Items.py
View File

@@ -152,7 +152,7 @@ KEYS_TABLE: dict[str, GrinchItemData] = {
# "Bike Race Access": GrinchItemData("Supadow Door Unlocks", 409, IC.progression, # "Bike Race Access": GrinchItemData("Supadow Door Unlocks", 409, IC.progression,
# [GrinchRamData()]) # [GrinchRamData()])
"Sleigh Room Key": GrinchItemData("Sleigh Room", 410, IC.progression_skip_balancing, "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 #Misc Items