diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json index e94840757..cb3bf55f7 100644 --- a/region/maridia/inner-pink/East Cactus Alley.json +++ b/region/maridia/inner-pink/East Cactus Alley.json @@ -450,6 +450,10 @@ "h_artificialMorphJumpIntoIBJ", {"spikeHits": 1} ]} + ]}, + {"or": [ + "h_artificialMorphBombThings", + {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}} ]} ], "flashSuitChecked": true, diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json index 49dfe4fa6..7e3fd22b7 100644 --- a/region/maridia/outer/Fish Tank.json +++ b/region/maridia/outer/Fish Tank.json @@ -3755,7 +3755,17 @@ "id": 70, "link": [6, 2], "name": "Base", - "requires": [], + "requires": [ + "h_navigateUnderwater", + {"or": [ + "canCarefulJump", + {"enemyDamage": { + "enemy": "Pink Space Pirate (standing)", + "type": "laser", + "hits": 1 + }} + ]} + ], "flashSuitChecked": true, "blueSuitChecked": true }, diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index f87b83e3f..77ced55ab 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -403,6 +403,31 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [1, 4], + "name": "Come In Shinecharged, Leave With Spark (Hero Shot)", + "entranceCondition": { + "comeInShinecharged": {} + }, + "requires": [ + {"shineChargeFrames": 125}, + "canHeroShot", + "canShinechargeMovementTricky", + {"shinespark": {"frames": 24, "excessFrames": 0}} + ], + "exitCondition": { + "leaveWithSpark": { + "position": "bottom", + "grounded": false + } + }, + "unlocksDoors": [ + {"types": ["super"], "requires": []}, + {"types": ["missiles", "powerbomb"], "requires": ["never"]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 9, "link": [1, 6], @@ -1745,6 +1770,28 @@ "canBeVeryPatient is used for difficulty placement, assuming this will require many retries." ] }, + { + "link": [4, 1], + "name": "High Speed Wall Jump", + "entranceCondition": { + "comeInRunning": { + "speedBooster": "yes", + "minTiles": 34 + } + }, + "requires": [ + "canSpeedyJump", + "canTrickyJump", + "canTrickyWallJump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Come in with a very high speed and either jump just before or after the transition. Wall jump on the left side.", + "Expects a runway of at least 34 tiles in the adjacent room." + ], + "devNote": "This is possible with a bit shorter of a runway but the jump then needs to only be held for a very short amount of time to not bonk the ceiling." + }, { "id": 43, "link": [4, 1],