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

Minecraft tracker v2 

group advancements by category
update font to Minecraft font
always display pearl/scrap counter
This commit is contained in:
espeon65536 2021-08-04 12:28:57 -05:00 committed by Fabian Dill
parent b38f7c8f2a
commit 2af5739592
3 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
WebHostLib/static/styles/minecraftTracker.css
View File

@ -38,11 +38,10 @@
#inventory-table div.item-count { #inventory-table div.item-count {
position: absolute; position: absolute;
color: white; color: white;
font-family: "Courier New", monospace; font-family: "Minecraftia", monospace;
font-weight: bold; font-weight: bold;
font-size: 20px;
bottom: 0px; bottom: 0px;
right: 4px; right: 0px;
} }
#location-table{ #location-table{
@ -54,6 +53,8 @@
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
background-color: #42b149; background-color: #42b149;
padding: 0 3px 3px; padding: 0 3px 3px;
font-family: "Minecraftia", monospace;
font-size: 14px;
} }
#location-table th{ #location-table th{
@ -65,15 +66,17 @@
#location-table td{ #location-table td{
padding-top: 2px; padding-top: 2px;
padding-bottom: 2px; padding-bottom: 2px;
padding-right: 5px;
line-height: 20px; line-height: 20px;
} }
#location-table td.counter{ #location-table td.counter{
padding-right: 8px;
text-align: right; text-align: right;
} }
#location-table tr:last-child {
font-weight: bold;
}
#location-table img{ #location-table img{
height: 100%; height: 100%;
max-width: 30px; max-width: 30px;

23
WebHostLib/templates/minecraftTracker.html
View File

@ -4,6 +4,7 @@
<title>{{ player_name }}&apos;s Tracker</title> <title>{{ player_name }}&apos;s Tracker</title>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/minecraftTracker.css") }}"/> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename="styles/minecraftTracker.css") }}"/>
<script type="application/ecmascript" src="{{ url_for('static', filename="assets/playerTracker.js") }}"></script> <script type="application/ecmascript" src="{{ url_for('static', filename="assets/playerTracker.js") }}"></script>
<link rel="stylesheet" media="screen" href="https://fontlibrary.org//face/minecraftia" type="text/css"/>
</head> </head>
<body> <body>
@ -44,26 +45,12 @@
<tr> <tr>
</table> </table>
<table id="location-table"> <table id="location-table">
<thead> {% for area in checks_done %}
<tr> <tr>
<th>Location</th> <td>{{ area }}</td>
<th>Checked</th> <td class="counter">{{ checks_done[area] }} / {{ checks_in_area[area] }}</td>
</tr> </tr>
</thead> {% endfor %}
<tbody>
{% for name in checked_locations %}
<tr>
<td>{{ name | location_name}}</td>
<td>✔</td>
</tr>
{%- endfor -%}
{% for name in not_checked_locations %}
<tr>
<td>{{ name | location_name}}</td>
<td></td>
</tr>
{%- endfor -%}
</tbody>
</table> </table>
</div> </div>
</body> </body>

27
WebHostLib/tracker.py
View File

@ -454,6 +454,18 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
"Dragon Head": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b6/Dragon_Head.png", "Dragon Head": "https://static.wikia.nocookie.net/minecraft_gamepedia/images/b/b6/Dragon_Head.png",
} }
minecraft_location_ids = {
"Story": [42073, 42080, 42081, 42023, 42082, 42027, 42039, 42085, 42002, 42009, 42010,
42070, 42041, 42049, 42090, 42004, 42031, 42025, 42029, 42051, 42077, 42089],
"Nether": [42017, 42044, 42069, 42058, 42034, 42060, 42066, 42076, 42064, 42071, 42021,
42062, 42008, 42061, 42033, 42011, 42006, 42019, 42000, 42040, 42001, 42015, 42014],
"The End": [42052, 42005, 42012, 42032, 42030, 42042, 42018, 42038, 42046],
"Adventure": [42047, 42086, 42087, 42050, 42059, 42055, 42072, 42003, 42035, 42016, 42020,
42048, 42054, 42068, 42043, 42074, 42075, 42024, 42026, 42037, 42045, 42056, 42088],
"Husbandry": [42065, 42067, 42078, 42022, 42007, 42079, 42013, 42028,
42036, 42057, 42063, 42053, 42083, 42084, 42091]
}
display_data = {} display_data = {}
# Determine display for progressive items # Determine display for progressive items
@ -481,19 +493,28 @@ def getPlayerTracker(tracker: UUID, tracked_team: int, tracked_player: int):
for item_name, item_id in multi_items.items(): for item_name, item_id in multi_items.items():
base_name = item_name.split()[-1].lower() base_name = item_name.split()[-1].lower()
count = inventory[item_id] count = inventory[item_id]
if count > 0: if count >= 0:
display_data[base_name+"_count"] = count display_data[base_name+"_count"] = count
# Victory condition # Victory condition
game_state = multisave.get("client_game_state", {}).get((tracked_team, tracked_player), 0) game_state = multisave.get("client_game_state", {}).get((tracked_team, tracked_player), 0)
display_data['game_finished'] = True if game_state == 30 else False # found in NetUtils display_data['game_finished'] = True if game_state == 30 else False # found in NetUtils
# Turn location IDs into advancement tab counts
checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set()) checked_locations = multisave.get("location_checks", {}).get((tracked_team, tracked_player), set())
lookup_name = lambda id: lookup_any_location_id_to_name[id]
location_info = {tab_name: {lookup_name(id): (lookup_name(id) in checked_locations) for id in tab_locations}
for tab_name, tab_locations in minecraft_location_ids.items()}
checks_done = {tab_name: len([id for id in tab_locations if lookup_name(id) in checked_locations])
for tab_name, tab_locations in minecraft_location_ids.items()}
checks_done['Total'] = len(checked_locations)
checks_in_area = {tab_name: len(tab_locations) for tab_name, tab_locations in minecraft_location_ids.items()}
checks_in_area['Total'] = sum(checks_in_area.values())
return render_template("minecraftTracker.html", return render_template("minecraftTracker.html",
inventory=inventory, icons=minecraft_icons, acquired_items={lookup_any_item_id_to_name[id] for id in inventory}, inventory=inventory, icons=minecraft_icons, acquired_items={lookup_any_item_id_to_name[id] for id in inventory},
player=tracked_player, team=tracked_team, room=room, player_name=player_name, player=tracked_player, team=tracked_team, room=room, player_name=player_name,
checked_locations=checked_locations, not_checked_locations=set(locations[tracked_player])-checked_locations, checks_done=checks_done, checks_in_area=checks_in_area, location_info=location_info,
**display_data) **display_data)
else: else: