Skip to content

Commit

Permalink
Merge pull request #3 from robob27/1_0_3
Browse files Browse the repository at this point in the history 
1.0.3 Fixes
  • Loading branch information
@robob27
robob27 authored Aug 11, 2020
2 parents 79d0e63 + fa8958f commit e3872df
Show file tree
Hide file tree
Showing 3 changed files with 207 additions and 65 deletions.
7 changes: 7 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ Initial release - all logic "fixes" are based on https://samus.link/logic and/or
- Fixed Wave Beam check
- Fixed Lower Norfair checks

1.0.3
----

- Fixed locations that are checkable to show as blue again
- Fixed Spring Ball Access for Noob
- Fix Lower Norfair Access for Noob (space jump for casual requirement)
- Actually fix crocs checks this time. Maybe. Pending feedback.
64 changes: 47 additions & 17 deletions locations/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@
{
"name": "Super Missile (Crateria)",
"access_rules": [
"$canPowerBomb,speed,$countTanks:2,$needMinorItems",
"$canPowerBomb,speed,etank:3,$countTanks:2,$needMinorItems",
"{$canPowerBomb}"
],
"sections": [
{
Expand Down Expand Up @@ -1434,6 +1435,7 @@
"$canAccessCrocomire,$canFly,$isCasual,$needMinorItems",
"$canAccessCrocomire,grapple,$isCasual,$needMinorItems",
"$canAccessCrocomire,hijump,speed,$isCasual,$needMinorItems",
"{$canAccessRedBrinstar}",
],
"sections": [
{
Expand Down Expand Up @@ -1711,7 +1713,9 @@
{
"name": "Energy Tank, Ridley",
"access_rules": [
"$canDoWorstRoom"
"$canDoWorstRoom,$isCasual",
"$canDoWorstRoomTournament,$isNotCasual",
"[],$canDoWorstRoomTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1762,7 +1766,9 @@
{
"name": "Energy Tank, Firefleas",
"access_rules": [
"$canDoWorstRoom"
"$canDoWorstRoom,$isCasual",
"$canDoWorstRoomTournament,$isNotCasual",
"[],$canDoWorstRoomTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1843,7 +1849,9 @@
{
"name": "Missile (Mickey Mouse room)",
"access_rules": [
"$canDoWorstRoom,$needMinorItems"
"$canDoWorstRoom,$isCasual,$needMinorItems",
"$canDoWorstRoomTournament,$isNotCasual,$needMinorItems",
"[],$canDoWorstRoomTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1867,7 +1875,9 @@
{
"name": "Missile (lower Norfair above fire flea room)",
"access_rules": [
"$canDoWorstRoom,$needMinorItems"
"$canDoWorstRoom,$isCasual,$needMinorItems",
"$canDoWorstRoomTournament,$isNotCasual,$needMinorItems",
"[],$canDoWorstRoomTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1891,7 +1901,9 @@
{
"name": "Power Bomb (lower Norfair above fire flea room)",
"access_rules": [
"$canDoWorstRoom,$needMinorItems"
"$canDoWorstRoom,$isCasual,$needMinorItems",
"$canDoWorstRoomTournament,$isNotCasual,$needMinorItems",
"[],$canDoWorstRoomTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1915,7 +1927,9 @@
{
"name": "Power Bomb (Power Bombs of shame)",
"access_rules": [
"$canDoWorstRoom,$needMinorItems"
"$canDoWorstRoom,$isCasual,$needMinorItems",
"$canDoWorstRoomTournament,$isNotCasual,$needMinorItems",
"[],$canDoWorstRoomTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1939,7 +1953,9 @@
{
"name": "Missile (lower Norfair near Wave Beam)",
"access_rules": [
"$canDoWorstRoom,$needMinorItems"
"$canDoWorstRoom,$isCasual,$needMinorItems",
"$canDoWorstRoomTournament,$isNotCasual,$needMinorItems",
"[],$canDoWorstRoomTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -1986,6 +2002,8 @@
"$canAccessWreckedShipReserve,phantoon",
"$canAccessWreckedShipReserveTournament,$isNotCasual,phantoon",
"[],$canAccessWreckedShipReserveTournament,$isCasual,phantoon",
"{$canAccessWreckedShip,$isCasual,phantoon}",
"{$canAccessWreckedShipTournament,$isNotCasual,phantoon}",
],
"sections": [
{
Expand Down Expand Up @@ -2193,7 +2211,9 @@
{
"name": "Maridia",
"access_rules": [
"$canAccessOuterMaridia"
"$canAccessOuterMaridia,$isCasual",
"$canAccessOuterMaridiaTournament,$isNotCasual",
"[],$canAccessOuterMaridiaTournament,$isCasual",
],
"children": [
{
Expand Down Expand Up @@ -2265,9 +2285,9 @@
{
"name": "Spring Ball",
"access_rules": [
"$canAccessInnerMaridia,ice",
"$canAccessInnerMaridia,grapple,$canFly",
"$canAccessInnerMaridia,grapple,hijump",
"$canAccessSpringBall,$isCasual",
"$canAccessSpringBallTournament,$isNotCasual",
"[],$canAccessSpringBallTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -2370,7 +2390,9 @@
{
"name": "Missile (right Maridia sand pit room)",
"access_rules": [
"$canAccessInnerMaridia,$needMinorItems"
"$canAccessInnerMaridia,$isCasual,$needMinorItems",
"$canAccessInnerMaridiaTournament,$isNotCasual,$needMinorItems",
"[],$canAccessInnerMaridiaTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -2431,7 +2453,9 @@
{
"name": "Energy Tank, Botwoon",
"access_rules": [
"$canAccessBotwoon"
"$canAccessBotwoon,$isCasual",
"$canAccessBotwoonTournament,$isNotCasual",
"[],$canAccessBotwoonTournament,$isCasual",
],
"sections": [
{
Expand All @@ -2455,7 +2479,9 @@
{
"name": "Space Jump",
"access_rules": [
"$canAccessDraygon"
"$canAccessDraygon,$isCasual",
"$canAccessDraygonTournament,$isNotCasual",
"[],$canAccessDraygonTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -2534,7 +2560,9 @@
{
"name": "Missile (Draygon)",
"access_rules": [
"$canAccessDraygon,$needMinorItems"
"$canAccessDraygon,$isCasual,$needMinorItems",
"$canAccessDraygonTournament,$isNotCasual,$needMinorItems",
"[],$canAccessDraygonTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -2563,7 +2591,9 @@
"name": "Yellow Maridia",
"color": "#907830",
"access_rules": [
"$canAccessInnerMaridia"
"$canAccessInnerMaridia,$isCasual",
"$canAccessInnerMaridiaTournament,$isNotCasual",
"[],$canAccessInnerMaridiaTournament,$isCasual",
],
"children": [
{
Expand Down
Loading

0 comments on commit e3872df

Please sign in to comment.