X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;f=resources%2Fjs%2Fhelpers%2Flogic.js;h=fa989f921c38a3ea5026c58371efb4c5c8348c5d;hb=e9e1ccc9f8b4a6fc0d4d4ce54a710832227e3da0;hp=522561336342cc2b4ce2e5c36332958e2699db88;hpb=07c9bbbb2c6ddde460f48245699f27eaf66b8ac3;p=alttp.git

diff --git a/resources/js/helpers/logic.js b/resources/js/helpers/logic.js
index 5225613..fa989f9 100644
--- a/resources/js/helpers/logic.js
+++ b/resources/js/helpers/logic.js
@@ -262,14 +262,11 @@ const westLightWorld = eastLightWorld;
 const southLightWorld = eastLightWorld;
 
 const eastDarkWorld = when(isInverted,
-	or(canFly, canSwim, hasHammer, and(hasMoonpearl, eastLightWorld)),
-	and(
-		hasMoonpearl,
-		or(
-			agaDead,
-			canHeavyLift,
-			and(canLift, hasHammer),
-		),
+	or(canFly, canSwim, hasHammer, and(hasMirror, eastLightWorld)),
+	or(
+		agaDead,
+		and(hasMoonpearl, canHeavyLift),
+		and(hasMoonpearl, canLift, hasHammer),
 	),
 );
 
@@ -707,7 +704,7 @@ Logic.open = {
 	brewery: fromBool(and(westDarkWorld, canBomb, hasMoonpearl)),
 	'bumper-cave': fromBool(and(westDarkWorld, hasMoonpearl, canLift, hasCape)),
 	'c-house': fromBool(and(westDarkWorld, hasMoonpearl)),
-	catfish: fromBool(and(eastDarkWorld, hasMoonpearl)),
+	catfish: fromBool(and(eastDarkWorld, hasMoonpearl, canLift)),
 	'cave-45': fromBool(and(southDarkWorld, hasMirror)),
 	checkerboard: fromBool(and(mireArea, hasMirror)),
 	'chest-game': fromBool(and(westDarkWorld, hasMoonpearl)),