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

MultiServer: move PrintJSONMessagePart's found to PrintJSON

This commit is contained in:
Fabian Dill 2021-11-08 19:13:13 +01:00
parent 987bbc761a
commit 2007549e01
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetUtils.py
View File

@ -13,8 +13,6 @@ class JSONMessagePart(typing.TypedDict, total=False):
# optional # optional
type: str type: str
color: str color: str
# mainly for items, optional
found: bool
# owning player for location/item # owning player for location/item
player: int player: int
@ -274,7 +272,7 @@ class Hint(typing.NamedTuple):
add_json_text(parts, "[Hint]: ") add_json_text(parts, "[Hint]: ")
add_json_text(parts, self.receiving_player, type="player_id") add_json_text(parts, self.receiving_player, type="player_id")
add_json_text(parts, "'s ") add_json_text(parts, "'s ")
add_json_item(parts, self.item, self.receiving_player, found=self.found) add_json_item(parts, self.item, self.receiving_player)
add_json_text(parts, " is at ") add_json_text(parts, " is at ")
add_json_location(parts, self.location, self.finding_player) add_json_location(parts, self.location, self.finding_player)
add_json_text(parts, " in ") add_json_text(parts, " in ")
@ -291,7 +289,8 @@ class Hint(typing.NamedTuple):
return {"cmd": "PrintJSON", "data": parts, "type": "Hint", return {"cmd": "PrintJSON", "data": parts, "type": "Hint",
"receiving": self.receiving_player, "receiving": self.receiving_player,
"item": NetworkItem(self.item, self.location, self.finding_player)} "item": NetworkItem(self.item, self.location, self.finding_player),
"found": self.found}
@property @property
def local(self): def local(self):