Merge pull request #1929 from kjbranch/sam-videos-1

Video Site Finds Pt. 1

Author: osse101

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -609,7 +609,11 @@
       ],
       "flashSuitChecked": true,
       "note": "It is possible to roll off of the ledge and avoid the Geemers, but it is somewhat tight and the timing is likely earlier than expected.",
-      "devNote": "An immobile strat only takes one hit on entry, skipping the Geemer hit, which is modeled by going 1->6->5."
+      "devNote": [
+        "An immobile strat only takes one hit on entry, skipping the Geemer hit, which is modeled by going 1->6->5.",
+        "It may often be possible to come in indirect and still have enough i-frames to get through the Geemers, but Samus may be coming from a doorless room like Crateria Tube.",
+        "This is not easy to model and isn't worth doing, because the player will almost certainly have canTrickyJump enabled."
+      ]
     },
     {
       "id": 30,
@@ -648,35 +652,15 @@
           "morphed": true
         }
       },
-      "requires": [
-        "h_ZebesIsAwake",
-        {"or": [
-          "h_canArtificialMorphSpringBall",
-          "h_canArtificialMorphBombThings",
-          "canTrickyJump",
-          {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
-        ]}
-      ],
-      "flashSuitChecked": true,
-      "devNote": "It is possible to roll off of the ledge and avoid the Geemers, but it is somewhat tight and the timing is likely earlier than expected."
-    },
-    {
-      "id": 32,
-      "link": [1, 6],
-      "name": "G-Mode Immobile Morph",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "direct",
-          "morphed": true,
-          "mobility": "immobile"
-        }
-      },
       "requires": [
         "h_ZebesIsAwake",
         "canUseIFrames"
       ],
       "flashSuitChecked": true,
-      "devNote": "The immobile case is included as a separate strat, since the Geemer hit to restore mobility provides i-frames eliminating a need to account for a subsequent Geemer hit (or a way to evade it)."
+      "devNote": [
+        "It is possible to roll off of the ledge go through the Geemers before Samus' i-frames expire.",
+        "Alternatively, it is possible to roll over them, but it is somewhat tight and the timing is likely earlier than expected."
+      ]
     },
     {
       "id": 33,
@@ -689,21 +673,13 @@
         }
       },
       "requires": [
-        {"notable": "G-Mode Flashing Lights"},
-        {"or": [
-          "h_ZebesNotAwake",
-          "h_canArtificialMorphSpringBall",
-          "h_canArtificialMorphBombThings",
-          "canTrickyJump",
-          {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
-        ]}
+        {"notable": "G-Mode Flashing Lights"}
       ],
       "flashSuitChecked": true,
       "note": [
         "The eye scanners are particularly annoying while in G-mode. They scan Samus with bright flashing lights which remain for a further distance.",
         "This is notable so a player can disable having to enter these flashing lights. If disabled, Samus will only require being in g-mode in this room if Zebes is awake."
-      ],
-      "devNote": "Although there would be no enemies and the strat would be free, these options are here as a way to avoid the canRiskPermanentLossOfAccess."
+      ]
     },
     {
       "id": 34,

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -3760,7 +3760,10 @@
         "canOffScreenMovement"
       ],
       "flashSuitChecked": true,
-      "note": "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top."
+      "note": [
+        "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+        "Samus can boost to the left when she is high enough. A visual cue is when she is vertically near the top half of the door on the correct screen."
+      ]
     },
     {
       "id": 165,
@@ -3793,7 +3796,10 @@
         "canOffScreenMovement"
       ],
       "flashSuitChecked": true,
-      "note": "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+      "note": [
+        "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+        "Samus can boost to the right when she is high enough. A visual cue is when she is vertically at the top of the door on the correct screen."
+      ],
       "devNote": "This is only useful if the item is Morph"
     },
     {
@@ -4090,7 +4096,10 @@
         "canOffScreenMovement"
       ],
       "flashSuitChecked": true,
-      "note": "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top."
+      "note": [
+        "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+        "Samus can boost to the left when she is high enough. A visual cue is when she is vertically near the top half of the door on the correct screen."
+      ]
     },
     {
       "id": 183,
@@ -4123,7 +4132,10 @@
         "canOffScreenMovement"
       ],
       "flashSuitChecked": true,
-      "note": "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+      "note": [
+        "Roll through the camera scroll blocks in front of the bomb block, then go through the morph tunnel and IBJ to the top.",
+        "Samus can boost to the right when she is high enough. A visual cue is when she is vertically at the top of the door on the correct screen."
+      ],
       "devNote": "This is only useful if the item is Morph"
     },
     {

region/brinstar/red/Beta Power Bomb Room.json

@@ -387,13 +387,29 @@
         }
       },
       "requires": [
-        "Plasma",
-        "Wave"
+        {"or": [
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]},
+          {"and": [
+            "canInsaneJump",
+            {"or": [
+              "Plasma",
+              {"ammo": {"type": "Super", "count": 6}}
+            ]}
+          ]}
+        ]}
       ],
       "clearsObstacles": ["A"],
+      "note": [
+        "Come in with stored fall speed and get past or kill the Sidehoppers without getting hit.",
+        "It is possible to open the door to back up and quickly kill the hoppers, or to run under them and clip without getting hit."
+      ],
       "devNote": [
         "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
-        "Other weapon combinations are possible, but not reliable due to movement being limited."
+        "FIXME: It is possible to get past the sidehoppers without killing them and moonfall without getting hit.",
+        "This could then allow Samus to kill them safely with Wave, Morph, etc."
       ]
     },
     {
@@ -406,13 +422,28 @@
         }
       },
       "requires": [
-        "Plasma",
-        "Wave"
+        {"or": [
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]},
+          {"and": [
+            "canInsaneJump",
+            {"or": [
+              "Plasma",
+              {"ammo": {"type": "Super", "count": 6}}
+            ]}
+          ]}
+        ]}
       ],
       "clearsObstacles": ["A"],
+      "note": [
+        "Come in with stored fall speed and get past or kill the Sidehoppers without getting hit.",
+        "It is possible to open the door to back up and quickly kill the hoppers, or to run under them and clip without getting hit."
+      ],
       "devNote": [
         "Coming in with blue speed would be an alternative way to get past the hoppers, but this may be tricky to model.",
-        "Other weapon combinations are possible, but not reliable due to movement being limited."
+        "FIXME: It is possible to get past the sidehoppers and moonfall without getting hit."
       ]
     },
     {

region/crateria/central/Landing Site.json

@@ -224,6 +224,7 @@
           "id": 4,
           "devNote": "This link is only for sparking and G-mode. All other strats should go 1 -> 7 -> 5 -> 4."
         },
+        {"id": 5},
         {"id": 7},
         {"id": 8}
       ]
@@ -479,11 +480,11 @@
       },
       "requires": [
         "canMidairShinespark",
-        {"shinespark": {"frames": 154, "excessFrames": 107}}
+        {"shinespark": {"frames": 154, "excessFrames": 37}}
       ],
       "clearsObstacles": ["A"],
       "note": "Shinespark through the top of the door to reach the breakable blocks.",
-      "devNote": "The shinespark may end early dropping Samus into 7, or 5. But speed alone is enough to reach any of 4, 5, and 7."
+      "devNote": "With less Energy, Samus will drop to 5 and can get to 4 if she has SpeedBooster (she may not, i.e. elevator crystal flash)."
     },
     {
       "id": 12,
@@ -507,6 +508,20 @@
         "This only affects the logic in the case where we can't walljump or get over the top in some other way."
       ]
     },
+    {
+      "link": [1, 5],
+      "name": "Shinespark",
+      "entranceCondition": {
+        "comeInWithSpark": {}
+      },
+      "requires": [
+        "canMidairShinespark",
+        {"shinespark": {"frames": 154, "excessFrames": 107}}
+      ],
+      "clearsObstacles": ["A"],
+      "note": "Shinespark through the top of the door to reach the breakable blocks.",
+      "devNote": "With more Energy, Samus will spark to 4, but can freely access 5 from there."
+    },
     {
       "id": 13,
       "link": [1, 7],
@@ -1268,9 +1283,9 @@
     {
       "id": 55,
       "link": [4, 3],
-      "name": "SpeedyJump Into SpringballJump",
+      "name": "Tricky HiJump SpringBall Jump",
       "requires": [
-        "canTrickyDashJump",
+        "SpeedBooster",
         "HiJump",
         "canTrickySpringBallJump"
       ]

region/crateria/central/Parlor and Alcatraz.json

@@ -1258,7 +1258,7 @@
     {
       "id": 43,
       "link": [4, 2],
-      "name": "G-Mode Morph into Save (from Landing Site)",
+      "name": "G-Mode Morph into Save (from Top Right Door)",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -1319,7 +1319,7 @@
     {
       "id": 47,
       "link": [4, 5],
-      "name": "G-Mode Morph into Alcatraz (from Landing Site)",
+      "name": "G-Mode Morph into Alcatraz (from Top Right Door)",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",

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

@@ -384,7 +384,7 @@
     {
       "id": 14,
       "link": [1, 2],
-      "name": "G-Mode",
+      "name": "G-Mode With Assist",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -396,15 +396,33 @@
         {"or": [
           "Gravity",
           "HiJump",
-          "canSpringBallJumpMidAir",
-          "canInsaneJump"
+          "canSpringBallJumpMidAir"
         ]}
       ],
       "flashSuitChecked": true,
+      "note": "The sand does not impede Samus in G-Mode."
+    },
+    {
+      "link": [1, 2],
+      "name": "G-Mode Itemless",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        "canSuitlessMaridia",
+        "canInsaneJump"
+      ],
+      "flashSuitChecked": true,
       "note": [
         "The sand does not impede Samus in G-Mode.",
-        "It is possible to jump to the tall pillar with nothing, requiring a subpixel precise jump.",
-        "Running before jumping doesn't help. Stand one pixel from the right edge and spinjump to the right."
+        "Carefully jump over the first two Evirs. Crouch against the pillar and wait a brief moment before jumping and down grabbing onto it.",
+        "Lure the third Evir's projectile by jumping then crouch jump and down grab the second pillar.",
+        "Getting onto the final pillar is the hardest pard, which requires a subpixel precise jump.",
+        "Carefully lure the Evir projectile while getting into position, one pixel from the right edge.",
+        "Stand and spinjump to the right. Note that running before jumping doesn't help."
       ]
     },
     {

region/maridia/inner-pink/Aqueduct.json

@@ -2728,13 +2728,19 @@
     {
       "id": 125,
       "link": [9, 5],
-      "name": "Stationary Lateral Midair Spring Ball",
+      "name": "Tricky Spring Ball Jump",
       "requires": [
         "canSuitlessMaridia",
-        "canStationaryLateralMidAirMorph",
         "canTrickySpringBallJump",
-        "canResetFallSpeed"
-      ]
+        {"or": [
+          "canSpringFling",
+          {"and": [
+            "canStationaryLateralMidAirMorph",
+            "canResetFallSpeed"
+          ]}
+        ]}
+      ],
+      "note": "Requires either a spring fling or a stationary lateral midair morph with an unmorph to reset fall speed."
     },
     {
       "id": 126,

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

@@ -428,6 +428,29 @@
       "flashSuitChecked": true,
       "note": "After landing on the sand, get a good jump off of it then spark diagonally up all the way out of the water."
     },
+    {
+      "link": [1, 4],
+      "name": "G-Mode Through Crumbles",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "canSuitlessMaridia",
+        "HiJump",
+        "canTrickyJump",
+        "canConsecutiveWalljump",
+        "canWallJumpInstantMorph"
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Wall jump up the middle column and Morph into the hole to get to the item.",
+        "This is easier in G-Mode because the crumbles above the tunnel will be air."
+      ]
+    },
     {
       "id": 21,
       "link": [1, 4],

region/maridia/inner-pink/The Precious Room.json

@@ -510,7 +510,8 @@
         "canMidairWiggle",
         "canTrickyDashJump",
         "canCrossRoomJumpIntoWater"
-      ]
+      ],
+      "note": "Turn around and break spin to move vertically while near the height of the floating platform."
     },
     {
       "id": 33,