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

Vastly improved speed of remove_physical_items, constant_address_update, & receiving_items_handler

Browse Source
This commit is contained in:
MarioSpore
2025-09-09 22:06:07 -04:00
parent 4e362dc722
commit 56a198fcfd
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
worlds/grinch/Client.py
View File

@@ -1,5 +1,5 @@
import time import time
from typing import TYPE_CHECKING from typing import TYPE_CHECKING, Sequence
import asyncio import asyncio
import NetUtils import NetUtils
import copy import copy
@@ -73,7 +73,7 @@ class GrinchClient(BizHawkClient):
ctx.game = self.game ctx.game = self.game
ctx.items_handling = self.items_handling ctx.items_handling = self.items_handling
ctx.want_slot_data = True ctx.want_slot_data = True
ctx.watcher_timeout = 0.25 ctx.watcher_timeout = 0.125
self.loading_bios_msg = False self.loading_bios_msg = False
return True return True
@@ -180,6 +180,7 @@ class GrinchClient(BizHawkClient):
# Ensures we only get the new items that we want to give the player # Ensures we only get the new items that we want to give the player
new_items_only = ctx.items_received[self.last_received_index:] new_items_only = ctx.items_received[self.last_received_index:]
addr_list_to_update: list[tuple[int, Sequence[int], str]] = []
for item_received in new_items_only: for item_received in new_items_only:
local_item = ctx.item_names.lookup_in_game(item_received.item) local_item = ctx.item_names.lookup_in_game(item_received.item)
@@ -199,11 +200,15 @@ class GrinchClient(BizHawkClient):
current_ram_address_value = addr_to_update.value current_ram_address_value = addr_to_update.value
# Write the updated value back into RAM # Write the updated value back into RAM
await self.update_and_validate_address(ctx, addr_to_update.ram_address, current_ram_address_value, addr_to_update.bit_size) addr_list_to_update.append((addr_to_update.ram_address,
current_ram_address_value.to_bytes(addr_to_update.bit_size, "little"),"MainRAM"))
self.last_received_index += 1 self.last_received_index += 1
await self.update_and_validate_address(ctx, RECV_ITEM_ADDR, self.last_received_index, RECV_ITEM_BITSIZE)
addr_list_to_update.append((RECV_ITEM_ADDR,
self.last_received_index.to_bytes(RECV_ITEM_BITSIZE,"little"), "MainRAM"))
await bizhawk.write(ctx.bizhawk_ctx, addr_list_to_update)
async def goal_checker(self, ctx: "BizHawkClientContext"): async def goal_checker(self, ctx: "BizHawkClientContext"):
if not ctx.finished_game: if not ctx.finished_game:
@@ -220,14 +225,17 @@ class GrinchClient(BizHawkClient):
# This function's entire purpose is to take away items we physically received ingame, but have not received from AP # This function's entire purpose is to take away items we physically received ingame, but have not received from AP
async def remove_physical_items(self, ctx: "BizHawkClientContext"): async def remove_physical_items(self, ctx: "BizHawkClientContext"):
addr_list_to_update: list[tuple[int, Sequence[int], str]] = []
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] = {**GADGETS_TABLE} #, **SLEIGH_PARTS_TABLE items_to_check: dict[str, GrinchItemData] = {**GADGETS_TABLE} #, **SLEIGH_PARTS_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) addr_list_to_update.append((heart_item_data.update_ram_addr[0].ram_address,
min(heart_count, 4).to_bytes(1, "little"), "MainRAM"))
# Setting Who Lake Mission Count back to 0 to prevent warping after completing 3 missions # Setting mission count for all accesses back to 0 to prevent warping/unlocking after completing 3 missions
await self.update_and_validate_address(ctx,0x0100F0, 0, 4) addr_list_to_update.append((0x0100F0, int(0).to_bytes(4, "little"), "MainRAM"))
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.
@@ -241,12 +249,18 @@ class GrinchClient(BizHawkClient):
current_bin_value = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [( current_bin_value = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [(
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")
current_bin_value &= ~(1 << addr_to_update.binary_bit_pos) current_bin_value &= ~(1 << addr_to_update.binary_bit_pos)
await self.update_and_validate_address(ctx, addr_to_update.ram_address, current_bin_value, 1) addr_list_to_update.append((addr_to_update.ram_address,
current_bin_value.to_bytes(1, "little"), "MainRAM"))
else: else:
await self.update_and_validate_address(ctx, addr_to_update.ram_address, 0, 1) addr_list_to_update.append((addr_to_update.ram_address,
int(0).to_bytes(1, "little"), "MainRAM"))
await bizhawk.write(ctx.bizhawk_ctx, addr_list_to_update)
# Removes the regional access until you actually received it from AP. # Removes the regional access until you actually received it from AP.
async def constant_address_update(self, ctx: "BizHawkClientContext"): async def constant_address_update(self, ctx: "BizHawkClientContext"):
addr_list_to_update: list[tuple[int, Sequence[int], str]] = []
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] = {**KEYS_TABLE, **MISSION_ITEMS_TABLE} items_to_check: dict[str, GrinchItemData] = {**KEYS_TABLE, **MISSION_ITEMS_TABLE}
@@ -265,12 +279,17 @@ class GrinchClient(BizHawkClient):
current_bin_value |= (1 << addr_to_update.binary_bit_pos) current_bin_value |= (1 << addr_to_update.binary_bit_pos)
else: else:
current_bin_value &= ~(1 << addr_to_update.binary_bit_pos) current_bin_value &= ~(1 << addr_to_update.binary_bit_pos)
await self.update_and_validate_address(ctx, addr_to_update.ram_address, current_bin_value, 1) addr_list_to_update.append((addr_to_update.ram_address,
current_bin_value.to_bytes(1, "little"), "MainRAM"))
else: else:
if GrinchLocation.get_apid(item_data.id) in list_recv_itemids: if GrinchLocation.get_apid(item_data.id) in list_recv_itemids:
await self.update_and_validate_address(ctx, addr_to_update.ram_address, addr_to_update.value, 1) addr_list_to_update.append((addr_to_update.ram_address,
addr_to_update.value.to_bytes(1, "little"), "MainRAM"))
else: else:
await self.update_and_validate_address(ctx, addr_to_update.ram_address, 0, 1) addr_list_to_update.append((addr_to_update.ram_address,
int(0).to_bytes(1, "little"), "MainRAM"))
await bizhawk.write(ctx.bizhawk_ctx, addr_list_to_update)
async def ingame_checker(self, ctx: "BizHawkClientContext"): async def ingame_checker(self, ctx: "BizHawkClientContext"):
from CommonClient import logger from CommonClient import logger
@@ -314,14 +333,6 @@ class GrinchClient(BizHawkClient):
if self.loc_unlimited_eggs: if self.loc_unlimited_eggs:
await bizhawk.write(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR, MAX_EGGS.to_bytes(2,"little"), "MainRAM")]) await bizhawk.write(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR, MAX_EGGS.to_bytes(2,"little"), "MainRAM")])
async def update_and_validate_address(self, ctx: "BizHawkClientContext", address_to_validate: int, expected_value: int, byte_size: int):
await bizhawk.write(ctx.bizhawk_ctx, [(address_to_validate, expected_value.to_bytes(byte_size, "little"), "MainRAM")])
current_value = int.from_bytes((await bizhawk.read(ctx.bizhawk_ctx, [(address_to_validate, byte_size, "MainRAM")]))[0], "little")
if not current_value == expected_value:
if address_to_validate == 0x010000 or address_to_validate == 0x08FB94 or address_to_validate == 0x010058: # TODO Temporairly skips teleportation addresses; to be changed later on.
return
raise Exception("Unable to update address as expected. Address: "+ str(address_to_validate)+"; Expected Value: "+str(expected_value))
async def ring_link_output(self, ctx: "BizHawkClientContext"): async def ring_link_output(self, ctx: "BizHawkClientContext"):
from CommonClient import logger from CommonClient import logger
while not ctx.exit_event or ctx.slot: while not ctx.exit_event or ctx.slot: