Merge pull request #1530 from osse101/SandHall

Some Cross Room Jump edits

Author: osse101

region/crateria/east/East Ocean.json

@@ -904,7 +904,7 @@
         "canSuitlessMaridia",
         "HiJump",
         {"or": [
-          "canSpringBallJumpMidAir",
+          "canTrickySpringBallJump",
           "canSpaceJumpWaterBounce"
         ]}
       ]

region/maridia/inner-green/East Sand Hall.json

@@ -333,41 +333,62 @@
     },
     {
       "link": [1, 4],
-      "name": "Suitless HiJump Evir Avoid",
+      "name": "Suitless HiJump Jump with Momentum",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": "any",
           "minTiles": 3.4375
         }
       },
       "requires": [
-        "canSuitlessMaridia",
+        "canCrossRoomJumpIntoWater",
         "HiJump",
         "canCarefulJump"
       ],
       "note": "By entering the room with run speed, it is possible to jump over the pair of Evirs."
     },
     {
       "link": [1, 4],
-      "name": "Suitless HiJump, Evir Projectile Hit",
+      "name": "Suitless Speed HiJump Jump with Momentum",
+      "entranceCondition": {
+        "comeInRunning": {
+          "speedBooster": true,
+          "minTiles": 3
+        }
+      },
+      "requires": [
+        "canCrossRoomJumpIntoWater",
+        "HiJump",
+        "canCarefulJump"
+      ],
+      "note": "By entering the room with run speed, it is possible to jump over the pair of Evirs."
+    },
+    {
+      "link": [1, 4],
+      "name": "Suitless HiJump Evir Avoid",
       "requires": [
         "canSuitlessMaridia",
         "HiJump",
         "canPlayInSand",
-        {"enemyDamage": {
-          "enemy": "Evir",
-          "type": "particle",
-          "hits": 1
-        }}
+        {"or": [
+          "canTrickyJump",
+          {"enemyDamage": {
+            "enemy": "Evir",
+            "type": "particle",
+            "hits": 1
+          }}
+        ]}
       ]
     },
     {
       "link": [1, 4],
       "name": "Evir Fight Suitless",
       "requires": [
         "canSuitlessMaridia",
+        "canDodgeWhileShooting",
         "HiJump",
         "canPlayInSand",
+        "canTrickyJump",
         {"or": [
           "Ice",
           {"enemyKill": {
@@ -876,22 +897,29 @@
             "type": "particle",
             "hits": 1
           }},
-          "Ice",
-          "ScrewAttack",
-          {"enemyKill": {
-            "enemies": [
-              ["Evir"],
-              ["Evir"]
-            ],
-            "explicitWeapons": ["Super", "Plasma", "PowerBombPeriphery"]
-          }}
+          {"and": [
+            "canDodgeWhileShooting",
+            {"or": [
+              "ScrewAttack",
+              {"enemyKill": {
+                "enemies": [
+                  ["Evir"],
+                  ["Evir"]
+                ],
+                "explicitWeapons": ["Super", "Plasma", "PowerBombPeriphery"]
+              }}
+            ]}
+          ]}
         ]}
       ],
-      "devNote": "Other weapons take too long to kill the enemy."
+      "devNote": [
+        "Other weapons take too long to kill the enemy.",
+        "Ice is likely to be blocked by the particle."
+      ]
     },
     {
       "link": [4, 1],
-      "name": "Fight Evirs Suitless",
+      "name": "Suitless Evir Avoid",
       "requires": [
         "canSuitlessMaridia",
         "HiJump",
@@ -902,18 +930,38 @@
             "enemy": "Evir",
             "type": "particle",
             "hits": 1
-          }},
-          "Ice",
-          {"enemyKill": {
-            "enemies": [
-              ["Evir"],
-              ["Evir"]
-            ],
-            "explicitWeapons": ["Super", "Plasma", "PowerBombPeriphery"]
+          }}
+        ]},
+        {"or": [
+          "canSandfallBounce",
+          {"enemyDamage": {
+            "enemy": "Evir",
+            "type": "particle",
+            "hits": 1
           }}
         ]}
+      ]
+    },
+    {
+      "link": [4, 1],
+      "name": "Fight Evirs Suitless",
+      "requires": [
+        "canSuitlessMaridia",
+        "HiJump",
+        "canPlayInSand",
+        "canDodgeWhileShooting",
+        {"enemyKill": {
+          "enemies": [
+            ["Evir"],
+            ["Evir"]
+          ],
+          "explicitWeapons": ["Super", "Plasma", "PowerBombPeriphery"]
+        }}
       ],
-      "devNote": "Other weapons take too long to kill the enemy."
+      "devNote": [
+        "Other weapons take too long to kill the enemy.",
+        "Ice is likely to be blocked by the particle."
+      ]
     },
     {
       "link": [4, 1],

region/maridia/inner-green/West Sand Hall.json

@@ -290,7 +290,8 @@
       ],
       "note": [
         "Gain momentum in the room to the left, then jump at the edge of the runway in order to land on the first pillar.",
-        "Requires a runway of at least 2 tiles (with no open end) in the adjacent room."
+        "Requires a runway of at least 2 tiles (with no open end) in the adjacent room.",
+        "Shrinking Samus' hitbox before landing makes the jump a little easier."
       ],
       "devNote": "This is not technically a canCrossRoomJumpIntoWater, but it is used here because of the way the momentum changes as Samus enters the water."
     },
@@ -321,7 +322,7 @@
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": false,
-          "minTiles": 4.4375
+          "minTiles": 4
         }
       },
       "requires": [
@@ -332,7 +333,8 @@
       "note": [
         "Gain momentum in the room to the left, then jump in this room in order to land on the first pillar. Ensure that Speed Booster is disabled.",
         "With a short runway of 5 tiles (with no open end) in the adjacent room, it is required to jump as late as possible at the edge of the runway in this room.",
-        "With any longer of a runway, the jump is much less precise."
+        "With any longer of a runway, the jump is much less precise.",
+        "Shrinking Samus' hitbox before landing makes the jump a little easier."
       ],
       "devNote": "This is not technically a canCrossRoomJumpIntoWater, but it is used here because of the way the momentum changes as Samus enters the water."
     },
@@ -365,9 +367,9 @@
       "link": [1, 5],
       "name": "Cross Room Jump into Air Ball",
       "entranceCondition": {
-        "comeInJumping": {
+        "comeInRunning": {
           "speedBooster": false,
-          "minTiles": 6.4375
+          "minTiles": 6
         }
       },
       "requires": [
@@ -376,16 +378,38 @@
         "canPlayInSand"
       ],
       "note": [
-        "Requires a runway of 7 tiles (with no open end) in the adjacent room.",
-        "Perform an air ball before hitting the ceiling in order to land on the first pillar."
+        "Gain momentum in the room to the left, then jump in this room in order to land on the first pillar. Ensure that Speed Booster is disabled.",
+        "Perform an air ball before hitting the ceiling in order to land on the first pillar.",
+        "Requires a runway of 6 tiles in the adjacent room."
+      ]
+    },
+    {
+      "link": [1, 5],
+      "name": "Tricky Cross Room Jump into Air Ball",
+      "entranceCondition": {
+        "comeInRunning": {
+          "speedBooster": false,
+          "minTiles": 5
+        }
+      },
+      "requires": [
+        "canLateralMidAirMorph",
+        "canCrossRoomJumpIntoWater",
+        "canPlayInSand",
+        "canTrickyJump"
+      ],
+      "note": [
+        "Gain momentum in the room to the left, then jump in this room in order to land on the first pillar. Ensure that Speed Booster is disabled.",
+        "Perform an air ball before hitting the ceiling in order to land on the first pillar.",
+        "Requires a runway of 5 tiles in the adjacent room."
       ]
     },
     {
       "link": [1, 5],
       "name": "Cross Room Jump into Air Ball with HiJump",
       "entranceCondition": {
-        "comeInJumping": {
-          "speedBooster": "any",
+        "comeInRunning": {
+          "speedBooster": false,
           "minTiles": 1
         }
       },
@@ -396,6 +420,7 @@
         "canPlayInSand"
       ],
       "note": [
+        "Gain momentum in the room to the left, then jump in this room in order to land on the first pillar. Ensure that Speed Booster is disabled.",
         "Requires a runway of only approximately 0.5 tiles in the adjacent room.",
         "Perform an air ball before hitting the ceiling in order to land on the first pillar."
       ]
@@ -816,6 +841,14 @@
             "type": "particle",
             "hits": 1
           }}
+        ]},
+        {"or": [
+          "canSandfallBounce",
+          {"enemyDamage": {
+            "enemy": "Evir",
+            "type": "particle",
+            "hits": 1
+          }}
         ]}
       ]
     },
@@ -967,6 +1000,14 @@
             "type": "particle",
             "hits": 1
           }}
+        ]},
+        {"or": [
+          "canSandfallBounce",
+          {"enemyDamage": {
+            "enemy": "Evir",
+            "type": "particle",
+            "hits": 1
+          }}
         ]}
       ]
     },

region/maridia/outer/Mt. Everest.json

@@ -717,9 +717,16 @@
       "name": "Mt. Everest Left Crab Climb",
       "requires": [
         "canSuitlessMaridia",
-        "canCrazyCrabClimb",
         "canTrickyJump",
-        "h_canCrouchJumpDownGrab",
+        "canTrickyUseFrozenEnemies",
+        {"or": [
+          {"and": [
+            "canCrazyCrabClimb",
+            "h_canCrouchJumpDownGrab"
+          ]},
+          "HiJump",
+          "canSpringBallJumpMidAir"
+        ]},
         "canCameraManip",
         {"ammo": {"type": "Super", "count": 1}}
       ],
@@ -989,12 +996,17 @@
       "name": "Suitless Frozen Crab",
       "requires": [
         "canSuitlessMaridia",
-        "canTrickyUseFrozenEnemies"
+        "canTrickyUseFrozenEnemies",
+        {"or": [
+          "canTrickyJump",
+          "canTrickySpringBallJump",
+          "HiJump"
+        ]}
       ],
       "note": [
         "Use the rightmost crab to get up onto the lowest platform, while also damaging down the crab on the middle platform.",
         "Jump left onto the middle platform and freeze the crab just a bit left of the peak.",
-        "Run and jump from on top of the crab to the higher platform to the left. A failure often requires resetting the room."
+        "Without any movement items, Spinjump from on top of the crab to the higher platform towards the left. A failure often requires resetting the room."
       ],
       "devNote": "Although this goes through 7, it requires starting at 2 to get the crab to move into position."
     },
@@ -1079,10 +1091,15 @@
         "comesThroughToilet": "any"
       },
       "requires": [
-        "canTrickyJump",
+        {"or": [
+          "canTrickyJump",
+          "canTrickySpringBallJump",
+          "HiJump"
+        ]},
         "canCrossRoomJumpIntoWater"
       ],
-      "note": "Wall jump relatively high off either side of the door frame in the room below."
+      "note": "Wall jump relatively high off either side of the door frame in the room below.",
+      "devNote": "The walljump is very disconnected from the springball jump, so it is not a springwall."
     },
     {
       "link": [2, 8],
@@ -1194,18 +1211,35 @@
     },
     {
       "link": [2, 11],
-      "name": "Suitless Frozen Crab",
+      "name": "Suitless Frozen Crab with HiJump",
       "requires": [
         "canSuitlessMaridia",
         "HiJump",
-        "canUseFrozenEnemies"
+        "canTrickyUseFrozenEnemies"
       ],
       "note": [
         "In the upward channel one right of the door, jump as high as possible to lure a fast crab moving down the tallest mountain. A crouch jump or breaking spin can be helpful.",
         "Damage down the crab while watching it loop around, then ride the crab up the left side.",
         "Freeze the crab at the top of the highest peak, stand on it to jump to the left.",
         "If you lose the fast crab, it is always possible to get it back by climbing the peak to the right. The crab there can be lured with HiJump alone."
       ],
+      "devNote": "Requires following the crab through 2 to get the crab to move into position."
+    },
+    {
+      "link": [2, 11],
+      "name": "Suitless Frozen Crab with Springball",
+      "requires": [
+        "canSuitlessMaridia",
+        "canTrickySpringBallJump",
+        "canStationaryLateralMidAirMorph",
+        "canTrickyUseFrozenEnemies"
+      ],
+      "note": [
+        "Climb the crabs on the right and use them to bring down the center crab, who is already on the highest peak.",
+        "Damage down the crab while watching it loop around, then ride the crab up the left side.",
+        "Freeze the crab at the top of the highest peak, stand on it to jump to the left.",
+        "Use a Stationary Lateral MidAir Morph to get enough momentum for the SpringBall jump to reach the left ledge."
+      ],
       "devNote": "Although this may go through 7 and 8, it requires starting at 2 to get the crab to move into position."
     },
     {