Skip to content

Commit

Permalink
Add an "All Locations" tracker tab. (#11)
Browse files Browse the repository at this point in the history
  • Loading branch information
ThePhar authored Jun 20, 2024
2 parents 127cd90 + 60468e1 commit 3743d52
Show file tree
Hide file tree
Showing 9 changed files with 1,351 additions and 4 deletions.
16 changes: 16 additions & 0 deletions .idea/jsonSchemas.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ This is a [PopTracker](https://github.com/black-sliver/PopTracker) pack for the
- Area Tracking (ER) and Logic
- Map for Visualizing Entrances; Is ER Aware
- Broadcast View for Items and Entrances
- Displays all locations in a tab for quick reference of checked/missing locations.
- Auto-Tracking via Archipelago
- Automatically tracks completed locations and collected items.
- Automatically enables Move Randomization, if enabled.
Expand Down
3 changes: 3 additions & 0 deletions docs/changelogs/1.2.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[
"Feature: Created a locations tracker that displays all locations in one tab. Does not currently factor in accessibility."
]
1,225 changes: 1,225 additions & 0 deletions pack_root/layouts/locations.json

Large diffs are not rendered by default.

11 changes: 10 additions & 1 deletion pack_root/layouts/tracker.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,22 @@
"type": "tabbed",
"tabs": [
{
"title": "Castle Interior & Entrances",
"title": "Castle Entrances and Locations",
"content": {
"type": "map",
"maps": [
"map_castle"
]
}
},
{
"title": "All Locations",
"content": {
"type": "layout",
"key": "layout_locations",
"h_alignment": "left",
"v_alignment": "center"
}
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions pack_root/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"platform": "pc",
"game_name": "Super Mario 64",
"package_uid": "pharware-sm64-pack",
"package_version": "1.1.1",
"package_version": "1.2.0",
"min_poptracker_version": "0.25.5",
"versions_url": "https://raw.githubusercontent.com/ThePhar/APSM64TrackerPack/main/versions.json",
"author": "Phar",
"variants": {
"standard": {
"display_name": "Full Logic and ER Tracker",
"display_name": "Area Randomizer & Full Logic Tracker",
"flags": [
"ap"
]
Expand Down
4 changes: 3 additions & 1 deletion pack_root/scripts/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ Tracker:AddLocations("locations/castle_entrances.json")

-- Layouts
Tracker:AddLayouts("layouts/items.json")
Tracker:AddLayouts("layouts/locations.json")
Tracker:AddLayouts("layouts/tracker.json")
Tracker:AddLayouts("layouts/broadcast.json")

-- Scripts
ScriptHost:LoadScript("scripts/logic/area_rando.lua")
ScriptHost:LoadScript("scripts/locations.lua")
ScriptHost:LoadScript("scripts/logic/shared.lua")
ScriptHost:LoadScript("scripts/logic/area_rando.lua")
ScriptHost:LoadScript("scripts/logic/moves_cannons.lua")

ScriptHost:LoadScript("scripts/logic/stages/bob.lua")
Expand Down
83 changes: 83 additions & 0 deletions pack_root/scripts/locations.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
HUNDRED_COIN_LOCATIONS = {
"__location_item_3626006",
"__location_item_3626013",
"__location_item_3626020",
"__location_item_3626027",
"__location_item_3626034",
"__location_item_3626041",
"__location_item_3626048",
"__location_item_3626055",
"__location_item_3626062",
"__location_item_3626069",
"__location_item_3626076",
"__location_item_3626083",
"__location_item_3626090",
"__location_item_3626097",
"__location_item_3626104",
}

BUDDY_LOCATIONS = {
"__location_item_3626200",
"__location_item_3626201",
"__location_item_3626202",
"__location_item_3626203",
"__location_item_3626207",
"__location_item_3626209",
"__location_item_3626210",
"__location_item_3626211",
"__location_item_3626212",
"__location_item_3626214",
}

ONE_UP_LOCATIONS = {
"__location_item_3626215",
"__location_item_3626216",
"__location_item_3626217",
"__location_item_3626218",
"__location_item_3626219",
"__location_item_3626220",
"__location_item_3626221",
"__location_item_3626222",
"__location_item_3626223",
"__location_item_3626224",
"__location_item_3626225",
"__location_item_3626226",
"__location_item_3626227",
"__location_item_3626228",
"__location_item_3626229",
"__location_item_3626230",
"__location_item_3626231",
"__location_item_3626232",
"__location_item_3626233",
"__location_item_3626234",
"__location_item_3626235",
"__location_item_3626236",
"__location_item_3626237",
"__location_item_3626238",
"__location_item_3626239",
"__location_item_3626240",
"__location_item_3626241",
"__location_item_3626242",
"__location_item_3626243",
}

ScriptHost:AddWatchForCode("Toggle 100 Coins", "__setting_100", function()
local is_active = Tracker:FindObjectForCode("__setting_100").Active
for _, location in ipairs(HUNDRED_COIN_LOCATIONS) do
Tracker:FindObjectForCode(location).Active = not is_active
end
end)

ScriptHost:AddWatchForCode("Toggle Buddies", "__setting_BB", function()
local is_active = Tracker:FindObjectForCode("__setting_BB").Active
for _, location in ipairs(BUDDY_LOCATIONS) do
Tracker:FindObjectForCode(location).Active = not is_active
end
end)

ScriptHost:AddWatchForCode("Toggle 1-Ups", "__setting_1UB", function()
local is_active = Tracker:FindObjectForCode("__setting_1UB").Active
for _, location in ipairs(ONE_UP_LOCATIONS) do
Tracker:FindObjectForCode(location).Active = not is_active
end
end)
8 changes: 8 additions & 0 deletions versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"versions": [
{
"package_version": "1.2.0",
"download_url": "https://github.com/ThePhar/APSM64TrackerPack/releases/download/1.2.0/PharAPSM64_1.2.0.zip",
"sha256": "8778249df2c491908c83099e7dae6a8e59c96824b061752a623ec2b3559d52fc",
"changelog": [
"Feature: Created a locations tracker that displays all locations in one tab. Does not currently factor in accessibility."
]
},
{
"package_version": "1.1.1",
"download_url": "https://github.com/ThePhar/APSM64TrackerPack/releases/download/1.1.1/PharAPSM64_1.1.1.zip",
Expand Down

0 comments on commit 3743d52

Please sign in to comment.