Merge pull request #2099 from kjbranch/small-misc

Small misc changes

Author: osse101

region/brinstar/red/Caterpillar Room.json

@@ -1200,7 +1200,10 @@
         }
       },
       "requires": [
-        "h_artificialMorphIBJ"
+        {"or": [
+          "h_artificialMorphIBJ",
+          "h_artificialMorphSpringBallBombJump"
+        ]}
       ],
       "flashSuitChecked": true
     },
@@ -1244,7 +1247,17 @@
         }
       },
       "requires": [
-        "h_artificialMorphIBJ"
+        {"or": [
+          "h_artificialMorphIBJ",
+          {"and": [
+            "h_artificialMorphSpringBallBombJump",
+            "h_additionalBomb"
+          ]},
+          {"and": [
+            "h_artificialMorphSpringBallBombJump",
+            "h_crouchJumpDownGrab"
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithGMode": {

region/crateria/east/East Ocean.json

@@ -370,6 +370,10 @@
       "name": "Speedy Springball Jump and SpaceJump",
       "requires": [
         "canTrickyJump",
+        {"or": [
+          {"disableEquipment": "SpeedBooster"},
+          "canTrickyDashJump"
+        ]},
         "SpeedBooster",
         "canSpringBallBounce",
         "canMockball",
@@ -440,7 +444,8 @@
         {"or": [
           {"and": [
             "canMidairShinespark",
-            "canDodgeWhileShooting"
+            "canShinechargeMovementTricky",
+            "canTrickyDodgeEnemies"
           ]},
           {"and": [
             {"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 1}},
@@ -460,7 +465,7 @@
           ]}
         ]},
         "canHorizontalShinespark",
-        {"shinespark": {"frames": 123, "excessFrames": 5}},
+        {"shinespark": {"frames": 125, "excessFrames": 5}},
         "canSpaceJumpWaterBounce",
         {"or": [
           {"and": [

region/maridia/inner-green/Oasis.json

@@ -2182,6 +2182,20 @@
       ],
       "clearsObstacles": ["A"]
     },
+    {
+      "link": [3, 5],
+      "name": "G-Mode Overload PLMs, Through the Bomb Blocks",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [],
+      "flashSuitChecked": true,
+      "note": "There are camera scroll blocks, which can be used to overload PLMs, just above the bomb blocks."
+    },
     {
       "id": 52,
       "link": [3, 5],

region/maridia/inner-pink/Aqueduct.json

@@ -3026,13 +3026,23 @@
       "link": [9, 1],
       "name": "G-Mode Setup - Get Hit By Yard, from Above",
       "requires": [
-        "h_destroyBombWalls"
+        {"or": [
+          "h_useMorphBombs",
+          {"and": [
+            "Gravity",
+            "ScrewAttack"
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": [
+        "It is probably possible to use a Power Bomb while the snail is far enough away and have it get here before the block respawns,",
+        "but it would make more sense to come through the Power Bomb blocks from below."
+      ]
     },
     {
       "id": 121,

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -318,7 +318,8 @@
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "Slowly kill the Puyos with Bombs or us a Power Bomb. Stand under the gate when exiting G-Mode to open the gate."
+      "note": "Slowly kill the Puyos with Bombs or use a Power Bomb. Stand under the gate when exiting G-Mode to open the gate.",
+      "devNote": "This is only to avoid a Gravity jump."
     },
     {
       "id": 9,

region/norfair/crocomire/Post Crocomire Farming Room.json

@@ -608,7 +608,10 @@
         "canHorizontalDamageBoost",
         {"enemyDamage": {"enemy": "Gamet", "type": "contact", "hits": 1}}
       ],
-      "note": "Use the moving platform (Kamer) to elevate the Gamets."
+      "note": [
+        "Use the moving platform (Kamer) to elevate the Gamets, then damage boost off of them to get to the top left.",
+        "Alternatively, it is possible to wall jump off of the right overhang and damage boost from the ceiling Ripper, but it is likely more difficult."
+      ]
     },
     {
       "id": 60,

region/norfair/west/Ice Beam Gate Room.json

@@ -1112,7 +1112,7 @@
       "flashSuitChecked": true,
       "note": [
         "Place Bombs against the crumble block to overload PLMs, then go through it and through the bomb blocks at the left.",
-        "Place a Power Bomb and quuickly exit G-Mode before it goes off in order to break the blocks."
+        "Place a Power Bomb and quickly exit G-Mode before it goes off in order to break the blocks."
       ]
     },
     {

region/tourian/main/Tourian Escape Room 3.json

@@ -278,7 +278,7 @@
       ],
       "clearsObstacles": ["A"],
       "note": [
-        "Run from or Roll under the pirate lasers.",
+        "Safely kill the first pirate, then run from or roll under the remaining pirate lasers.",
         "The Pirates will also not shoot if they come on screen while Samus is crouched."
       ],
       "devNote": "These requirements are to kill all of the pirates, but another strat is needed to cross the room to get to the top half."
@@ -351,8 +351,8 @@
       ],
       "clearsObstacles": ["A"],
       "note": [
-        "Run into the pirates with speedbooster to save health over shinesparking.",
-        "A speedy jump can reach the top platform."
+        "Safely kill the first pirate, then run into the rest with blue speed.",
+        "A speedy jump can reach the top platform to save Energy over shinesparking."
       ]
     },
     {

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -672,7 +672,7 @@
     {
       "id": 20,
       "link": [2, 8],
-      "name": "G-mode Morph to Missiles While Blind",
+      "name": "G-mode Morph to Item While Blind",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",