From 6a5207900f2293b6da1b09701b3d53adf7a42898 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 22 Jun 2020 00:58:18 +0200 Subject: [PATCH] make tracker look better --- WebHost/__init__.py | 5 +++-- WebHost/templates/tracker.html | 14 +++++++++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/WebHost/__init__.py b/WebHost/__init__.py index 2a2deb4b..e055ba82 100644 --- a/WebHost/__init__.py +++ b/WebHost/__init__.py @@ -219,7 +219,7 @@ def get_tracker(room: int): "Triforce": r"https://gamepedia.cursecdn.com/zelda_gamepedia_en/4/4e/TriforceALttPTitle.png?version=dc398e1293177581c16303e4f9d12a48" } - + multi_items = {get_id(name) for name in ("Progressive Sword", "Progressive Bow", "Bottle")} links = {get_id(key): get_id(value) for key, value in links.items()} inventory = {teamnumber: {playernumber: collections.Counter() for playernumber in range(1, len(team) + 1)} for teamnumber, team in enumerate(multidata["names"])} @@ -248,7 +248,8 @@ def get_tracker(room: int): return render_template("tracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id, lookup_id_to_name=lookup_id_to_name, player_names=player_names, - tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=icons) + tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=icons, + multi_items=multi_items) else: return "Tracker disabled for this room." diff --git a/WebHost/templates/tracker.html b/WebHost/templates/tracker.html index 71132e3c..4d486ef7 100644 --- a/WebHost/templates/tracker.html +++ b/WebHost/templates/tracker.html @@ -23,12 +23,16 @@ {% for player, items in players.items() %} - {{ loop.index }} - {{ player_names[(team, loop.index)] }} + {{ loop.index }} + {{ player_names[(team, loop.index)] }} {% for id in tracking_ids %} - - {{ items[id] }} - + + {% if items[id] %} + + {% if id in multi_items %}{{ items[id] }}{% else %}✔️{% endif %} + {% else %} + + {% endif %} {% endfor %} {% endfor %}