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

CommonClient: implement check_locations to send missing locations only (#4484)

Browse Source 
Co-authored-by: Scipio Wright <scipiowright@gmail.com>
This commit is contained in:
Fabian Dill
2025-01-19 00:26:42 +01:00
committed by GitHub
parent 005a143e3e
commit 1c9409cac9
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CommonClient.py
View File

@@ -459,6 +459,13 @@ class CommonContext:
await self.send_msgs([payload]) await self.send_msgs([payload])
await self.send_msgs([{"cmd": "Get", "keys": ["_read_race_mode"]}]) await self.send_msgs([{"cmd": "Get", "keys": ["_read_race_mode"]}])
async def check_locations(self, locations: typing.Collection[int]) -> set[int]:
"""Send new location checks to the server. Returns the set of actually new locations that were sent."""
locations = set(locations) & self.missing_locations
if locations:
await self.send_msgs([{"cmd": 'LocationChecks', "locations": tuple(locations)}])
return locations
async def console_input(self) -> str: async def console_input(self) -> str:
if self.ui: if self.ui:
self.ui.focus_textinput() self.ui.focus_textinput()

2
worlds/alttp/Client.py
View File

@@ -464,7 +464,7 @@ async def track_locations(ctx, roomid, roomdata) -> bool:
snes_logger.info(f"Discarding recent {len(new_locations)} checks as ROM Status has changed.") snes_logger.info(f"Discarding recent {len(new_locations)} checks as ROM Status has changed.")
return False return False
else: else:
await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": new_locations}]) await ctx.check_locations(new_locations)
await snes_flush_writes(ctx) await snes_flush_writes(ctx)
return True return True

5
worlds/factorio/Client.py
View File

@@ -234,8 +234,7 @@ async def game_watcher(ctx: FactorioContext):
f"Connected Multiworld is not the expected one {data['seed_name']} != {ctx.seed_name}") f"Connected Multiworld is not the expected one {data['seed_name']} != {ctx.seed_name}")
else: else:
data = data["info"] data = data["info"]
research_data = data["research_done"] research_data: set[int] = {int(tech_name.split("-")[1]) for tech_name in data["research_done"]}
research_data = {int(tech_name.split("-")[1]) for tech_name in research_data}
victory = data["victory"] victory = data["victory"]
await ctx.update_death_link(data["death_link"]) await ctx.update_death_link(data["death_link"])
ctx.multiplayer = data.get("multiplayer", False) ctx.multiplayer = data.get("multiplayer", False)
@@ -249,7 +248,7 @@ async def game_watcher(ctx: FactorioContext):
f"New researches done: " f"New researches done: "
f"{[ctx.location_names.lookup_in_game(rid) for rid in research_data - ctx.locations_checked]}") f"{[ctx.location_names.lookup_in_game(rid) for rid in research_data - ctx.locations_checked]}")
ctx.locations_checked = research_data ctx.locations_checked = research_data
await ctx.send_msgs([{"cmd": 'LocationChecks', "locations": tuple(research_data)}]) await ctx.check_locations(research_data)
death_link_tick = data.get("death_link_tick", 0) death_link_tick = data.get("death_link_tick", 0)
if death_link_tick != ctx.death_link_tick: if death_link_tick != ctx.death_link_tick:
ctx.death_link_tick = death_link_tick ctx.death_link_tick = death_link_tick