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

multiworld tracker: properly fix item link breaking tracker

This commit is contained in:
alwaysintreble 2022-04-02 18:55:29 -05:00 committed by Fabian Dill
parent a2212002ae
commit 4dd0a75914
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WebHostLib/tracker.py
View File

@ -324,10 +324,7 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int, want
# If the player does not have the item, do nothing # If the player does not have the item, do nothing
for location in locations_checked: for location in locations_checked:
if location in player_locations: if location in player_locations:
if len(player_locations[location]) == 3: item, recipient, flags = player_locations[location]
item, recipient, flags = player_locations[location]
else: # TODO: remove around version 0.2.5
item, recipient = player_locations[location]
if recipient == tracked_player: # a check done for the tracked player if recipient == tracked_player: # a check done for the tracked player
attribute_item_solo(inventory, item) attribute_item_solo(inventory, item)
if ms_player == tracked_player: # a check done by the tracked player if ms_player == tracked_player: # a check done by the tracked player
@ -392,10 +389,7 @@ def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[
player_small_key_locations = set() player_small_key_locations = set()
for loc_data in locations.values(): for loc_data in locations.values():
for values in loc_data.values(): for values in loc_data.values():
if len(values) == 3: item_id, item_player, flags = values
item_id, item_player, flags = values
else: # TODO: remove around version 0.2.5
item_id, item_player = values
if item_player == player: if item_player == player:
if item_id in ids_big_key: if item_id in ids_big_key:
player_big_key_locations.add(ids_big_key[item_id]) player_big_key_locations.add(ids_big_key[item_id])
@ -967,12 +961,10 @@ def getTracker(tracker: UUID):
if location not in player_locations or location not in player_location_to_area[player]: if location not in player_locations or location not in player_location_to_area[player]:
continue continue
if len(player_locations[location]) == 3: item, recipient, flags = player_locations[location]
item, recipient, flags = player_locations[location]
else: # TODO: remove around version 0.2.5
item, recipient = player_locations[location]
attribute_item(inventory, team, recipient, item) if recipient in names:
attribute_item(inventory, team, recipient, item)
checks_done[team][player][player_location_to_area[player][location]] += 1 checks_done[team][player][player_location_to_area[player][location]] += 1
checks_done[team][player]["Total"] += 1 checks_done[team][player]["Total"] += 1
@ -986,10 +978,7 @@ def getTracker(tracker: UUID):
player_small_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1) if playernumber not in groups} player_small_key_locations = {playernumber: set() for playernumber in range(1, len(names[0]) + 1) if playernumber not in groups}
for loc_data in locations.values(): for loc_data in locations.values():
for values in loc_data.values(): for values in loc_data.values():
if len(values) == 3: item_id, item_player, flags = values
item_id, item_player, flags = values
else: # TODO: remove around version 0.2.5
item_id, item_player = values
if item_id in ids_big_key: if item_id in ids_big_key:
player_big_key_locations[item_player].add(ids_big_key[item_id]) player_big_key_locations[item_player].add(ids_big_key[item_id])