Merge pull request #2 from robob27/yellow_casual_checks

Fix more checks
robob27 · Aug 9, 2020 · 79d0e63 · 79d0e63
2 parents d659373 + 428e5d4
commit 79d0e63
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 20 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -20,3 +20,11 @@ Initial release - all logic "fixes" are based on https://samus.link/logic and/or
 -----
 
 - Out of logic checks with "Noob" enabled should now be yellow (out of logic but doable) as opposed to hidden
+
+1.0.2
+-----
+
+- Fixed Croc checks to not require 5 energy reserves (distinguish properly between hellruns and the 2/3 reserves required for items near Croc)
+- Fixed Wave Beam check
+- Fixed Lower Norfair checks
+
diff --git a/locations/locations.json b/locations/locations.json
@@ -1202,7 +1202,9 @@
                   {
                     "name": "Energy Tank, Crocomire",
                     "access_rules": [
-                      "$canAccessCrocomire"
+                      "$canAccessCrocomire,$isCasual",
+                      "$canAccessCrocomireTournament,$isNotCasual",
+                      "[],$canAccessCrocomireTournament,$isCasual",
                     ],
                     "sections": [
                       {
@@ -1250,7 +1252,9 @@
                   {
                     "name": "Grapple Beam",
                     "access_rules": [
-                      "$canAccessCrocomire",
+                      "$canAccessCrocomire,$isCasual",
+                      "$canAccessCrocomireTournament,$isNotCasual",
+                      "[],$canAccessCrocomireTournament,$isCasual",
                     ],
                     "sections": [
                       {
@@ -1333,7 +1337,7 @@
                     "name": "Wave Beam",
                     "access_rules": [
                       "$canAccessHeatedNorfair,$isCasual",
-                      "$canAccessHeatedNorfair,$isNotCasual",
+                      "$canAccessHeatedNorfairTournament,$isNotCasual",
                       "[],$canAccessHeatedNorfairTournament,$isCasual",
                     ],
                     "sections": [
@@ -1391,8 +1395,8 @@
                   {
                     "name": "Missile (below Ice Beam)",
                     "access_rules": [
-                      "[],$canAccessKraid,$canPowerBomb,$canHellRun,$isCasual,$needMinorItems",
-                      "$canAccessKraid,$canPowerBomb,$canHellRun,$isNotCasual,$needMinorItems",
+                      "[],$canAccessKraid,$canPowerBomb,$canHellRunShort,$isCasual,$needMinorItems",
+                      "$canAccessKraid,$canPowerBomb,$canHellRunShort,$isNotCasual,$needMinorItems",
                       "$canAccessKraid,$canPowerBomb,varia,$needMinorItems",
                     ],
                     "sections": [
@@ -1417,11 +1421,19 @@
                   {
                     "name": "Missile (above Crocomire)",
                     "access_rules": [
-                      "$canAccessCrocomire,$canFly,$needMinorItems",
-                      "$canAccessCrocomire,grapple,$needMinorItems",
-                      "$canAccessCrocomire,hijump,speed,$needMinorItems",
-                      "$canAccessCrocomire,hijump,$canSpringBallJump,$needMinorItems",
-                      "$canAccessCrocomire,hijump,varia,ice,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,$canFly,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,grapple,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,hijump,speed,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,hijump,$canSpringBallJump,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,hijump,varia,ice,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,$canFly,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,grapple,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,hijump,speed,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,hijump,$canSpringBallJump,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,hijump,varia,ice,$needMinorItems",
+                      "$canAccessCrocomire,$canFly,$isCasual,$needMinorItems",
+                      "$canAccessCrocomire,grapple,$isCasual,$needMinorItems",
+                      "$canAccessCrocomire,hijump,speed,$isCasual,$needMinorItems",
                     ],
                     "sections": [
                       {
@@ -1494,7 +1506,9 @@
                   {
                     "name": "Power Bomb (Crocomire)",
                     "access_rules": [
-                      "$canAccessCrocomire,$needMinorItems"
+                      "$canAccessCrocomire,$isCasual,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,$needMinorItems"
                     ],
                     "sections": [
                       {
@@ -1518,7 +1532,9 @@
                   {
                     "name": "Missile (below Crocomire)",
                     "access_rules": [
-                      "$canAccessCrocomire,$needMinorItems"
+                      "$canAccessCrocomire,$isCasual,$needMinorItems",
+                      "$canAccessCrocomireTournament,$isNotCasual,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$isCasual,$needMinorItems",
                     ],
                     "sections": [
                       {
@@ -1542,9 +1558,14 @@
                   {
                     "name": "Missile (Grapple Beam)",
                     "access_rules": [
-                      "$canAccessCrocomire,$canFly,$needMinorItems",
-                      "$canAccessCrocomire,grapple,$needMinorItems",
-                      "$canAccessCrocomire,speed,$needMinorItems"
+                      "$canAccessCrocomireTournament,speed,$isNotCasual,$needMinorItems",
+                      "$canAccessCrocomireTournament,$hasMorph,$canFly,$isNotCasual,$needMinorItems",
+                      "$canAccessCrocomireTournament,$hasMorph,$hasGrapple,$isNotCasual,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,speed,$isCasual,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$hasMorph,$canFly,$isCasual,$needMinorItems",
+                      "[],$canAccessCrocomireTournament,$hasMorph,$hasGrapple,$isCasual,$needMinorItems",
+                      "$canAccessCrocomire,$hasMorph,$canFly,$isCasual,$needMinorItems",
+                      "$canAccessCrocomire,$hasMorph,speed,$canPowerBomb,$isCasual,$needMinorItems",
                     ],
                     "sections": [
                       {
@@ -1679,6 +1700,7 @@
             "access_rules": [
               "$canAccessLowerNorfair,$isCasual",
               "$canAccessLowerNorfairTournament,$isNotCasual",
+              "[],$canAccessLowerNorfairTournament,$isCasual",
             ],
             "children": [
               {

diff --git a/scripts/logic.lua b/scripts/logic.lua
@@ -415,6 +415,13 @@ function canHellRun()
   return 0
 end
 
+function canHellRunShort()
+  if heatProof() == 1 or countTanks() >= 2 then
+      return 1
+  end
+
+  return 0
+end
 
 function canAccessWreckedShip()
   if canCrossMoat() == 1 and hasSuper() == 1 and canPowerBomb() == 1 then
@@ -516,7 +523,7 @@ end
 
 function canAccessCrocomire()
   if canAccessHeatedNorfair() == 1 and
-    (canAccessKraid() == 1 and canPowerBomb() == 1 and hasSpeedBooster() == 1 and countTanks() >= 2)
+    (canAccessKraid() == 1 and canPowerBomb() == 1 and hasSpeedBooster() == 1)
   then
     return 1
   end
@@ -525,9 +532,7 @@ function canAccessCrocomire()
 end
 
 function canAccessCrocomireTournament()
-  if canAccessHeatedNorfairTournament() == 1 and
-    (canAccessKraid() == 1 and canPowerBomb() == 1 and hasSpeedBooster() == 1 and countTanks() >= 2)
-  then
+  if (canAccessKraid() == 1 and canPowerBomb() == 1 and hasSpeedBooster() == 1 and countTanks() >= 2) then
     return 1
   end
 
@@ -572,7 +577,7 @@ end
 
 function canAccessLowerNorfair()
   if canAccessHeatedNorfair() == 1 and canPowerBomb() == 1 and hasVaria() == 1 and
-    (hasHiJump() == 1 or hasGravity() == 1)
+    (hasSpaceJump() == 1 and hasGravity() == 1)
   then
     return 1
   end