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 ringlink output

Browse Source
This commit is contained in:
MarioSpore
2025-09-11 00:11:25 -04:00
parent d4bd682ac9
commit 96eb8fcd9a
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
worlds/grinch/Client.py
View File

@@ -35,10 +35,11 @@ class GrinchClient(BizHawkClient):
system = "PSX" system = "PSX"
patch_suffix = ".apgrinch" patch_suffix = ".apgrinch"
items_handling = 0b111 items_handling = 0b111
demo_mode_buffer = 0 demo_mode_buffer: int = 0
last_map_location = -1 last_map_location: int = -1
ingame_log = False ingame_log: bool = False
previous_egg_count: int = 0 previous_egg_count: int = 0
send_ring_link: bool = False
def __init__(self): def __init__(self):
super().__init__() super().__init__()
@@ -91,6 +92,7 @@ class GrinchClient(BizHawkClient):
tags = copy.deepcopy(ctx.tags) tags = copy.deepcopy(ctx.tags)
if ring_link_enabled: if ring_link_enabled:
self.send_ring_link = True
Utils.async_start(self.ring_link_output(ctx), name="EggLink") Utils.async_start(self.ring_link_output(ctx), name="EggLink")
ctx.tags.add("RingLink") ctx.tags.add("RingLink")
else: else:
@@ -348,7 +350,7 @@ class GrinchClient(BizHawkClient):
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 and ctx.slot: while self.send_ring_link and ctx.slot:
try: try:
current_egg_count = int.from_bytes( current_egg_count = int.from_bytes(
@@ -366,8 +368,14 @@ class GrinchClient(BizHawkClient):
} }
await ctx.send_msgs([msg]) await ctx.send_msgs([msg])
self.previous_egg_count = current_egg_count self.previous_egg_count = current_egg_count
# logger.info(f"RingLink: You sent {str(current_egg_count - self.previous_egg_count)} rotten eggs.")
await asyncio.sleep(0.1)
except Exception as ex: except Exception as ex:
logger.error("While monitoring grinch's egg count ingame, an error occured. Details:"+ str(ex)) logger.error("While monitoring grinch's egg count ingame, an error occurred. Details:"+ str(ex))
self.send_ring_link = False
if not ctx.slot:
logger.info("You must be connected to the multi-world in order for RingLink to work properly.")
async def ring_link_input(self, egg_amount: int, ctx: "BizHawkClientContext"): async def ring_link_input(self, egg_amount: int, ctx: "BizHawkClientContext"):
from CommonClient import logger from CommonClient import logger
@@ -377,3 +385,4 @@ class GrinchClient(BizHawkClient):
await bizhawk.write(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR, await bizhawk.write(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR,
int(current_egg_count).to_bytes(EGG_ADDR_BYTESIZE, "little"), "MainRAM")]) int(current_egg_count).to_bytes(EGG_ADDR_BYTESIZE, "little"), "MainRAM")])
self.previous_egg_count = current_egg_count self.previous_egg_count = current_egg_count
# logger.info(f"RingLink: You received {str(egg_amount)} rotten eggs.")