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

Finish writing backend for Jinja template for player-tracker

This commit is contained in:
Chris Wilson 2021-02-23 00:05:31 -05:00
parent 67f0663715
commit 3027112a45
2 changed files with 65 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
WebHostLib/templates/playerTracker.html
View File

@ -1,15 +1,14 @@
{% extends 'tablepage.html' %} <!DOCTYPE html>
{% block head %} <html lang="en">
{{ super() }} <head>
<title>Multiworld Tracker</title> <title>{{ player_name }}&apos;s Tracker</title>
<link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/tracker.css") }}"/> <link rel="stylesheet" type="text/css" href="{{ static_autoversion("styles/player-tracker.css") }}"/>
<script type="application/ecmascript" src="{{ static_autoversion("assets/jquery.scrollsync.js") }}"></script> <script type="application/ecmascript" src="{{ static_autoversion("assets/player-tracker.js") }}"></script>
<script type="application/ecmascript" src="{{ static_autoversion("assets/tracker.js") }}"></script> </head>
{% endblock %}
{% block body %}
{% include 'header/dirtHeader.html' %}
<div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }} data-player={{ player }}">
<body>
<div id="player-tracker-wrapper" data-tracker="{{ room.tracker|suuid }}">
This will eventually be the player tracker for {{ player_name }}.
</div> </div>
{% endblock %} </body>
</html>

63
WebHostLib/tracker.py
View File

@ -248,6 +248,14 @@ def attribute_item(inventory, team, recipient, item):
inventory[team][recipient][target_item] += 1 inventory[team][recipient][target_item] += 1
def attribute_item_solo(inventory, item):
target_item = links.get(item, item)
if item in levels: # non-progressive
inventory[target_item] = max(inventory[target_item], levels[item])
else:
inventory[target_item] += 1
@app.template_filter() @app.template_filter()
def render_timedelta(delta: datetime.timedelta): def render_timedelta(delta: datetime.timedelta):
hours, minutes = divmod(delta.total_seconds() / 60, 60) hours, minutes = divmod(delta.total_seconds() / 60, 60)
@ -306,25 +314,60 @@ def get_static_room_data(room: Room):
@app.route('/tracker/<suuid:tracker>/<int:team>/<int:player>') @app.route('/tracker/<suuid:tracker>/<int:team>/<int:player>')
@cache.memoize(timeout=15) @cache.memoize(timeout=15)
def getPlayerTracker(tracker: UUID, team: int, player: int): def getPlayerTracker(tracker: UUID, team: int, player: int):
# Team and player must be positive and greater than zero
if team < 1 or player < 1:
abort(404)
room = Room.get(tracker=tracker) room = Room.get(tracker=tracker)
if not room: if not room:
abort(404) abort(404)
# Collect seed information and pare it down to a single player
locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area = get_static_room_data(room) locations, names, use_door_tracker, seed_checks_in_area, player_location_to_area = get_static_room_data(room)
player_name = names[team - 1][player - 1]
seed_checks_in_area = seed_checks_in_area[player]
player_location_to_area = player_location_to_area[player]
inventory = collections.Counter() inventory = collections.Counter()
checks_done = {loc_name: 0 for loc_name in default_locations} checks_done = {loc_name: 0 for loc_name in default_locations}
precollected_items = room.seed.multidata.get("precollected_items", None)
print(f'locations: {locations}') # Add starting items to inventory
print(f'names: {names}') starting_items = room.seed.multidata.get("precollected_items", None)[player - 1]
print(f'use_door_tracker: {use_door_tracker}') if starting_items:
print(f'seed_checks_in_area: {seed_checks_in_area}') for item_id in starting_items:
print(f'player_location_to_area: {player_location_to_area}') attribute_item_solo(inventory, item_id)
print(f'inventory: {inventory}')
print(f'checks_done: {checks_done}')
print(f'precollected_items: {precollected_items}')
return render_template("playerTracker.html") # Add items to player inventory
for (ms_team, ms_player), locations_checked in room.multisave.get("location_checks", {}):
# Skip teams and players not matching the request
if ms_team != (team - 1) or ms_player != player:
continue
# If the player does not have the item, do nothing
for location in locations_checked:
if (location, ms_player) not in locations or location not in player_location_to_area:
continue
item, recipient = locations[location, ms_player]
attribute_item_solo(inventory, item)
checks_done[player_location_to_area[location]] += 1
checks_done["Total"] += 1
# Not the presence of the triforce item
for (ms_team, ms_player), game_state in room.multisave.get("client_game_state", []):
# Skip teams and players not matching the request
if ms_team != (team - 1) or ms_player != player:
continue
if game_state:
inventory[106] = 1 # Triforce
return render_template("playerTracker.html", inventory=inventory, get_item_name_from_id=get_item_name_from_id,
lookup_id_to_name=Items.lookup_id_to_name, player_name=player_name,
tracking_names=tracking_names, tracking_ids=tracking_ids, room=room, icons=icons,
multi_items=multi_items, checks_done=checks_done, ordered_areas=ordered_areas,
checks_in_area=seed_checks_in_area, key_locations=key_locations, small_key_ids=small_key_ids,
big_key_ids=big_key_ids,
big_key_locations=key_locations if use_door_tracker else big_key_locations)
@app.route('/tracker/<suuid:tracker>') @app.route('/tracker/<suuid:tracker>')