diff --git a/region/maridia/outer/Glass Tunnel.json b/region/maridia/outer/Glass Tunnel.json index cb3b0e2e99..4852f984ca 100644 --- a/region/maridia/outer/Glass Tunnel.json +++ b/region/maridia/outer/Glass Tunnel.json @@ -1659,6 +1659,74 @@ "Shoot the door while rising to pass through." ] }, + { + "link": [2, 4], + "name": "Side Platform Cross Room Jump", + "entranceCondition": { + "comeInWithSidePlatform": { + "platforms": [ + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 38, + "speedBooster": true, + "obstructions": [[1, 0]], + "requires": [], + "note": "Applies to Noob Bridge.", + "devNote": [ + "FIXME: This (and other cases) can leave with enough vertical momentum to make it to the middle door of Main Street,", + "if the top door of Glass Tunnel connects to the bottom of Main Street." + ] + }, + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 45, + "speedBooster": true, + "obstructions": [[3, 0]], + "requires": [ + "canMomentumConservingMorph", + "canInsaneJump", + "canInsaneMidAirMorph" + ], + "note": ["This applies to Statues Hallway and Baby Kraid Room."] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 45, + "speedBooster": true, + "obstructions": [[3, 0]], + "requires": [ + "canMomentumConservingMorph", + "canInsaneJump", + "canInsaneMidAirMorph" + ], + "note": ["This applies to Bowling Alley (middle, power off) and Basement (power on)."] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 39.4375, + "speedBooster": true, + "obstructions": [[3, 2]], + "requires": [], + "note": "Applies to Metal Pirates Room." + } + ] + } + }, + "requires": [ + "f_MaridiaTubeBroken", + "canCrossRoomJumpIntoWater", + "canTrickyJump", + "canMomentumConservingTurnaround" + ], + "unlocksDoors": [ + {"types": ["super"], "requires": []}, + {"types": ["missiles", "powerbomb"], "requires": ["never"]} + ] + }, { "id": 144, "link": [2, 4], diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index 7f048985ae..4835763202 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1799,6 +1799,97 @@ "to prepare for this case, pause immediately when entering the room in order to unequip Spring Ball after the bounce." ] }, + { + "link": [2, 3], + "name": "Side Platform Cross Room Jump", + "entranceCondition": { + "comeInWithSidePlatform": { + "platforms": [ + { + "minHeight": 1, + "maxHeight": 1, + "minTiles": 16, + "speedBooster": true, + "obstructions": [[1, 0]], + "requires": [ + "canMomentumConservingMorph", + "canInsaneJump", + "canInsaneMidAirMorph" + ], + "note": ["This applies to Lava Dive Room."] + }, + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 27.4375, + "speedBooster": true, + "obstructions": [[1, 0]], + "requires": [ + "canMomentumConservingMorph", + {"or": [ + {"enemyDamage": {"enemy": "Skultera", "type": "contact", "hits": 1}}, + "canInsaneJump" + ]} + ], + "note": ["This applies to Dust Torizo Room and Noob Bridge."] + }, + { + "minHeight": 2, + "maxHeight": 2, + "minTiles": 45, + "speedBooster": true, + "obstructions": [[1, 0]], + "requires": [ + "canMomentumConservingTurnaround", + "canInsaneJump" + ], + "note": ["This applies to Noob Bridge."] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 28.2472, + "speedBooster": true, + "obstructions": [[1, 0]], + "requires": [ + "canMomentumConservingMorph", + {"or": [ + {"enemyDamage": {"enemy": "Skultera", "type": "contact", "hits": 1}}, + "canInsaneJump" + ]} + ], + "note": ["This applies to Double Chamber."] + }, + { + "minHeight": 3, + "maxHeight": 3, + "minTiles": 39.4375, + "speedBooster": true, + "obstructions": [[3, 2]], + "requires": [ + {"or": [ + {"and": [ + "canMomentumConservingMorph", + {"or": [ + {"enemyDamage": {"enemy": "Skultera", "type": "contact", "hits": 1}}, + "canInsaneJump" + ]} + ]}, + {"and": [ + "canInsaneJump", + "canMomentumConservingTurnaround" + ]} + ]} + ], + "note": "Applies to Metal Pirates Room." + } + ] + } + }, + "requires": [ + "canCrossRoomJumpIntoWater" + ] + }, { "id": 51, "link": [2, 3],