Merge pull request #5 from robob27/1_0_5

Fix Spring Ball tournament logic
robob27 · Aug 14, 2020 · 9c7c868 · 9c7c868
2 parents e73c0b0 + a9aec10
commit 9c7c868
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -41,3 +41,8 @@ Initial release - all logic "fixes" are based on https://samus.link/logic and/or
 
 - Fixed Brinstar Wave Gate logic for Noob
 - Added minor item check to checkable but inaccessible (blue items) that are minor
+
+1.0.5
+-----
+
+- Fixed Shaktool not requiring grapple in tournament logic
diff --git a/scripts/logic.lua b/scripts/logic.lua
@@ -627,7 +627,7 @@ function canAccessSpringBall()
 end
 
 function canAccessSpringBallTournament()
-  if canAccessInnerMaridiaTournament() == 1 and hasSuper() == 1 and canPowerBomb() == 1 and (
+  if canAccessInnerMaridiaTournament() == 1 and hasGrapple() == 1 and hasSuper() == 1 and canPowerBomb() == 1 and (
     hasGravity() == 1 and (canFly() == 1 or hasHiJump() == 1) or
     hasIce() == 1 and hasHiJump() == 1 and canSpringBallJump() == 1 and hasSpaceJump() == 1
   ) then