monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed debugging info

This commit is contained in:
pepperpow 2021-01-29 19:16:25 -06:00
parent 5c074c2c4f
commit aa9fe0d9cd
2 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
MultiClient.py
View File

@ -993,18 +993,13 @@ async def process_server_cmd(ctx: Context, cmd, args):
ctx.hint_points = args[0]
elif cmd == 'TreasureCount':
try:
print(ctx.requires_treasure_count, 'OKAY')
if ctx.requires_treasure_count is None:
ctx.requires_treasure_count = (await snes_read(ctx, 0x180165, size=1))[0] >= 0x80
print(ctx.requires_treasure_count, ctx.treasure_count, args[0])
if ctx.requires_treasure_count and ctx.treasure_count < args[0]:
ctx.treasure_count = args[0]
print(int16_as_bytes(ctx.treasure_count))
snes_buffered_write(ctx, WRAM_START + 0xF418, bytes(int16_as_bytes(ctx.treasure_count)))
await snes_flush_writes(ctx)
except Exception as e:
print(e)
if ctx.requires_treasure_count is None:
ctx.requires_treasure_count = (await snes_read(ctx, 0x180165, size=1))[0] >= 0x80
if ctx.requires_treasure_count and ctx.treasure_count < args[0]:
logging.info('Team Triforce count is now '.format(args[0]))
ctx.treasure_count = args[0]
snes_buffered_write(ctx, WRAM_START + 0xF418, bytes(int16_as_bytes(ctx.treasure_count)))
await snes_flush_writes(ctx)
else:
logger.debug(f"unknown command {args}")

28
MultiServer.py
View File

@ -229,7 +229,7 @@ class Context(Node):
d = {
"rom_names": list(self.rom_names.items()),
"received_items": tuple((k, v) for k, v in self.received_items.items()),
"treasure_count": tuple((k, v) for k, v in self.treasure_count.items()),
"treasure_count": tuple(v for k, v in self.treasure_count.items()),
"hints_used": tuple((key, value) for key, value in self.hints_used.items()),
"hints": tuple(
(key, list(hint.re_check(self, key[0]) for hint in value)) for key, value in self.hints.items()),
@ -258,8 +258,7 @@ class Context(Node):
return
received_items = {tuple(k): [ReceivedItem(*i) for i in v] for k, v in savedata["received_items"]}
print(savedata["treasure_count"])
self.treasure_count = {tuple(k): v for k, v in savedata["treasure_count"]}
self.treasure_count = {k: v for k, v in enumerate(savedata["treasure_count"])}
self.received_items = received_items
self.hints_used.update({tuple(key): value for key, value in savedata["hints_used"]})
@ -295,6 +294,8 @@ class Context(Node):
logging.info(f'Loaded save file with {sum([len(p) for p in received_items.values()])} received items '
f'for {len(received_items)} players')
if len(self.treasure_count):
logging.info(f'Triforce pieces collected {self.treasure_count}')
def get_aliased_name(self, team: int, slot: int):
if (team, slot) in self.name_aliases:
@ -524,15 +525,9 @@ def register_location_checks(ctx: Context, team: int, slot: int, locations):
if client.team == team and client.wants_item_notification:
asyncio.create_task(
ctx.send_msgs(client, [['ItemFound', (target_item, location, slot)]]))
try:
print('TRY', target_item, get_item_name_from_id(target_item))
if 'Triforce Piece' in get_item_name_from_id(target_item):
print('PIECE', team, slot, ctx.treasure_count.get(team), 'No Pieces')
ctx.treasure_count[team] = ctx.treasure_count.get(team, 0) + 1
print('NOW', ctx.treasure_count[(team, slot)])
ctx.broadcast_team(team, [['TreasureCount', (ctx.treasure_count[team],)]])
except Exception as e:
print(e)
ctx.location_checks[team, slot] |= known_locations
send_new_items(ctx)
@ -1058,11 +1053,8 @@ async def process_client_cmd(ctx: Context, client: Client, cmd, args):
if items:
reply.append(['ReceivedItems', (0, tuplize_received_items(items))])
client.send_index = len(items)
try:
if ctx.treasure_count.get(client.team):
ctx.broadcast_team(team, [['TreasureCount', (ctx.treasure_count[client.team],)]])
except Exception as e:
print(e)
if ctx.treasure_count.get(client.team):
ctx.broadcast_team(team, [['TreasureCount', (ctx.treasure_count[client.team],)]])
await ctx.send_msgs(client, reply)
await on_client_joined(ctx, client)
@ -1072,12 +1064,8 @@ async def process_client_cmd(ctx: Context, client: Client, cmd, args):
if items:
client.send_index = len(items)
await ctx.send_msgs(client, [['ReceivedItems', (0, tuplize_received_items(items))]])
try:
print('TRY2')
if ctx.treasure_count.get((team)):
ctx.broadcast_team(team, [['TreasureCount', (ctx.treasure_count[team],)]])
except Exception as e:
print(e)
if ctx.treasure_count.get((team)):
ctx.broadcast_team(team, [['TreasureCount', (ctx.treasure_count[team],)]])
elif cmd == 'LocationChecks':
if type(args) is not list: