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

MultiServer: add not found to !hint response and color found text 

Clients: text parsing fixes
This commit is contained in:
Fabian Dill 2021-11-30 06:09:40 +01:00
parent 246a5c568b
commit 0992087e9a
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
NetUtils.py
View File

@ -1,4 +1,6 @@
from __future__ import annotations from __future__ import annotations
import logging
import typing import typing
import enum import enum
from json import JSONEncoder, JSONDecoder from json import JSONEncoder, JSONDecoder
@ -138,11 +140,11 @@ class HandlerMeta(type):
break break
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if orig_init:
orig_init(self, *args, **kwargs)
# turn functions into bound methods # turn functions into bound methods
self.handlers = {name: method.__get__(self, type(self)) for name, method in self.handlers = {name: method.__get__(self, type(self)) for name, method in
handlers.items()} handlers.items()}
if orig_init:
orig_init(self, *args, **kwargs)
attrs['__init__'] = __init__ attrs['__init__'] = __init__
return super(HandlerMeta, mcs).__new__(mcs, name, bases, attrs) return super(HandlerMeta, mcs).__new__(mcs, name, bases, attrs)
@ -192,11 +194,7 @@ class JSONtoTextParser(metaclass=HandlerMeta):
return self._handle_color(node) return self._handle_color(node)
def _handle_item_name(self, node: JSONMessagePart): def _handle_item_name(self, node: JSONMessagePart):
# todo: use a better info source node["color"] = 'cyan'
from worlds.alttp.Items import progression_items
node["color"] = 'green' if node.get("found", False) else 'cyan'
if node["text"] in progression_items:
node["color"] += ";white_bg"
return self._handle_color(node) return self._handle_color(node)
def _handle_item_id(self, node: JSONMessagePart): def _handle_item_id(self, node: JSONMessagePart):
@ -205,13 +203,13 @@ class JSONtoTextParser(metaclass=HandlerMeta):
return self._handle_item_name(node) return self._handle_item_name(node)
def _handle_location_name(self, node: JSONMessagePart): def _handle_location_name(self, node: JSONMessagePart):
node["color"] = 'blue_bg;white' node["color"] = 'green'
return self._handle_color(node) return self._handle_color(node)
def _handle_location_id(self, node: JSONMessagePart): def _handle_location_id(self, node: JSONMessagePart):
item_id = int(node["text"]) item_id = int(node["text"])
node["text"] = self.ctx.location_name_getter(item_id) node["text"] = self.ctx.location_name_getter(item_id)
return self._handle_item_name(node) return self._handle_location_name(node)
def _handle_entrance_name(self, node: JSONMessagePart): def _handle_entrance_name(self, node: JSONMessagePart):
node["color"] = 'blue' node["color"] = 'blue'
@ -283,9 +281,11 @@ class Hint(typing.NamedTuple):
else: else:
add_json_text(parts, "'s World") add_json_text(parts, "'s World")
if self.found: if self.found:
add_json_text(parts, ". (found)") add_json_text(parts, ". ")
add_json_text(parts, "(found)", type="color", color="green")
else: else:
add_json_text(parts, ".") add_json_text(parts, ". ")
add_json_text(parts, "(not found)", type="color", color="red")
return {"cmd": "PrintJSON", "data": parts, "type": "Hint", return {"cmd": "PrintJSON", "data": parts, "type": "Hint",
"receiving": self.receiving_player, "receiving": self.receiving_player,