Merge pull request #4 from robob27/1_0_4

Fix Pink Brin Wave Gate and minor checkable items
robob27 · Aug 11, 2020 · e73c0b0 · e73c0b0
2 parents e3872df + 828f47a
commit e73c0b0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -35,3 +35,9 @@ Initial release - all logic "fixes" are based on https://samus.link/logic and/or
 - 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.
+
+1.0.4
+-----
+
+- Fixed Brinstar Wave Gate logic for Noob
+- Added minor item check to checkable but inaccessible (blue items) that are minor
diff --git a/locations/locations.json b/locations/locations.json
@@ -280,7 +280,7 @@
                 "name": "Super Missile (Crateria)",
                 "access_rules": [
                   "$canPowerBomb,speed,etank:3,$countTanks:2,$needMinorItems",
-                  "{$canPowerBomb}"
+                  "{$canPowerBomb,$needMinorItems}"
                 ],
                 "sections": [
                   {
@@ -796,8 +796,9 @@
                   {
                     "name": "Energy Tank, Brinstar Gate",
                     "access_rules": [
-                      "$canPowerBomb,wave",
-                      "$canPowerBomb,super",
+                      "$canAccessBrinstarGateEnergyTank,$isCasual",
+                      "$canAccessBrinstarGateEnergyTankTournament,$isNotCasual",
+                      "[],$canAccessBrinstarGateEnergyTankTournament,$isCasual",
                     ],
                     "sections": [
                       {
@@ -1435,7 +1436,7 @@
                       "$canAccessCrocomire,$canFly,$isCasual,$needMinorItems",
                       "$canAccessCrocomire,grapple,$isCasual,$needMinorItems",
                       "$canAccessCrocomire,hijump,speed,$isCasual,$needMinorItems",
-                      "{$canAccessRedBrinstar}",
+                      "{$canAccessRedBrinstar,$needMinorItems}",
                     ],
                     "sections": [
                       {

diff --git a/scripts/logic.lua b/scripts/logic.lua
@@ -714,3 +714,19 @@ function canAccessDraygonTournament()
 
   return 0
 end
+
+function canAccessBrinstarGateEnergyTank()
+  if canPowerBomb() == 1 and hasWave() == 1 then
+    return 1
+  end
+
+  return 0
+end
+
+function canAccessBrinstarGateEnergyTankTournament()
+  if canPowerBomb() == 1 and hasSuper() == 1 then
+    return 1
+  end
+
+  return 0
+end