From 31a823bc349e358fb8d065284ca7ba31bd7ee3f4 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 21 Jan 2022 00:42:45 +0100 Subject: [PATCH] Change remaining flags to 0b notation by popularity vote --- NetUtils.py | 9 ++++----- WebHostLib/api/__init__.py | 5 +++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NetUtils.py b/NetUtils.py index 85e9fa01..39c08bb6 100644 --- a/NetUtils.py +++ b/NetUtils.py @@ -166,7 +166,6 @@ class JSONTypes(str, enum.Enum): class JSONtoTextParser(metaclass=HandlerMeta): - color_codes = { # not exact color names, close enough but decent looking "black": "000000", @@ -216,12 +215,12 @@ class JSONtoTextParser(metaclass=HandlerMeta): flags = node.get("flags", 0) if flags == 0: node["color"] = 'cyan' - elif flags & 1 << 0: # advancement + elif flags & 0b001: # advancement node["color"] = 'plum' - elif flags & 1 << 1: # never_exclude + elif flags & 0b010: # never_exclude node["color"] = 'slateblue' - elif flags & 1 << 2: # trap - node["color"] = 'salmon' + elif flags & 0b100: # trap + node["color"] = 'salmon' else: node["color"] = 'cyan' return self._handle_color(node) diff --git a/WebHostLib/api/__init__.py b/WebHostLib/api/__init__.py index 5a6250b5..c2f9b384 100644 --- a/WebHostLib/api/__init__.py +++ b/WebHostLib/api/__init__.py @@ -9,8 +9,6 @@ from .. import cache api_endpoints = Blueprint('api', __name__, url_prefix="/api") -from . import generate, user # trigger registration - # unsorted/misc endpoints @@ -46,3 +44,6 @@ def get_datapackge_versions(): version_package = {game: world.data_version for game, world in AutoWorldRegister.world_types.items()} version_package["version"] = network_data_package["version"] return version_package + + +from . import generate, user # trigger registration