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

Comment out keys and gadget tables to prevent cutscene loops

Browse Source
This commit is contained in:
MarioSpore
2025-08-25 21:34:41 -04:00
parent 41e55b169f
commit bfca1df83c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
worlds/grinch/Client.py
View File

@@ -189,16 +189,16 @@ 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)) # has_sleigh_key = any(list(item_id for item_id in list_recv_itemids if item_id == 42479))
if not has_sleigh_key: # if not has_sleigh_key:
sleigh_key_item_data = ALL_ITEMS_TABLE["Sleigh Room 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. # # 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, 0, 1) # 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.
@@ -212,11 +212,12 @@ class GrinchClient(BizHawkClient):
addr_to_update.ram_address, addr_to_update.bit_size, "MainRAM")]))[0], "little") addr_to_update.ram_address, addr_to_update.bit_size, "MainRAM")]))[0], "little")
if is_binary: if is_binary:
await self.update_and_validate_address(ctx, addr_to_update.ram_address, await self.update_and_validate_address(ctx, addr_to_update.ram_address,
current_ram_address_value | (1 << addr_to_update.binary_bit_pos), 1) 0, 1)
else: else:
await self.update_and_validate_address(ctx, addr_to_update.ram_address, 0, 1) await self.update_and_validate_address(ctx, addr_to_update.ram_address, 0, 1)
async def ingame_checker(self, ctx: "BizHawkClientContext"): async def ingame_checker(self, ctx: "BizHawkClientContext"):
# TODO Demo detection no worky
demo_mode = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [( demo_mode = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [(
0x01008A, 1, "MainRAM")]))[0], "little") 0x01008A, 1, "MainRAM")]))[0], "little")
if demo_mode == 1: if demo_mode == 1: