diff --git a/numerics.json b/numerics.json index 11ca0f3be..137306585 100644 --- a/numerics.json +++ b/numerics.json @@ -58,6 +58,30 @@ "value": 8, "minimum": 0, "note": "Number of failed attempts expected before a successful elevator Crystal Flash attempt." + }, + { + "name": "n_moondanceSpeedPixelsOneTile", + "value": 65510, + "minimum": 0, + "note": "The vertical speed to fall through one tile on the next moonfall." + }, + { + "name": "n_moondanceSpeedPixelsTwoTiles", + "value": 65494, + "minimum": 0, + "note": "The vertical speed to fall through two tiles on the next moonfall." + }, + { + "name": "n_jumpStorageSpeedPixels", + "value": 4, + "minimum": 0, + "note": "The highest vertical speed when springballing in air physics." + }, + { + "name": "n_jumpStorageHiJumpSpeedPixels", + "value": 5, + "minimum": 0, + "note": "The highest vertical speed when springballing in air physics with HiJump." } ] }, diff --git a/region/brinstar/blue/Construction Zone.json b/region/brinstar/blue/Construction Zone.json index 5ad34a35b..6ad3b057a 100644 --- a/region/brinstar/blue/Construction Zone.json +++ b/region/brinstar/blue/Construction Zone.json @@ -212,7 +212,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": false, @@ -638,7 +638,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 3b4a77743..878fd5952 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -326,7 +326,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -346,7 +346,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -626,7 +626,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -646,7 +646,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -2298,7 +2298,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -2319,7 +2319,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -2830,7 +2830,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2856,7 +2856,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], diff --git a/region/brinstar/green/Green Brinstar Beetom Room.json b/region/brinstar/green/Green Brinstar Beetom Room.json index ff47a2b0a..878c695ab 100644 --- a/region/brinstar/green/Green Brinstar Beetom Room.json +++ b/region/brinstar/green/Green Brinstar Beetom Room.json @@ -228,7 +228,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -264,7 +264,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -289,7 +289,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -1012,7 +1012,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -1048,7 +1048,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -1073,7 +1073,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json index bfbb8915e..8df40c536 100644 --- a/region/brinstar/green/Green Brinstar Main Shaft.json +++ b/region/brinstar/green/Green Brinstar Main Shaft.json @@ -1410,7 +1410,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], @@ -2868,13 +2868,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2890,13 +2890,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -3006,7 +3006,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], @@ -3019,7 +3019,7 @@ "name": "Stored Moonfall Clip (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], @@ -3424,13 +3424,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -3446,13 +3446,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -3677,7 +3677,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], @@ -3690,7 +3690,7 @@ "name": "Stored Moonfall Clip (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], diff --git a/region/brinstar/green/Spore Spawn Room.json b/region/brinstar/green/Spore Spawn Room.json index 88f2eacfb..00f222bb9 100644 --- a/region/brinstar/green/Spore Spawn Room.json +++ b/region/brinstar/green/Spore Spawn Room.json @@ -171,7 +171,7 @@ "name": "Moondance Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/brinstar/kraid/Warehouse Energy Tank Room.json b/region/brinstar/kraid/Warehouse Energy Tank Room.json index 4439fdce4..de8ad2d92 100644 --- a/region/brinstar/kraid/Warehouse Energy Tank Room.json +++ b/region/brinstar/kraid/Warehouse Energy Tank Room.json @@ -304,7 +304,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -328,7 +328,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, diff --git a/region/brinstar/kraid/Warehouse Entrance.json b/region/brinstar/kraid/Warehouse Entrance.json index 5b7d55824..1d0462507 100644 --- a/region/brinstar/kraid/Warehouse Entrance.json +++ b/region/brinstar/kraid/Warehouse Entrance.json @@ -166,7 +166,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -192,7 +192,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, diff --git a/region/brinstar/kraid/Warehouse Zeela Room.json b/region/brinstar/kraid/Warehouse Zeela Room.json index 8391ecb25..adcac8725 100644 --- a/region/brinstar/kraid/Warehouse Zeela Room.json +++ b/region/brinstar/kraid/Warehouse Zeela Room.json @@ -431,7 +431,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -565,7 +565,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index ea32b227c..bb3f2af66 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/region/brinstar/pink/Big Pink.json @@ -1277,7 +1277,7 @@ "name": "Extended Moondance Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/brinstar/pink/Dachora Room.json b/region/brinstar/pink/Dachora Room.json index c8e532783..f1894cfb9 100644 --- a/region/brinstar/pink/Dachora Room.json +++ b/region/brinstar/pink/Dachora Room.json @@ -156,7 +156,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -179,7 +179,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -190,6 +190,96 @@ "Moonfall a total of 321 times, stopping just before Samus clips two tiles into the ground." ] }, + { + "link": [1, 1], + "name": "Blockade Leave with Stored Jump", + "requires": [ + "canJumpStorage", + {"obstaclesNotCleared": ["A"]}, + {"noBlueSuit": {}}, + {"or": [ + "h_useMorphBombs", + "ScrewAttack", + "h_shinechargeMaxRunway", + {"and": [ + "canTrickyJumpStorage", + "h_usePowerBomb" + ]} + ]} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Break exactly the bottom left two blocks and perform the jump storage.", + "It is possible to slide into these blocks with Speedbooser, or to carefully break them with Screw Attack." + ] + }, + { + "link": [1, 1], + "name": "Blockade Leave with More Stored Jump", + "requires": [ + "canJumpStorage", + {"obstaclesNotCleared": ["A"]}, + {"noBlueSuit": {}}, + "HiJump", + {"or": [ + "h_useMorphBombs", + "ScrewAttack", + "h_shinechargeMaxRunway", + {"and": [ + "canTrickyJumpStorage", + "h_usePowerBomb" + ]} + ]} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageHiJumpSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Break exactly the bottom left two blocks and perform the jump storage.", + "It is possible to slide into these blocks with Speedbooser, or to carefully break them with Screw Attack." + ] + }, + { + "link": [1, 1], + "name": "Zeela Leave with Stored Jump", + "requires": [ + "canTrickyJumpStorage", + "canTrickyUseFrozenEnemies" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [1, 1], + "name": "Zeela Leave with More Stored Jump", + "requires": [ + "canTrickyJumpStorage", + "HiJump", + "canTrickyUseFrozenEnemies" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageHiJumpSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 4, "link": [1, 1], @@ -369,7 +459,7 @@ "name": "Stored Moonfall Clip (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -450,7 +540,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -483,7 +573,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -504,7 +594,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -512,7 +602,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -528,7 +618,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -543,7 +633,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1156,7 +1246,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -1173,7 +1263,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1181,7 +1271,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1197,7 +1287,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1212,7 +1302,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1390,7 +1480,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], @@ -1403,7 +1493,7 @@ "name": "Stored Moonfall Clip (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], @@ -1497,6 +1587,49 @@ "Shoot a well-timed Super diagonally at the ground just before breaking the speed blocks." ] }, + { + "link": [3, 2], + "name": "Lure Zeela, Leave with Stored Jump", + "requires": [ + {"or": [ + "h_shinechargeMaxRunway", + {"haveBlueSuit": {}} + ]}, + "canTrickyJumpStorage", + "canTrickyUseFrozenEnemies", + "canBeVeryPatient" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "unlocksDoors": [{"types": ["ammo"],"requires": []}], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [3, 2], + "name": "Lure Zeela, Leave with More Stored Jump", + "requires": [ + {"or": [ + "h_shinechargeMaxRunway", + {"haveBlueSuit": {}} + ]}, + "canTrickyJumpStorage", + "HiJump", + "canTrickyUseFrozenEnemies", + "canBeVeryPatient" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageHiJumpSpeedPixels" + } + }, + "unlocksDoors": [{"types": ["ammo"],"requires": []}], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 66, "link": [3, 2], @@ -1543,7 +1676,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -1553,6 +1686,98 @@ "Stop after exactly 175 Moonfalls, before Samus clips into the ground." ] }, + { + "link": [3, 3], + "name": "Blockade Leave with Stored Jump", + "requires": [ + "canJumpStorage", + {"obstaclesNotCleared": ["A"]}, + {"noBlueSuit": {}}, + {"or": [ + "h_useMorphBombs", + "ScrewAttack", + "h_shinechargeMaxRunway", + {"and": [ + "canTrickyJumpStorage", + "h_usePowerBomb" + ]} + ]} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Break exactly the bottom left two blocks and perform the jump storage.", + "It is possible to slide into these blocks with Speedbooser, or to carefully break them with Screw Attack." + ] + }, + { + "link": [3, 3], + "name": "Blockade Leave with More Stored Jump", + "requires": [ + "canJumpStorage", + {"obstaclesNotCleared": ["A"]}, + {"noBlueSuit": {}}, + "HiJump", + {"or": [ + "h_useMorphBombs", + "ScrewAttack", + "h_shinechargeMaxRunway", + {"and": [ + "canTrickyJumpStorage", + "h_usePowerBomb" + ]} + ]} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageHiJumpSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Break exactly the bottom left two blocks and perform the jump storage.", + "It is possible to slide into these blocks with Speedbooser, or to carefully break them with Screw Attack." + ] + }, + { + "link": [3, 3], + "name": "Zeela Leave with Stored Jump", + "requires": [ + {"obstaclesCleared": ["A"]}, + "canTrickyJumpStorage", + "canTrickyUseFrozenEnemies" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [3, 3], + "name": "Zeela Leave with More Stored Jump", + "requires": [ + {"obstaclesCleared": ["A"]}, + "canTrickyJumpStorage", + "HiJump", + "canTrickyUseFrozenEnemies" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageHiJumpSpeedPixels" + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 58, "link": [3, 3], diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json index 0db89893c..0830632d3 100644 --- a/region/brinstar/red/Below Spazer.json +++ b/region/brinstar/red/Below Spazer.json @@ -1113,7 +1113,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json index a09517bf3..fe6e4de0d 100644 --- a/region/brinstar/red/Beta Power Bomb Room.json +++ b/region/brinstar/red/Beta Power Bomb Room.json @@ -679,7 +679,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -716,7 +716,7 @@ "name": "Stored Moonfall Clip (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 9492dd48b..6bdee5a90 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -407,7 +407,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -431,7 +431,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -657,7 +657,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -687,7 +687,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -744,7 +744,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -772,7 +772,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -839,7 +839,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -885,7 +885,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -972,7 +972,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1018,7 +1018,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1070,7 +1070,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -1100,7 +1100,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2068,13 +2068,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2090,13 +2090,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2644,13 +2644,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2666,13 +2666,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/central/Climb.json b/region/crateria/central/Climb.json index bdd1aed21..91fc5c1af 100644 --- a/region/crateria/central/Climb.json +++ b/region/crateria/central/Climb.json @@ -913,7 +913,7 @@ "name": "Transition with Stored Fall Speed (Blue)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -928,7 +928,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -946,7 +946,7 @@ "name": "Transition with Stored Fall Speed (Blue, more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -961,7 +961,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -979,7 +979,7 @@ "name": "Transition with Stored Fall Speed (Screw Fall)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -988,7 +988,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2039,7 +2039,7 @@ "name": "Transition with Stored Fall Speed (Blue)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -2054,7 +2054,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2072,7 +2072,7 @@ "name": "Transition with Stored Fall Speed (Blue, more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -2087,7 +2087,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2105,7 +2105,7 @@ "name": "Transition with Stored Fall Speed (Screw Fall)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -2114,7 +2114,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/central/Crateria Tube.json b/region/crateria/central/Crateria Tube.json index bfe572514..63f635468 100644 --- a/region/crateria/central/Crateria Tube.json +++ b/region/crateria/central/Crateria Tube.json @@ -213,13 +213,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -231,13 +231,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -421,13 +421,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -439,13 +439,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index ed7307a55..65b901ec7 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -689,7 +689,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -700,7 +700,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -716,7 +716,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -731,7 +731,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1359,7 +1359,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1370,7 +1370,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1386,7 +1386,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1401,7 +1401,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json index 67da1a56a..3ee627a6a 100644 --- a/region/crateria/central/Parlor and Alcatraz.json +++ b/region/crateria/central/Parlor and Alcatraz.json @@ -905,7 +905,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], diff --git a/region/crateria/east/Forgotten Highway Elbow.json b/region/crateria/east/Forgotten Highway Elbow.json index cdb67e282..e097bd03e 100644 --- a/region/crateria/east/Forgotten Highway Elbow.json +++ b/region/crateria/east/Forgotten Highway Elbow.json @@ -137,7 +137,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/crateria/east/Homing Geemer Room.json b/region/crateria/east/Homing Geemer Room.json index 1dbd91a0b..be9b9d0b3 100644 --- a/region/crateria/east/Homing Geemer Room.json +++ b/region/crateria/east/Homing Geemer Room.json @@ -246,13 +246,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -268,13 +268,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -380,13 +380,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -402,13 +402,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/east/Pancakes and Wavers Room.json b/region/crateria/east/Pancakes and Wavers Room.json index 7557fe7f8..481e57976 100644 --- a/region/crateria/east/Pancakes and Wavers Room.json +++ b/region/crateria/east/Pancakes and Wavers Room.json @@ -507,7 +507,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -515,7 +515,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -535,7 +535,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -543,7 +543,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -775,7 +775,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -783,7 +783,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -803,7 +803,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -811,7 +811,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json index 512a8506d..2ba3c69b8 100644 --- a/region/crateria/east/West Ocean.json +++ b/region/crateria/east/West Ocean.json @@ -875,7 +875,7 @@ "name": "Stored Moonfall Clip Through the Bridge", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -910,7 +910,7 @@ "name": "Stored Moonfall Clip Into the Bridge", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 9286e8be1..fb4466024 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -1191,7 +1191,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/crateria/west/Green Pirates Shaft.json b/region/crateria/west/Green Pirates Shaft.json index 77cccc918..e3e26c996 100644 --- a/region/crateria/west/Green Pirates Shaft.json +++ b/region/crateria/west/Green Pirates Shaft.json @@ -1061,13 +1061,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1083,13 +1083,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1495,13 +1495,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1517,13 +1517,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2014,7 +2014,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2038,7 +2038,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2117,7 +2117,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2141,7 +2141,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2221,7 +2221,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -2245,7 +2245,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], diff --git a/region/crateria/west/Lower Mushrooms.json b/region/crateria/west/Lower Mushrooms.json index 6a792eda6..0fa4938d5 100644 --- a/region/crateria/west/Lower Mushrooms.json +++ b/region/crateria/west/Lower Mushrooms.json @@ -191,13 +191,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -213,13 +213,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -280,13 +280,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -302,13 +302,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/crateria/west/Terminator Room.json b/region/crateria/west/Terminator Room.json index 82887cd7a..bb6422368 100644 --- a/region/crateria/west/Terminator Room.json +++ b/region/crateria/west/Terminator Room.json @@ -209,13 +209,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -232,13 +232,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -263,13 +263,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -286,13 +286,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 85a58dcfc..b5b93cc40 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -1294,7 +1294,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1852,7 +1852,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1864,7 +1864,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1880,7 +1880,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1892,7 +1892,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2235,7 +2235,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -2247,7 +2247,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2263,7 +2263,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -2275,7 +2275,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json index 279d3cbc1..4aa72a12c 100644 --- a/region/lowernorfair/east/Mickey Mouse Room.json +++ b/region/lowernorfair/east/Mickey Mouse Room.json @@ -1724,7 +1724,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json index b8b2f6317..65eadaf90 100644 --- a/region/lowernorfair/east/Red Kihunter Shaft.json +++ b/region/lowernorfair/east/Red Kihunter Shaft.json @@ -446,7 +446,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -459,7 +459,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -475,7 +475,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -488,7 +488,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1328,7 +1328,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1341,7 +1341,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1357,7 +1357,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1370,7 +1370,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json index dc62e8228..ba37f932d 100644 --- a/region/lowernorfair/west/Screw Attack Room.json +++ b/region/lowernorfair/west/Screw Attack Room.json @@ -3273,7 +3273,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -3405,7 +3405,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/maridia/inner-green/Lonely Crab Room.json b/region/maridia/inner-green/Lonely Crab Room.json index 238ffb9bf..530ebd34c 100644 --- a/region/maridia/inner-green/Lonely Crab Room.json +++ b/region/maridia/inner-green/Lonely Crab Room.json @@ -762,7 +762,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -778,7 +778,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -794,7 +794,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -810,7 +810,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1033,13 +1033,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1055,13 +1055,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/maridia/inner-green/Oasis.json b/region/maridia/inner-green/Oasis.json index 8d076a9e3..6a48b69cc 100644 --- a/region/maridia/inner-green/Oasis.json +++ b/region/maridia/inner-green/Oasis.json @@ -998,13 +998,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1020,13 +1020,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1684,13 +1684,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1706,13 +1706,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index 6a1c39b5f..a3babb8a5 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -349,7 +349,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index 6d40a842f..7b274fd43 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -3016,7 +3016,7 @@ "name": "Stored Moonfall Grapple Door Lock Skip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index e6130d405..a885375df 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -753,7 +753,7 @@ "name": "Stored Moonfall Grapple Door Lock Skip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/maridia/inner-yellow/Plasma Tutorial Room.json b/region/maridia/inner-yellow/Plasma Tutorial Room.json index 43e9dff85..fc4b9549c 100644 --- a/region/maridia/inner-yellow/Plasma Tutorial Room.json +++ b/region/maridia/inner-yellow/Plasma Tutorial Room.json @@ -410,13 +410,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -432,13 +432,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -600,13 +600,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -622,13 +622,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/maridia/outer/Boyon Gate Hall.json b/region/maridia/outer/Boyon Gate Hall.json index 0a2c23b41..d770ab8d6 100644 --- a/region/maridia/outer/Boyon Gate Hall.json +++ b/region/maridia/outer/Boyon Gate Hall.json @@ -289,13 +289,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -311,13 +311,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -649,13 +649,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -671,13 +671,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json index 78a48ce89..ddfeb770f 100644 --- a/region/maridia/outer/Crab Hole.json +++ b/region/maridia/outer/Crab Hole.json @@ -1564,6 +1564,24 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [2, 1], + "name": "Jump Storage", + "entranceCondition": { + "comeInWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "requires": [ + {"disableEquipment": "Gravity"}, + "canMidAirMorph", + "canMomentumConservingTurnaround", + {"tech": "canCrossRoomJumpIntoWater"} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Enter with a small amount of runspeed." + }, { "id": 35, "link": [2, 1], @@ -3718,6 +3736,24 @@ "but this strat is still included in cases where it's a reasonable alternative." ] }, + { + "link": [3, 4], + "name": "Jump Storage", + "entranceCondition": { + "comeInWithStoredFallSpeed": { + "verticalSpeedInPixels": "n_jumpStorageSpeedPixels" + } + }, + "requires": [ + {"disableEquipment": "Gravity"}, + "canMidAirMorph", + "canMomentumConservingTurnaround", + {"tech": "canCrossRoomJumpIntoWater"} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Enter with a small amount of runspeed." + }, { "id": 150, "link": [3, 4], diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index fb611d4e1..adffa8850 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1341,7 +1341,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json index cd646e180..af78682a8 100644 --- a/region/maridia/outer/Maridia Tube.json +++ b/region/maridia/outer/Maridia Tube.json @@ -353,7 +353,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -598,7 +598,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -607,7 +607,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -623,7 +623,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -632,7 +632,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2312,7 +2312,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -2321,7 +2321,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2337,7 +2337,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -2346,7 +2346,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -2600,7 +2600,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/maridia/outer/West Maridia Tube Tunnel.json b/region/maridia/outer/West Maridia Tube Tunnel.json index 9b3c9530d..37c0924d0 100644 --- a/region/maridia/outer/West Maridia Tube Tunnel.json +++ b/region/maridia/outer/West Maridia Tube Tunnel.json @@ -254,13 +254,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -276,13 +276,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -370,13 +370,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -392,13 +392,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json index af438800a..03bc36f83 100644 --- a/region/norfair/east/Bubble Mountain.json +++ b/region/norfair/east/Bubble Mountain.json @@ -2388,7 +2388,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -2944,7 +2944,7 @@ "name": "Stored Moonfall Door Shell Bypass", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json index 521e1d3b9..81b8259d3 100644 --- a/region/norfair/east/Frog Speedway.json +++ b/region/norfair/east/Frog Speedway.json @@ -254,7 +254,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -274,7 +274,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -304,7 +304,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -333,7 +333,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -432,7 +432,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -453,7 +453,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -484,7 +484,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -514,7 +514,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], @@ -534,7 +534,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -545,7 +545,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -561,7 +561,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -572,7 +572,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -805,7 +805,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -816,7 +816,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -832,7 +832,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -843,7 +843,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -859,7 +859,7 @@ "name": "Transition with Stored Fall Speed (Speedless Speedway)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -879,7 +879,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -900,7 +900,7 @@ "name": "Transition with Stored Fall Speed (more speed, Speedless Speedway)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -920,7 +920,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -978,7 +978,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -1008,7 +1008,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, diff --git a/region/norfair/east/Lower Norfair Elevator.json b/region/norfair/east/Lower Norfair Elevator.json index 2deaaeadf..ea46aec4a 100644 --- a/region/norfair/east/Lower Norfair Elevator.json +++ b/region/norfair/east/Lower Norfair Elevator.json @@ -374,7 +374,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -386,7 +386,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -402,7 +402,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -414,7 +414,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -740,7 +740,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -752,7 +752,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -768,7 +768,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -780,7 +780,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index d3a00dcb1..4c89f9ac2 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -362,7 +362,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/norfair/east/Speed Booster Hall.json b/region/norfair/east/Speed Booster Hall.json index 88d183d50..9115bef08 100644 --- a/region/norfair/east/Speed Booster Hall.json +++ b/region/norfair/east/Speed Booster Hall.json @@ -452,7 +452,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -471,7 +471,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -487,7 +487,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -506,7 +506,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1066,7 +1066,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1081,7 +1081,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1097,7 +1097,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1112,7 +1112,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/norfair/west/Business Center.json b/region/norfair/west/Business Center.json index 4505397ac..8860ca95c 100644 --- a/region/norfair/west/Business Center.json +++ b/region/norfair/west/Business Center.json @@ -2223,13 +2223,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -2245,13 +2245,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -3268,13 +3268,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -3290,13 +3290,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index aeab4cd5c..b87168019 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -567,7 +567,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -601,7 +601,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -2418,7 +2418,7 @@ "name": "Extended Stored Moonfall Door Lock Skip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json index 1a21bde98..ed8a13ea7 100644 --- a/region/norfair/west/Ice Beam Gate Room.json +++ b/region/norfair/west/Ice Beam Gate Room.json @@ -844,7 +844,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1439,7 +1439,7 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ @@ -1447,7 +1447,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -1463,7 +1463,7 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ @@ -1471,7 +1471,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -1615,7 +1615,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/tourian/main/Tourian Escape Room 1.json b/region/tourian/main/Tourian Escape Room 1.json index 5932b62a1..43a2a94f0 100644 --- a/region/tourian/main/Tourian Escape Room 1.json +++ b/region/tourian/main/Tourian Escape Room 1.json @@ -193,7 +193,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/region/tourian/main/Tourian Escape Room 3.json b/region/tourian/main/Tourian Escape Room 3.json index c89f8149a..85d890b56 100644 --- a/region/tourian/main/Tourian Escape Room 3.json +++ b/region/tourian/main/Tourian Escape Room 3.json @@ -695,7 +695,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json index b3803bf48..a964cd91e 100644 --- a/region/wreckedship/main/Bowling Alley.json +++ b/region/wreckedship/main/Bowling Alley.json @@ -345,7 +345,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "flashSuitChecked": true, @@ -375,7 +375,7 @@ ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "flashSuitChecked": true, @@ -423,7 +423,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [ diff --git a/region/wreckedship/main/Gravity Suit Room.json b/region/wreckedship/main/Gravity Suit Room.json index f61b0bc3b..04f681aa0 100644 --- a/region/wreckedship/main/Gravity Suit Room.json +++ b/region/wreckedship/main/Gravity Suit Room.json @@ -242,13 +242,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -265,13 +265,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -442,13 +442,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -465,13 +465,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/wreckedship/main/Wrecked Ship Entrance.json b/region/wreckedship/main/Wrecked Ship Entrance.json index 3ce529597..28a21a0af 100644 --- a/region/wreckedship/main/Wrecked Ship Entrance.json +++ b/region/wreckedship/main/Wrecked Ship Entrance.json @@ -127,13 +127,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -149,13 +149,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ @@ -179,13 +179,13 @@ "name": "Transition with Stored Fall Speed", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "unlocksDoors": [ @@ -201,13 +201,13 @@ "name": "Transition with Stored Fall Speed (more speed)", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "unlocksDoors": [ diff --git a/region/wreckedship/main/Wrecked Ship Main Shaft.json b/region/wreckedship/main/Wrecked Ship Main Shaft.json index 2927fd0cf..c5e186a2d 100644 --- a/region/wreckedship/main/Wrecked Ship Main Shaft.json +++ b/region/wreckedship/main/Wrecked Ship Main Shaft.json @@ -1076,7 +1076,7 @@ "name": "Stored Moonfall Clip", "entranceCondition": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 2 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsTwoTiles" } }, "requires": [ diff --git a/schema/m3-numeric-parameters.schema.json b/schema/m3-numeric-parameters.schema.json index 49191938c..bb98243b7 100644 --- a/schema/m3-numeric-parameters.schema.json +++ b/schema/m3-numeric-parameters.schema.json @@ -12,6 +12,10 @@ "n_jumpIntoCrystalFlashLenience", "n_CrystalSparkLenience", "n_elevatorCrystalFlashLenience", + "n_moondanceSpeedPixelsOneTile", + "n_moondanceSpeedPixelsTwoTiles", + "n_jumpStorageSpeedPixels", + "n_jumpStorageHiJumpSpeedPixels", "n_speedKeepAttempts", "n_spikeXModeAttempts", "n_thornXModeLenience", diff --git a/schema/m3-room.schema.json b/schema/m3-room.schema.json index ef83e3e86..622358b7d 100644 --- a/schema/m3-room.schema.json +++ b/schema/m3-room.schema.json @@ -563,15 +563,15 @@ "comeInWithStoredFallSpeed": { "type": "object", "title": "Come in With Stored Fall Speed", - "description": "Represents that Samus has stored a high vertical fall speed value that will clip through the floor with the next use of Moonfall.", - "required": ["fallSpeedInTiles"], + "description": "Represents that Samus has stored a vertical speed value that can jump if low, or underflow and fall quickly if high.", + "required": ["verticalSpeedInPixels"], "additionalProperties": false, "properties": { - "fallSpeedInTiles": { - "type": "integer", - "title": "Fall Speed in Tiles", - "description": "The number of tiles Samus would clip through by Moonfalling on top of a solid floor.", - "maximum": 2 + "verticalSpeedInPixels": { + "$ref": "m3-numeric-value.schema.json#/definitions/nonNegativeIntegerValue", + "title": "Vertical Speed in Pixels", + "description": "The vertical pixel speed Samus has stored.", + "maximum": 65535 } } }, @@ -1165,15 +1165,15 @@ "leaveWithStoredFallSpeed": { "type": "object", "title": "Leave With Stored Fall Speed", - "description": "Represents that Samus has stored a high vertical fall speed value that will clip through the floor with the next use of Moonfall.", - "required": ["fallSpeedInTiles"], + "description": "Represents that Samus has stored a vertical speed value that can jump if low, or underflow and fall quickly if high.", + "required": ["verticalSpeedInPixels"], "additionalProperties": false, "properties": { - "fallSpeedInTiles": { - "type": "integer", - "title": "Fall Speed in Tiles", - "description": "The number of tiles Samus would clip through by Moonfalling on top of a solid floor.", - "maximum": 2 + "verticalSpeedInPixels": { + "$ref": "m3-numeric-value.schema.json#/definitions/nonNegativeIntegerValue", + "title": "Vertical Speed in Pixels", + "description": "The vertical pixel speed Samus has stored.", + "maximum": 65535 } } }, diff --git a/schema/m3-string-requirements.schema.json b/schema/m3-string-requirements.schema.json index eea90958f..d3b281316 100644 --- a/schema/m3-string-requirements.schema.json +++ b/schema/m3-string-requirements.schema.json @@ -127,6 +127,8 @@ "canFrozenEnemyGrappleHang", "canSuperSink", "canMorphTurnaround", + "canJumpStorage", + "canTrickyJumpStorage", "canCrouchJump", "canTurnaroundSpinJump", "canFlatleyJump", diff --git a/strats.md b/strats.md index 4fc332de1..baa78952e 100644 --- a/strats.md +++ b/strats.md @@ -383,7 +383,7 @@ A `leaveSpaceJumping` condition comes with implicit requirements: A `leaveWithStoredFallSpeed` exit condition represents that Samus can leave through this door with stored fall speed. The `leaveWithStoredFallSpeed` object has a single property: -- _fallSpeedInTiles_: The number of tiles Samus would clip through by Moonfalling on top of a solid floor. +- _verticalSpeedInPixels_: Represents that Samus has stored a vertical speed value that can jump if low, or underflow and fall quickly if high. A `leaveWithStoredFallSpeed` entrance condition must match with a `comeInWithStoredFallSpeed` condition on the other side of the door. A strat with a `leaveWithStoredFallSpeed` condition must include a method of storing fall speed within its requirements, such as a Moondance. Entering a room with a `comeInWithStoredFallSpeed` condition would also be a possible way to exit with a `leaveWithStoredFallSpeed` condition so long as the stored speed is not lost. For this to happen, both doors must be connected by one `Runway`, and Samus must not Crouch or become Knocked back. @@ -397,7 +397,7 @@ A `leaveWithStoredFallSpeed` entrance condition must match with a `comeInWithSto ], "exitCondition": { "leaveWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } } } @@ -1350,9 +1350,9 @@ There are additional requirements depending on the exit condition: A `comeInWithStoredFallSpeed` entrance condition represents that Samus can enter through this door with stored fall speed. The `comeInWithStoredFallSpeed` object has a single property: -- _fallSpeedInTiles_: The number of tiles Samus would clip through by Moonfalling on top of a solid floor. +- _verticalSpeedInPixels_: Represents that Samus has stored a vertical speed value that can jump if low, or underflow and fall quickly if high. -A `comeInWithStoredFallSpeed` entrance condition must match with a `leaveWithStoredFallSpeed` condition on the other side of the door. The `comeInWithStoredFallSpeed` can lead to another `leaveWithStoredFallSpeed` so long as the stored speed is not lost. For this to happen, both doors must be connected by one `Runway`, and Samus must not Crouch or become Knocked back. A strat with a `comeInWithStoredFallSpeed` condition should only include requirements needed to position Samus for the clip. +A `comeInWithStoredFallSpeed` entrance condition must match with a `leaveWithStoredFallSpeed` condition on the other side of the door. The `comeInWithStoredFallSpeed` can lead to another `leaveWithStoredFallSpeed` so long as the stored speed is not lost. For this to happen, both doors must be connected by one `Runway`, and Samus must not Crouch or become Knocked back. A strat with a `comeInWithStoredFallSpeed` condition should only include requirements needed to position Samus for the strat. *Note*: There is an implicit `canMoonfall` requirement on strats which have the `comeInWithStoredFallSpeed` condition as a means of using the stored fall speed. @@ -1362,7 +1362,7 @@ A `comeInWithStoredFallSpeed` entrance condition must match with a `leaveWithSto "name": "Stored Fall Speed Clip", "entranceCondtion": { "comeInWithStoredFallSpeed": { - "fallSpeedInTiles": 1 + "verticalSpeedInPixels": "n_moondanceSpeedPixelsOneTile" } }, "requires": [] diff --git a/tech.json b/tech.json index c0b040f72..806e7dee3 100644 --- a/tech.json +++ b/tech.json @@ -1051,6 +1051,38 @@ "The ability to use Morph to turn around without moving horizontally.", "This is typically used to back into a corner without Moonwalk." ] + }, + { + "name": "canJumpStorage", + "techRequires": [], + "otherRequires": [ + "Morph", + "SpringBall" + ], + "note": [ + "The ability to 'interrupt' a ball-form jump, by unmorphing in a 2 tile-high space, to store the jump for later.", + "Morphing will remove Jump Storage, so Samus must be positioned to escape with a crouched turnaround.", + "This is easily done by moonwalking into the wall, crouching, and turning under the space.", + "Walking off a ledge will then resume the jump using the stored vertical speed values.", + "This is most useful for carrying a air physics jump into a water room to gain extra height.", + "The stored jump will activate from: damage knockback, jumping, falling, crouching, morphing, or standing with an up press.", + "and it will be lost by using Grapple.", + "Angle turnaround canceling will reduce the strength of the jump." + ], + "devNote": "It is possible to store greater speed with a Speedbooster assisted springball jump but it has limited uses.", + "extensionTechs": [ + { + "name": "canTrickyJumpStorage", + "techRequires": ["canJumpStorage"], + "otherRequires": [], + "note": [ + "The ability to perform Jump Storage under more difficult conditions.", + "This can be using a frozen enemy, or using blocks that are actively breaking from a Power Bomb", + "This includes using SpeedBooster to increase the stored jump height.", + "But in that case the blocks must be broken to escape afterwards." + ] + } + ] } ] },