Skip to content

Commit

Permalink
Merge pull request #1 from robob27/yellow_casual_checks
Browse files Browse the repository at this point in the history 
Yellow for doable but out of logic checks for noob
  • Loading branch information
@robob27
robob27 authored Aug 9, 2020
2 parents 553368d + 945d996 commit d659373
Show file tree
Hide file tree
Showing 3 changed files with 220 additions and 85 deletions.
6 changes: 6 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ Initial release - all logic "fixes" are based on https://samus.link/logic and/or
- Fixed West Upper Norfair/Croc item access checks to account for casual logic when Noob is selected
- Fixed Green Brinstar checks to account for casual logic when Noob is selected
- Adjusted energy tanks for hell runs to 5


1.0.1
-----

- Out of logic checks with "Noob" enabled should now be yellow (out of logic but doable) as opposed to hidden
100 changes: 75 additions & 25 deletions locations/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"name": "Energy Tank, Gauntlet",
"access_rules": [
"$canEnterAndLeaveGauntlet,$countTanks:1",
"$canEnterAndLeaveGauntletTournament,$isNotCasual"
"$canEnterAndLeaveGauntletTournament,$isNotCasual",
"[],$canEnterAndLeaveGauntletTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -96,7 +97,7 @@
"name": "Power Bomb (Crateria surface)",
"access_rules": [
"$canPowerBomb,speed,$needMinorItems",
"$canPowerBomb,$canFly,$needMinorItems"
"$canPowerBomb,$canFly,$needMinorItems",
],
"sections": [
{
Expand All @@ -120,7 +121,9 @@
{
"name": "Missile (outside Wrecked Ship bottom)",
"access_rules": [
"$canAccessWreckedShip,$needMinorItems",
"$canAccessWreckedShip,$isCasual,$needMinorItems",
"$canAccessWreckedShipTournament,$isNotCasual,$needMinorItems",
"[],$canAccessWreckedShipTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -144,7 +147,9 @@
{
"name": "Missile (outside Wrecked Ship top)",
"access_rules": [
"$canAccessWreckedShip,phantoon,$needMinorItems",
"$canAccessWreckedShip,phantoon,$isCasual,$needMinorItems",
"$canAccessWreckedShipTournament,phantoon,$isNotCasual,$needMinorItems",
"[],$canAccessWreckedShipTournament,phantoon,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -168,7 +173,9 @@
{
"name": "Missile (outside Wrecked Ship middle)",
"access_rules": [
"$canAccessWreckedShip,phantoon,$needMinorItems",
"$canAccessWreckedShip,phantoon,$isCasual,$needMinorItems",
"$canAccessWreckedShipTournament,phantoon,$isNotCasual,$needMinorItems",
"[],$canAccessWreckedShipTournament,phantoon,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -192,7 +199,9 @@
{
"name": "Missile (Crateria moat)",
"access_rules": [
"$canAccessWreckedShip,$needMinorItems",
"$canAccessWreckedShipTournament,$isCasual,$needMinorItems",
"$canAccessWreckedShipTournament,$isNotCasual,$needMinorItems",
"[],$canAccessWreckedShipTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -241,7 +250,8 @@
"name": "After Gauntlet",
"access_rules": [
"$canEnterAndLeaveGauntlet,$canBombPassages,$countTanks:2,$needMinorItems",
"$canEnterAndLeaveGauntletTournament,$canBombPassages,$isNotCasual,$needMinorItems"
"$canEnterAndLeaveGauntletTournament,$canBombPassages,$isNotCasual,$needMinorItems",
"[],$canEnterAndLeaveGauntletTournament,$canBombPassages,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -354,6 +364,14 @@
},
{
"name": "Energy Tank, Brinstar Ceiling",
"access_rules": [
"[]",
"$isNotCasual",
"$canFly",
"hijump",
"speedbooster",
"ice"
],
"sections": [
{
"name": "Major Item",
Expand Down Expand Up @@ -496,6 +514,7 @@
{
"name": "Reserve Tank, Brinstar",
"access_rules": [
"[],$canOpenRedDoors,$canBombWalls,morph,$isCasual",
"$canOpenRedDoors,$canBombWalls,morph,$isNotCasual",
"$canOpenRedDoors,speed"
],
Expand Down Expand Up @@ -601,6 +620,7 @@
{
"name": "Super Missile (green Brinstar top)",
"access_rules": [
"[],$canOpenRedDoors,$canBombWalls,morph,$isCasual,$needMinorItems",
"$canOpenRedDoors,$canBombWalls,morph,$isNotCasual,$needMinorItems",
"$canOpenRedDoors,speed,$needMinorItems",
],
Expand All @@ -626,6 +646,7 @@
{
"name": "Behind Brinstar Reserve",
"access_rules": [
"[],$canOpenRedDoors,$isCasual",
"$canOpenRedDoors,$isNotCasual",
"$canOpenRedDoors,speed"
],
Expand Down Expand Up @@ -921,6 +942,7 @@
"$canPowerBomb,grapple",
"$canPowerBomb,space",
"$canPowerBomb,$canAccessXRayTournament,$isNotCasual",
"[],$canPowerBomb,$canAccessXRayTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1154,8 +1176,9 @@
{
"name": "Ice Beam",
"access_rules": [
"$canAccessIce",
"$canAccessIceTournament",
"$canAccessIce,$isCasual",
"$canAccessIceTournament,$isNotCasual",
"[],$canAccessIceTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1251,7 +1274,9 @@
{
"name": "Reserve Tank, Norfair",
"access_rules": [
"$canAccessNorfairReserve",
"$canAccessNorfairReserve,$isCasual",
"$canAccessNorfairReserveTournament,$isNotCasual",
"[],$canAccessNorfairReserveTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1281,7 +1306,9 @@
{
"name": "Speed Booster",
"access_rules": [
"$canAccessHeatedNorfair",
"$canAccessHeatedNorfair,$isCasual",
"$canAccessHeatedNorfairTournament,$isNotCasual",
"[],$canAccessHeatedNorfairTournament,$isCasual",
],
"sections": [
{
Expand All @@ -1305,7 +1332,9 @@
{
"name": "Wave Beam",
"access_rules": [
"$canAccessHeatedNorfair",
"$canAccessHeatedNorfair,$isCasual",
"$canAccessHeatedNorfair,$isNotCasual",
"[],$canAccessHeatedNorfairTournament,$isCasual",
],
"sections": [
{
Expand Down Expand Up @@ -1336,7 +1365,9 @@
{
"name": "Missile (lava room)",
"access_rules": [
"$canAccessHeatedNorfair,$needMinorItems"
"$canAccessHeatedNorfair,$isCasual,$needMinorItems",
"$canAccessHeatedNorfairTournament,$isNotCasual,$needMinorItems",
"[],$canAccessHeatedNorfairTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1360,7 +1391,9 @@
{
"name": "Missile (below Ice Beam)",
"access_rules": [
"$canAccessKraid,$canPowerBomb,$canHellRun,$needMinorItems",
"[],$canAccessKraid,$canPowerBomb,$canHellRun,$isCasual,$needMinorItems",
"$canAccessKraid,$canPowerBomb,$canHellRun,$isNotCasual,$needMinorItems",
"$canAccessKraid,$canPowerBomb,varia,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -1535,7 +1568,9 @@
{
"name": "Missile (bubble Norfair green door)",
"access_rules": [
"$canAccessNorfairReserve,$needMinorItems",
"$canAccessNorfairReserve,$isCasual,$needMinorItems",
"$canAccessNorfairReserveTournament,$isNotCasual,$needMinorItems",
"[],$canAccessNorfairReserveTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1559,7 +1594,9 @@
{
"name": "Missile (bubble Norfair)",
"access_rules": [
"$canAccessHeatedNorfair,$needMinorItems"
"$canAccessHeatedNorfair,$isCasual,$needMinorItems",
"$canAccessHeatedNorfairTournament,$isNotCasual,$needMinorItems",
"[],$canAccessHeatedNorfairTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1583,7 +1620,9 @@
{
"name": "Missile (Speed Booster)",
"access_rules": [
"$canAccessHeatedNorfair,$needMinorItems"
"$canAccessHeatedNorfair,$isCasual,$needMinorItems",
"$canAccessHeatedNorfairTournament,$isNotCasual,$needMinorItems",
"[],$canAccessHeatedNorfairTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand All @@ -1607,7 +1646,9 @@
{
"name": "Missile (Wave Beam)",
"access_rules": [
"$canAccessHeatedNorfair,$needMinorItems"
"$canAccessHeatedNorfair,$isCasual,$needMinorItems",
"$canAccessHeatedNorfairTournament,$isNotCasual,$needMinorItems",
"[],$canAccessHeatedNorfairTournament,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -1636,7 +1677,8 @@
"name": "Lower Norfair",
"color": "#700010",
"access_rules": [
"$canAccessLowerNorfair",
"$canAccessLowerNorfair,$isCasual",
"$canAccessLowerNorfairTournament,$isNotCasual",
],
"children": [
{
Expand Down Expand Up @@ -1906,7 +1948,9 @@
"name": "Wrecked Ship",
"color": "#707048",
"access_rules": [
"$canAccessWreckedShip",
"$canAccessWreckedShip,$isCasual",
"$canAccessWreckedShipTournament,$isNotCasual",
"[],$canAccessWreckedShipTournament,$isCasual",
],
"children": [
{
Expand All @@ -1918,7 +1962,8 @@
"name": "Reserve Tank, Wrecked Ship",
"access_rules": [
"$canAccessWreckedShipReserve,phantoon",
"$canAccessWreckedShipReserveTournament,$isNotCasual,phantoon"
"$canAccessWreckedShipReserveTournament,$isNotCasual,phantoon",
"[],$canAccessWreckedShipReserveTournament,$isCasual,phantoon",
],
"sections": [
{
Expand Down Expand Up @@ -1991,7 +2036,9 @@
{
"name": "Gravity Suit",
"access_rules": [
"$canAccessGravity,phantoon",
"$canAccessGravity,$isCasual,phantoon",
"$canAccessGravityTournament,$isNotCasual,phantoon",
"[],$canAccessGravity,$isCasual,phantoon",
],
"sections": [
{
Expand Down Expand Up @@ -2046,7 +2093,9 @@
{
"name": "Missile (Gravity Suit)",
"access_rules": [
"$canAccessGravity,phantoon,$needMinorItems",
"$canAccessGravity,phantoon,$isCasual,$needMinorItems",
"$canAccessGravityTournament,phantoon,$isNotCasual,$needMinorItems",
"[],$canAccessGravity,phantoon,$isCasual,$needMinorItems",
],
"sections": [
{
Expand Down Expand Up @@ -2503,8 +2552,9 @@
{
"name": "Plasma Beam",
"access_rules": [
"$canAccessPlasma,draygon",
"$canAccessPlasmaTournament,draygon"
"$canAccessPlasma,$isCasual,draygon",
"$canAccessPlasmaTournament,$isNotCasual,draygon",
"[],$canAccessPlasmaTournament,$isCasual,draygon",
],
"sections": [
{
Expand Down
Loading

0 comments on commit d659373

Please sign in to comment.