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

sc2: Fixed sc2 client's /received command breaking after PR 1933 merged (#3497)

This commit is contained in:
Phaneros 2024-06-09 07:55:05 -07:00 committed by GitHub
parent 5f8a8e6dad
commit 84a6d50ae7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/sc2/Client.py
View File

@ -107,10 +107,10 @@ class ColouredMessage:
def coloured(self, text: str, colour: str) -> 'ColouredMessage': def coloured(self, text: str, colour: str) -> 'ColouredMessage':
add_json_text(self.parts, text, type="color", color=colour) add_json_text(self.parts, text, type="color", color=colour)
return self return self
def location(self, location_id: int, player_id: int = 0) -> 'ColouredMessage': def location(self, location_id: int, player_id: int) -> 'ColouredMessage':
add_json_location(self.parts, location_id, player_id) add_json_location(self.parts, location_id, player_id)
return self return self
def item(self, item_id: int, player_id: int = 0, flags: int = 0) -> 'ColouredMessage': def item(self, item_id: int, player_id: int, flags: int = 0) -> 'ColouredMessage':
add_json_item(self.parts, item_id, player_id, flags) add_json_item(self.parts, item_id, player_id, flags)
return self return self
def player(self, player_id: int) -> 'ColouredMessage': def player(self, player_id: int) -> 'ColouredMessage':
@ -256,7 +256,7 @@ class StarcraftClientProcessor(ClientCommandProcessor):
for item in received_items_of_this_type: for item in received_items_of_this_type:
print_faction_title() print_faction_title()
has_printed_faction_title = True has_printed_faction_title = True
(ColouredMessage('* ').item(item.item, flags=item.flags) (ColouredMessage('* ').item(item.item, self.ctx.slot, flags=item.flags)
(" from ").location(item.location, self.ctx.slot) (" from ").location(item.location, self.ctx.slot)
(" by ").player(item.player) (" by ").player(item.player)
).send(self.ctx) ).send(self.ctx)
@ -277,7 +277,7 @@ class StarcraftClientProcessor(ClientCommandProcessor):
received_items_of_this_type = items_received.get(child_item, []) received_items_of_this_type = items_received.get(child_item, [])
for item in received_items_of_this_type: for item in received_items_of_this_type:
filter_match_count += len(received_items_of_this_type) filter_match_count += len(received_items_of_this_type)
(ColouredMessage(' * ').item(item.item, flags=item.flags) (ColouredMessage(' * ').item(item.item, self.ctx.slot, flags=item.flags)
(" from ").location(item.location, self.ctx.slot) (" from ").location(item.location, self.ctx.slot)
(" by ").player(item.player) (" by ").player(item.player)
).send(self.ctx) ).send(self.ctx)