Skip to content

Commit 5b5d969

Browse files
committed
WebHost: cleanup tracker.py #2
1 parent 71767e8 commit 5b5d969

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

WebHostLib/tracker.py

+14-10
Original file line numberDiff line numberDiff line change
@@ -325,12 +325,11 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
325325
checks_done["Total"] += 1
326326
specific_tracker = game_specific_trackers.get(games[tracked_player], None)
327327
if specific_tracker:
328-
specific_tracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name)
329-
elif games[tracked_player] == "A Link to the Past":
330-
return __renderAlttpTracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name,
331-
seed_checks_in_area, checks_done)
328+
return specific_tracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name,
329+
seed_checks_in_area, checks_done)
332330
else:
333-
return __renderGenericTracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name)
331+
return __renderGenericTracker(multisave, room, locations, inventory, tracked_team, tracked_player, player_name,
332+
seed_checks_in_area, checks_done)
334333

335334

336335
def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]],
@@ -395,7 +394,8 @@ def __renderAlttpTracker(multisave: Dict[str, Any], room: Room, locations: Dict[
395394

396395

397396
def __renderMinecraftTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]],
398-
inventory: Counter, team: int, player: int, playerName: str) -> str:
397+
inventory: Counter, team: int, player: int, playerName: str,
398+
seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int]) -> str:
399399

400400
icons = {
401401
"Wooden Pickaxe": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/d/d2/Wooden_Pickaxe_JE3_BE3.png",
@@ -495,7 +495,8 @@ def __renderMinecraftTracker(multisave: Dict[str, Any], room: Room, locations: D
495495

496496

497497
def __renderOoTTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]],
498-
inventory: Counter, team: int, player: int, playerName: str) -> str:
498+
inventory: Counter, team: int, player: int, playerName: str,
499+
seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int]) -> str:
499500

500501
icons = {
501502
"Fairy Ocarina": "https://static.wikia.nocookie.net/zelda_gamepedia_en/images/9/97/OoT_Fairy_Ocarina_Icon.png",
@@ -680,7 +681,8 @@ def lookup_and_trim(id, area):
680681

681682

682683
def __renderTimespinnerTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]],
683-
inventory: Counter, team: int, player: int, playerName: str) -> str:
684+
inventory: Counter, team: int, player: int, playerName: str,
685+
seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int]) -> str:
684686

685687
icons = {
686688
"Timespinner Wheel": "https://timespinnerwiki.com/mediawiki/images/7/76/Timespinner_Wheel.png",
@@ -764,7 +766,8 @@ def __renderTimespinnerTracker(multisave: Dict[str, Any], room: Room, locations:
764766

765767

766768
def __renderGenericTracker(multisave: Dict[str, Any], room: Room, locations: Dict[int, Dict[int, Tuple[int, int]]],
767-
inventory: Counter, team: int, player: int, playerName: str) -> str:
769+
inventory: Counter, team: int, player: int, playerName: str,
770+
seed_checks_in_area: Dict[int, Dict[str, int]], checks_done: Dict[str, int]) -> str:
768771

769772
checked_locations = multisave.get("location_checks", {}).get((team, player), set())
770773
player_received_items = {}
@@ -873,5 +876,6 @@ def getTracker(tracker: UUID):
873876
game_specific_trackers: typing.Dict[str, typing.Callable] = {
874877
"Minecraft": __renderMinecraftTracker,
875878
"Ocarina of Time": __renderOoTTracker,
876-
"Timespinner": __renderTimespinnerTracker
879+
"Timespinner": __renderTimespinnerTracker,
880+
"A Link to the Past": __renderAlttpTracker
877881
}

0 commit comments

Comments
 (0)