morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from MarioSpore/jake_ring-link-fix

Browse Source 
Fix some small issues with async on_package and changing things to be async starts instead
This commit is contained in:
MarioSpore
2025-09-09 05:46:14 -04:00
committed by GitHub
parent 8d941dad6f 14c95aa85b
commit a3a415adfd
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/grinch/Client.py
View File

@@ -78,7 +78,7 @@ class GrinchClient(BizHawkClient):
return True return True
async def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: dict) -> None: def on_package(self, ctx: "BizHawkClientContext", cmd: str, args: dict) -> None:
from CommonClient import logger from CommonClient import logger
super().on_package(ctx, cmd, args) super().on_package(ctx, cmd, args)
match cmd: match cmd:
@@ -97,14 +97,14 @@ class GrinchClient(BizHawkClient):
ctx.tags -= { "RingLink" } ctx.tags -= { "RingLink" }
if tags != ctx.tags: if tags != ctx.tags:
await ctx.send_msgs([{"cmd": "ConnectUpdate", "tags": ctx.tags}]) Utils.async_start(ctx.send_msgs([{"cmd": "ConnectUpdate", "tags": ctx.tags}]), "Update RingLink Tags")
case "Bounced": case "Bounced":
if "tags" not in args: if "tags" not in args:
return return
if "RingLink" in ctx.tags and "RingLink" in args["tags"] and args["data"]["source"] != ctx.player_names[ctx.slot]: if "RingLink" in ctx.tags and "RingLink" in args["tags"] and args["data"]["source"] != ctx.player_names[ctx.slot]:
await self.ring_link_input(args["data"]["amount"], ctx) Utils.async_start(self.ring_link_input(args["data"]["amount"], ctx), "SyncEggs")
async def set_auth(self, ctx: "BizHawkClientContext") -> None: async def set_auth(self, ctx: "BizHawkClientContext") -> None:
await ctx.get_username() await ctx.get_username()
@@ -124,7 +124,6 @@ class GrinchClient(BizHawkClient):
await self.goal_checker(ctx) await self.goal_checker(ctx)
await self.option_handler(ctx) await self.option_handler(ctx)
await self.constant_address_update(ctx) await self.constant_address_update(ctx)
# await self.ring_link_input(args["args"])
except bizhawk.RequestFailedError as ex: except bizhawk.RequestFailedError as ex:
# The connector didn't respond. Exit handler and return to main loop to reconnect # The connector didn't respond. Exit handler and return to main loop to reconnect
@@ -324,8 +323,10 @@ class GrinchClient(BizHawkClient):
raise Exception("Unable to update address as expected. Address: "+ str(address_to_validate)+"; Expected Value: "+str(expected_value)) 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
if not ctx.slot: if not ctx.slot:
return return
try: try:
current_egg_count = int.from_bytes( current_egg_count = int.from_bytes(
(await bizhawk.read(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR, EGG_ADDR_BYTESIZE, "MainRAM")]))[0], "little") (await bizhawk.read(ctx.bizhawk_ctx, [(EGG_COUNT_ADDR, EGG_ADDR_BYTESIZE, "MainRAM")]))[0], "little")