Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

It's the new panels, over here now #37

Closed
wants to merge 8 commits into from
Closed

It's the new panels, over here now #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70e2bd4
Merge branch 'refs/heads/main' into more-panels
Exempt-Medic May 16, 2024
09cb3ee
Merge branch 'refs/heads/main' into more-panels
Exempt-Medic Jun 28, 2024
2751d39
Merge branch 'main' into more-panels
Exempt-Medic Nov 27, 2024
2243c08
Cleanup, hopefully
Exempt-Medic Nov 27, 2024
0487bae
Add this back
Exempt-Medic Nov 27, 2024
b85cd25
Spaces → Tabs
Exempt-Medic Nov 27, 2024
5f20d11
Correcting code
Exempt-Medic Nov 27, 2024
bfe7da8
Merge branch 'main' into more-panels
Exempt-Medic Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions locations/locations.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,8 +1271,8 @@
{
"name": "Stairs Control Panel",
"access_rules": [
"$canSolve|158142, @Places/quarryStoneworksUpstairs",
"showSnipes, $canSolve|158142, @Places/quarryStoneworks, [@Places/quarryStoneworksUpstairs]"
"$isNotPanelsOnlyOrHasPanel|Quarry Stoneworks Stairs (Panel), $canSolve|158142, @Places/quarryStoneworksUpstairs",
"showSnipes, $isNotPanelsOnlyOrHasPanel|Quarry Stoneworks Stairs (Panel), $canSolve|158142, @Places/quarryStoneworks, [@Places/quarryStoneworksUpstairs]"
]
},
{
Expand Down Expand Up @@ -3543,7 +3543,7 @@
{
"name": "Rhombic Avoid to Monastery Garden Panel",
"visibility_rules": [ "Unrandomized" ],
"access_rules": [ "$canSolve|158267, @Places/overworld" ]
"access_rules": [ "$isNotPanelsOnlyOrHasPanel|Jungle Monastery Garden Shortcut (Panel), $canSolve|158267, @Places/overworld" ]
}
],
"map_locations": [
Expand Down Expand Up @@ -4208,7 +4208,7 @@
},
{
"name": "Shortcut Panels",
"access_rules": [ "$canSolve|158341-158342, @Places/swampLaser" ]
"access_rules": [ "$isNotPanelsOnlyOrHasPanel|Swamp Laser Shortcut (Panel), $canSolve|158341-158342, @Places/swampLaser" ]
}
],
"map_locations": [
Expand Down Expand Up @@ -5540,7 +5540,7 @@
{
"name": "Shortcut to Mountain Panel",
"access_rules": [
"$canSolve|158449, @Places/caves",
"$isNotPanelsOnlyOrHasPanel|Caves Mountain Shortcut (Panel), $canSolve|158449, @Places/caves",
"cavesPool, $canSolve|158449, @Places/caves"
]
}
Expand All @@ -5562,7 +5562,7 @@
{
"name": "Shortcut to Swamp Panel",
"access_rules": [
"$canSolve|158450, @Places/caves",
"$isNotPanelsOnlyOrHasPanel|Caves Swamp Shortcut (Panel), $canSolve|158450, @Places/caves",
"cavesPool, $canSolve|158450, @Places/caves"
]
}
Expand Down
7 changes: 5 additions & 2 deletions scripts/archipelago.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,17 @@ doors = {
"Swamp Sliding Bridge (Panel)",
"Swamp Rotating Bridge (Panel)",
"Swamp Long Bridge (Panel)",
"Swamp Maze Controls (Panel)"},
"Swamp Maze Controls (Panel)",
"Swamp Laser Shortcut (Panel)"},
["Mountain Panels"] = {"Mountain Floor 1 Light Bridge (Panel)",
"Mountain Floor 2 Light Bridge Near (Panel)",
"Mountain Floor 2 Light Bridge Far (Panel)",
"Mountain Floor 2 Elevator Control (Panel)"},
["Caves Panels"] = {"Caves Entry (Panel)",
"Challenge Entry (Panel)",
"Caves Elevator Controls (Panel)"},
"Caves Elevator Controls (Panel)",
"Caves Mountain Shortcut (Panel)",
"Caves Swamp Shortcut (Panel)"},
["Tunnels Panels"] = {"Tunnels Entry (Panel)",
"Tunnels Town Shortcut (Panel)"}
}
Expand Down