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

Tracker: Add starting inventory to trackers and received items table. (#3051)

This commit is contained in:
Zach Parks 2024-03-29 19:13:51 -05:00 committed by GitHub
parent bb481256de
commit 5f0112e783
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
WebHostLib/tracker.py
View File

@ -124,10 +124,13 @@ class TrackerData:
@_cache_results @_cache_results
def get_player_inventory_counts(self, team: int, player: int) -> collections.Counter: def get_player_inventory_counts(self, team: int, player: int) -> collections.Counter:
"""Retrieves a dictionary of all items received by their id and their received count.""" """Retrieves a dictionary of all items received by their id and their received count."""
items = self.get_player_received_items(team, player) received_items = self.get_player_received_items(team, player)
starting_items = self.get_player_starting_inventory(team, player)
inventory = collections.Counter() inventory = collections.Counter()
for item in items: for item in received_items:
inventory[item.item] += 1 inventory[item.item] += 1
for item in starting_items:
inventory[item] += 1
return inventory return inventory
@ -358,10 +361,13 @@ def get_enabled_multiworld_trackers(room: Room) -> Dict[str, Callable]:
def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) -> str: def render_generic_tracker(tracker_data: TrackerData, team: int, player: int) -> str:
game = tracker_data.get_player_game(team, player) game = tracker_data.get_player_game(team, player)
# Add received index to all received items, excluding starting inventory.
received_items_in_order = {} received_items_in_order = {}
for received_index, network_item in enumerate(tracker_data.get_player_received_items(team, player), start=1): starting_inventory = tracker_data.get_player_starting_inventory(team, player)
received_items_in_order[network_item.item] = received_index for index, item in enumerate(starting_inventory):
received_items_in_order[item] = index
for index, network_item in enumerate(tracker_data.get_player_received_items(team, player),
start=len(starting_inventory)):
received_items_in_order[network_item.item] = index
return render_template( return render_template(
template_name_or_list="genericTracker.html", template_name_or_list="genericTracker.html",