A couple more rooms

Author: kjbranch

region/crateria/central/Crateria Super Room.json

@@ -548,7 +548,7 @@
         "Morph",
         "Grapple",
         {"or": [
-          "canCarefulJump",
+          "canTrickyJump",
           {"spikeHits": 1}
         ]},
         {"or": [
@@ -564,12 +564,12 @@
       ],
       "flashSuitChecked": true,
       "note": "Quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes.",
-      "devNote": "FIXME: Grapple will quickly overload PLMS.  It is barely possible to cross the gap using short grapples, canResetFallSpeed, and ending with a swing."
+      "devNote": "FIXME: Grapple will quickly overload PLMS. It is barely possible to cross the gap using short grapples, canResetFallSpeed, and ending with a swing."
     },
     {
       "id": 16,
       "link": [1, 5],
-      "name": "G-Mode Morph Overload PLMs by PBing Super Item",
+      "name": "G-Mode Morph Overload PLMs by Power Bombing Item",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -606,9 +606,62 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future.",
-      "devNote": [
-        "FIXME Add strat for going down without PBs, by using the uncollected item to overload PLMs. This can only be done once, as it forces item pickup."
+      "note": "Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future."
+    },
+    {
+      "link": [1, 5],
+      "name": "G-Mode Morph Overload PLMs Collect the Item",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            {"itemNotCollectedAtNode": 3},
+            "canRiskPermanentLossOfAccess"
+          ]},
+          {"and": [
+            "Morph",
+            "Grapple",
+            {"or": [
+              "canTrickyJump",
+              {"spikeHits": 1}
+            ]}
+          ]}
+        ]},
+        {"or": [
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            {"spikeHits": 3},
+            {"or": [
+              "h_canArtificialMorphBombHorizontally",
+              {"spikeHits": 1}
+            ]}
+          ]},
+          {"and": [
+            "Morph",
+            {"or": [
+              "SpaceJump",
+              {"and": [
+                {"spikeHits": 1},
+                {"or": [
+                  "canUseIFrames",
+                  {"spikeHits": 1}
+                ]}
+              ]}
+            ]}
+          ]}
+        ]}
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": [
+        "Roll through the item to overload PLMs, then go down through the speed blocks and exit G-mode to collect the item.",
+        "Note that if the item has already been collected, Samus can overload PLMs with Grapple.",
+        "Quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes."
       ]
     },
     {
@@ -1158,7 +1211,10 @@
       ],
       "flashSuitChecked": true,
       "note": "Wall jump up 9 times, placing a PB at the top. Only works in direct g-mode with the item still uncollected.",
-      "devNote": "FIXME: Using this strat won't risk canRiskPermanentLossOfAccess if the player could x-ray climb instead. However if the adjacent room is heated and Samus is really low energy, this could be a problem."
+      "devNote": [
+        "FIXME: Using this strat won't risk canRiskPermanentLossOfAccess if the player could x-ray climb instead. However if the adjacent room is heated and Samus is really low energy, this could be a problem.",
+        "Placing the Power Bombs lower, on the magic tile, could overload PLMs with fewer, likely with as low as 2 Power Bombs."
+      ]
     },
     {
       "id": 42,
@@ -1172,7 +1228,7 @@
       },
       "requires": [
         {"notable": "G-Mode Morph Long Ceiling Bomb Jump"},
-        "canLongIBJ",
+        "h_canArtificialMorphLongIBJ",
         "h_canArtificialMorphCeilingBombJump",
         "canBeVeryPatient"
       ],

region/crateria/central/Landing Site.json

@@ -503,10 +503,7 @@
         "Then pass through the bomb blocks (which will have become air).",
         "If needed, continue on through the next set of bomb blocks (which will also be air) to reach the bottom right door."
       ],
-      "devNote": [
-        "FIXME: add something to indicate we can refill at the Ship on the way (e.g. if we add a logical requirement type for this).",
-        "This only affects the logic in the case where we can't walljump or get over the top in some other way."
-      ]
+      "devNote": "FIXME: It is possible to refill at the Ship on the way."
     },
     {
       "id": 89,
@@ -610,15 +607,12 @@
         }
       },
       "requires": [
-        "h_canArtificialMorphBombs"
+        "h_canArtificialMorphMovement"
       ],
       "flashSuitChecked": true,
       "note": [
         "Overload the scroll PLMs which are one tile to the left of the bomb blocks leading to Gauntlet.",
         "Then pass through the bomb blocks (which will have become air)."
-      ],
-      "devNote": [
-        "Other items (SpringBall or Power Bombs) could be used to get through but these cases are not relevant, as Bombs are needed to do anything useful with G-Mode Morph after this point."
       ]
     },
     {
@@ -1394,6 +1388,22 @@
         "Without, the runway is not as long, but it's much longer than it takes to get max run speed."
       ]
     },
+    {
+      "link": [4, 4],
+      "name": "G-Mode Morph, Power Bomb the Blocks",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_canArtificialMorphPowerBomb"
+      ],
+      "clearsObstacles": ["B"],
+      "flashSuitChecked": true,
+      "note": "Power Bomb the blocks then exit G-mode for them to break."
+    },
     {
       "id": 62,
       "link": [4, 5],