Merge pull request #1899 from kjbranch/suitless-maridia

Another Pass Through canSuitlessMaridia

Author: kjbranch

region/maridia/inner-green/Pants Room.json

@@ -650,11 +650,12 @@
       "name": "Avoid Sand",
       "requires": [
         "canSuitlessMaridia",
+        "canTrickyJump",
         {"or": [
           {"and": [
             "canFlatleyJump",
             {"or": [
-              "canTrickyJump",
+              "canInsaneJump",
               "canDownBack"
             ]}
           ]},
@@ -682,7 +683,8 @@
           "h_pauseAbuseMinimalReserveRefill"
         ]}
       ],
-      "note": "The swarm of Menus will attack Samus at the top of the room. Tank them or kill them with Screw or Pseudo Screw."
+      "note": "The swarm of Menus will attack Samus at the top of the room. Tank them or kill them with Screw or Pseudo Screw.",
+      "devNote": "FIXME: 5->2 strats could be added, including x-ray climb and g-mode."
     },
     {
       "id": 32,

region/maridia/inner-pink/Aqueduct.json

@@ -221,16 +221,12 @@
     {
       "from": 3,
       "to": [
-        {"id": 2},
-        {"id": 3},
-        {"id": 4}
+        {"id": 3}
       ]
     },
     {
       "from": 4,
       "to": [
-        {"id": 2},
-        {"id": 3},
         {"id": 4}
       ]
     },
@@ -949,7 +945,7 @@
         "Gravity",
         {"or": [
           "SpaceJump",
-          "canPlayInSand",
+          "canCarefulJump",
           "h_getBlueSpeedMaxRunway",
           "h_canUseSpringBall"
         ]}
@@ -993,6 +989,27 @@
       ],
       "devNote": "This is obscure enough that it's assumed you can canShinechargeMovementComplex"
     },
+    {
+      "id": 60,
+      "link": [2, 3],
+      "name": "Leave Shinecharged",
+      "requires": [
+        "Gravity",
+        {"canShineCharge": {"usedTiles": 32, "openEnd": 0}},
+        {"shineChargeFrames": 30}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "It is possible to run across the sand, using blue speed gained from the long runway on the bottom-right."
+      ],
+      "devNote": [
+        "FIXME: split into separate variants for with and without a momentum-conserving turnaround, since it affects Samus' state in the next room,",
+        "e.g. whether it will be possible to spark mid-air without landing first."
+      ]
+    },
     {
       "id": 34,
       "link": [2, 4],
@@ -1408,32 +1425,6 @@
       "flashSuitChecked": true,
       "note": "Overload PLMs using the Grapple Blocks."
     },
-    {
-      "id": 56,
-      "link": [3, 2],
-      "name": "Gravity",
-      "requires": [
-        "Gravity",
-        {"or": [
-          "SpaceJump",
-          "canPlayInSand",
-          "h_canUseSpringBall"
-        ]}
-      ]
-    },
-    {
-      "id": 57,
-      "link": [3, 2],
-      "name": "Suitless",
-      "requires": [
-        "canSuitlessMaridia",
-        "HiJump",
-        {"or": [
-          "h_canUseSpringBall",
-          "canPlayInSand"
-        ]}
-      ]
-    },
     {
       "id": 58,
       "link": [3, 3],
@@ -1443,35 +1434,6 @@
         "leaveNormally": {}
       }
     },
-    {
-      "id": 59,
-      "link": [3, 4],
-      "name": "Base",
-      "requires": [
-        "h_canNavigateUnderwater"
-      ]
-    },
-    {
-      "id": 60,
-      "link": [4, 3],
-      "name": "Leave Shinecharged",
-      "requires": [
-        "Gravity",
-        {"canShineCharge": {"usedTiles": 32, "openEnd": 0}},
-        {"shineChargeFrames": 30}
-      ],
-      "exitCondition": {
-        "leaveShinecharged": {}
-      },
-      "flashSuitChecked": true,
-      "note": [
-        "It is possible to run across the sand, using blue speed gained from the long runway on the bottom-right."
-      ],
-      "devNote": [
-        "FIXME: split into separate variants for with and without a momentum-conserving turnaround, since it affects Samus' state in the next room,",
-        "e.g. whether it will be possible to spark mid-air without landing first."
-      ]
-    },
     {
       "id": 61,
       "link": [4, 4],
@@ -2697,6 +2659,7 @@
       "link": [9, 5],
       "name": "Grapple",
       "requires": [
+        "h_canNavigateUnderwater",
         "Grapple"
       ]
     },
@@ -2762,6 +2725,7 @@
       "link": [9, 6],
       "name": "Top Door Snailstep",
       "requires": [
+        "canSuitlessMaridia",
         "canUseEnemies"
       ],
       "note": "Involves waiting around for a snail to come along, in order to reach the door by jumping while standing on it."
@@ -2771,6 +2735,7 @@
       "link": [9, 6],
       "name": "Top Door Crouch Jump",
       "requires": [
+        "canSuitlessMaridia",
         "canCrouchJump",
         {"or": [
           "canTrickyJump",

region/maridia/inner-pink/Botwoon Energy Tank Room.json

@@ -410,7 +410,17 @@
       "id": 14,
       "link": [1, 2],
       "name": "Base",
-      "requires": []
+      "requires": [
+        {"or": [
+          "h_canNavigateUnderwater",
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}},
+          {"enemyKill": {
+            "enemies": [["Puyo"], ["Puyo", "Puyo"], ["Puyo"]],
+            "explicitWeapons": ["Missile", "Super", "PowerBomb", "Wave", "Spazer", "Plasma"]
+          }},
+          "canUseGrapple"
+        ]}
+      ]
     },
     {
       "id": 15,

region/maridia/inner-pink/Crab Shaft.json

@@ -1238,6 +1238,7 @@
       "link": [4, 3],
       "name": "Crouch Jump",
       "requires": [
+        "canSuitlessMaridia",
         {"or": [
           "canCrouchJump",
           "h_UnderwaterCrouchJumpWithFlashSuit"

region/maridia/inner-pink/East Sand Hole.json

@@ -98,7 +98,8 @@
     {
       "from": 4,
       "to": [
-        {"id": 1}
+        {"id": 1},
+        {"id": 2}
       ]
     },
     {
@@ -551,9 +552,29 @@
       "requires": []
     },
     {
-      "id": 24,
       "link": [4, 1],
       "name": "Base",
+      "requires": [
+        "Morph",
+        {"or": [
+          "Gravity",
+          {"and": [
+            "canSuitlessMaridia",
+            "HiJump",
+            "h_canUseSpringBall"
+          ]},
+          {"and": [
+            "canSuitlessMaridia",
+            "HiJump",
+            "canPlayInSand"
+          ]}
+        ]}
+      ]
+    },
+    {
+      "id": 24,
+      "link": [4, 2],
+      "name": "Base",
       "requires": [
         "Morph"
       ],

region/maridia/inner-yellow/Pseudo Plasma Spark Room.json

@@ -725,7 +725,13 @@
       "id": 31,
       "link": [2, 3],
       "name": "Base",
-      "requires": [],
+      "requires": [
+        {"or": [
+          "h_canNavigateUnderwater",
+          "Plasma",
+          {"ammo": {"type": "Super", "count": 1}}
+        ]}
+      ],
       "note": "Wait for the fish to swim left where they can safely be killed."
     },
     {
@@ -1385,7 +1391,7 @@
         {"or": [
           "Gravity",
           "HiJump",
-          "canSpringBallJumpMidAir"
+          "canTrickySpringBallJump"
         ]}
       ]
     },

region/maridia/outer/Main Street.json

@@ -2867,7 +2867,6 @@
       "link": [4, 4],
       "name": "Sciser Farm",
       "requires": [
-        "h_canNavigateUnderwater",
         {"resetRoom": {
           "nodes": [4]
         }},
@@ -3228,6 +3227,7 @@
       "link": [7, 5],
       "name": "G-Mode Morph Return",
       "requires": [
+        "canEnterGMode",
         {"obstaclesCleared": ["B"]},
         {"or": [
           "h_canArtificialMorphSpringBall",
@@ -3428,7 +3428,6 @@
       "link": [8, 8],
       "name": "Sciser Farm",
       "requires": [
-        "h_canNavigateUnderwater",
         {"resetRoom": {
           "nodes": [1, 2]
         }},

region/maridia/outer/Mt. Everest.json

@@ -1094,7 +1094,13 @@
       "link": [2, 2],
       "name": "Sciser Farm",
       "requires": [
-        "h_canNavigateUnderwater",
+        {"or": [
+          "h_canNavigateUnderwater",
+          "Ice",
+          "Wave",
+          "Spazer",
+          "Plasma"
+        ]},
         {"resetRoom": {
           "nodes": [2]
         }},
@@ -1622,6 +1628,7 @@
       "requires": [
         "Gravity",
         "h_canShineChargeMaxRunway",
+        "canShinechargeMovement",
         {"shinespark": {"frames": 61}}
       ],
       "note": "Shinespark up in the middle of the three upward pathways near either the right or left wall."
@@ -2201,7 +2208,6 @@
       },
       "requires": [
         {"shineChargeFrames": 5},
-        "canSuitlessMaridia",
         {"shinespark": {"frames": 62, "excessFrames": 6}}
       ],
       "flashSuitChecked": true,
@@ -4166,6 +4172,7 @@
       "requires": [
         "Gravity",
         "h_canShineChargeMaxRunway",
+        "canShinechargeMovement",
         {"shinespark": {"frames": 61}}
       ],
       "exitCondition": {