Merge pull request #1988 from kjbranch/sam-videos

Some more quick finds from Sam's videos

Author: osse101

region/crateria/central/Crateria Super Room.json

@@ -310,11 +310,17 @@
           "h_canArtificialMorphLongCeilingBombJump",
           {"and": [
             "h_canArtificialMorphSpringBall",
-            {"spikeHits": 3},
-            {"or": [
-              "h_canArtificialMorphBombHorizontally",
-              {"spikeHits": 1}
-            ]}
+            {"spikeHits": 4}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            "h_canArtificialMorphBombHorizontally",
+            {"spikeHits": 3}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringFling",
+            "canTrickyJump",
+            {"spikeHits": 2}
           ]},
           {"and": [
             "h_canArtificialMorphIBJ",
@@ -327,6 +333,11 @@
         ]}
       ],
       "flashSuitChecked": true,
+      "note": [
+        "It is possible to cross the spike pit with spring flings and two spike hits.",
+        "Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
+        "Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
+      ],
       "devNote": [
         "This is a softlock unless the item is Morph.",
         "The IBJ strat has 2 extra spike hits added as a leniency."
@@ -501,11 +512,17 @@
         {"or": [
           {"and": [
             "h_canArtificialMorphSpringBall",
-            {"spikeHits": 3},
-            {"or": [
-              "h_canArtificialMorphBombHorizontally",
-              {"spikeHits": 1}
-            ]}
+            {"spikeHits": 4}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            "h_canArtificialMorphBombHorizontally",
+            {"spikeHits": 3}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringFling",
+            "canTrickyJump",
+            {"spikeHits": 2}
           ]},
           {"and": [
             "Morph",
@@ -532,6 +549,11 @@
         ]}
       ],
       "flashSuitChecked": true,
+      "note": [
+        "It is possible to cross the spike pit with spring flings and two spike hits.",
+        "Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
+        "Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
+      ],
       "devNote": "The IBJ from spikes has 2 extra spike hits added as a leniency."
     },
     {
@@ -584,11 +606,17 @@
         {"or": [
           {"and": [
             "h_canArtificialMorphSpringBall",
-            {"spikeHits": 3},
-            {"or": [
-              "h_canArtificialMorphBombHorizontally",
-              {"spikeHits": 1}
-            ]}
+            {"spikeHits": 4}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            "h_canArtificialMorphBombHorizontally",
+            {"spikeHits": 3}
+          ]},
+          {"and": [
+            "h_canArtificialMorphSpringFling",
+            "canTrickyJump",
+            {"spikeHits": 2}
           ]},
           {"and": [
             "Morph",
@@ -606,7 +634,12 @@
         ]}
       ],
       "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.",
+      "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.",
+        "It is possible to cross the spike pit with spring flings and two spike hits.",
+        "Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.",
+        "Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another."
+      ],
       "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."
       ]

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

@@ -888,7 +888,8 @@
         "Perform multiple stationary lateral mid-air morphs, while avoiding the Evir projectiles, to cross the room.",
         "It is necessary to start the jumps from the far side of the platforms in order to gain more horizontal momentum before entering the sand falls.",
         "Falling into the sand will often result in a soft lock."
-      ]
+      ],
+      "detailNote": "It is possible to use a very precise spring fling instead of a stationary lateral mid-air morph, but it is harder."
     },
     {
       "id": 46,

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

@@ -512,6 +512,16 @@
         "Spark up while on the right side of the platform. To avoid the Owtch on the platform, it may help to jump on the left side of the platform then jump again and spark midair above the right side."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Gravity Jump, Precise Crouch Jump Down Grab",
+      "requires": [
+        "canGravityJump",
+        "h_canCrouchJumpDownGrab",
+        "canInsaneJump"
+      ],
+      "note": "Gravity jump out of the water then perform a precise crouch jump + down grab to get onto the next ledge."
+    },
     {
       "id": 68,
       "link": [2, 1],
@@ -566,7 +576,11 @@
           ]},
           {"and": [
             "h_canArtificialMorphDoubleSpringBallJump",
-            "h_canCrouchJumpDownGrab"
+            "canDownGrab"
+          ]},
+          {"and": [
+            "canGravityJump",
+            "h_canArtificialMorphSpringBallBombJump"
           ]}
         ]}
       ],
@@ -817,6 +831,12 @@
             "Gravity",
             "h_canArtificialMorphIBJ",
             "h_canArtificialMorphBombHorizontally"
+          ]},
+          {"and": [
+            "canGravityJump",
+            "h_canArtificialMorphSpringBallBombJump",
+            "h_additionalBomb",
+            "h_additionalBomb"
           ]}
         ]}
       ],
@@ -1694,9 +1714,18 @@
         }
       },
       "requires": [
-        "h_canArtificialMorphLongIBJ"
+        {"or": [
+          "h_canArtificialMorphLongIBJ",
+          {"and": [
+            "HiJump",
+            "h_canArtificialMorphSpringBallBombJump",
+            {"tech": "canBombHorizontally"},
+            "canTrickyJump"
+          ]}
+        ]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": "IBJ from below or bomb horizontally, then use Spring Ball with HiJump to jump around the overhang while avoiding the upper Choot."
     },
     {
       "id": 63,

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

@@ -376,14 +376,21 @@
         }
       },
       "requires": [
-        "Gravity",
         {"or": [
-          "h_canArtificialMorphIBJ",
-          "h_canArtificialMorphSpringBallBombJump"
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphIBJ"
+          ]},
+          {"and": [
+            "Gravity",
+            "h_canArtificialMorphSpringBallBombJump"
+          ]},
+          "h_canArtificialMorphDoubleSpringBallJump"
         ]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
+      "note": "Avoid moving too much between the right of the Owtch and the item to avoid overloading PLMs until after touching the item.",
       "devNote": [
         "This link doesn't accomplish anything, other than enabling Samus to return with Artificial Morph.",
         "Samus does not obtain the item until returning and exiting G-Mode, so all the requirements must be here."

region/norfair/east/Acid Snakes Tunnel.json

@@ -872,7 +872,10 @@
         "h_heatProof",
         "canUpwardGModeSetup",
         "canTrickyUseFrozenEnemies",
-        "Morph"
+        {"or": [
+          "Morph",
+          "canInsaneJump"
+        ]}
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
@@ -882,10 +885,7 @@
         "Freeze the stack of Gammets together a few times to try and raise them as high as possible.",
         "Run with them to the door and freeze the top two such that Samus can stand on the lower and take damage from the higher Gammet when it unfreezes."
       ],
-      "devNote": [
-        "Landing on the Gammet with an aim down, or spin, wasn't working.  So require Morph.",
-        "Would be notable but its a GMode strat."
-      ]
+      "detailNote": "It is possible to jump onto the Gamet without Morph, as long as it is not too high."
     },
     {
       "id": 30,