Merge pull request #1683 from kjbranch/video-finds

Misc Fixes

Author: osse101

region/brinstar/green/Brinstar Reserve Tank Room.json

@@ -332,6 +332,18 @@
       "collectsItems": [3],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 4],
+      "name": "Screw X-Ray Standup",
+      "requires": [
+        "Morph",
+        "canXRayStandUp",
+        "ScrewAttack"
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": "Use Screw Attack to break the first block, roll in against the second block, X-Ray standup, then spin jump right to break the second block."
+    },
     {
       "id": 16,
       "link": [3, 4],

region/crateria/central/Landing Site.json

@@ -1511,10 +1511,21 @@
       "requires": [
         "h_canShineChargeMaxRunway",
         {"or": [
-          {"shinespark": {"frames": 78, "excessFrames": 13}},
+          {"shinespark": {"frames": 78, "excessFrames": 11}},
           {"and": [
             "canShinechargeMovement",
-            {"shinespark": {"frames": 65, "excessFrames": 13}}
+            {"shinespark": {"frames": 73, "excessFrames": 15}}
+          ]},
+          {"and": [
+            "canShinechargeMovement",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 65, "excessFrames": 15}}
+          ]},
+          {"and": [
+            "canShinechargeMovement",
+            "canMidairShinespark",
+            "HiJump",
+            {"shinespark": {"frames": 61, "excessFrames": 14}}
           ]}
         ]}
       ]

region/crateria/east/West Ocean.json

@@ -2801,8 +2801,9 @@
     {
       "id": 135,
       "link": [17, 16],
-      "name": "West Ocean G-mode Overload PLMs by PBing Missile Item Softlock Risk",
+      "name": "G-mode Overload PLMs by PBing Missile Item Softlock Risk",
       "requires": [
+        {"notable": "G-mode Overload PLMs by PBing Missile Item"},
         "canEnterGMode",
         {"itemNotCollectedAtNode": 10},
         "canRiskPermanentLossOfAccess",

region/crateria/west/Gauntlet Energy Tank Room.json

@@ -442,6 +442,7 @@
       "link": [1, 3],
       "name": "Blue Suit",
       "requires": [
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]},
         "Morph",
         {"or": [
@@ -922,6 +923,7 @@
       "link": [3, 1],
       "name": "Blue Suit",
       "requires": [
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]},
         "Morph",
         {"or": [
@@ -943,6 +945,7 @@
       "link": [3, 2],
       "name": "Leave Shinecharged, Blue Suit",
       "requires": [
+        {"notable": "R-Mode Blue Suit"},
         {"obstaclesCleared": ["D"]}
       ],
       "exitCondition": {

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -461,7 +461,11 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "Bomb diagonally to get over the Fune.  Or land on a fireball to boost up."
+      "note": [
+        "Place a bomb just a bit left of the Fune and have it boost Samus horizontally to get over the Fune.",
+        "The bomb can be placed at a similar time to when the Fune shoots a fireball.",
+        "Alternatively, it is possible to land on a fireball to be boosted up."
+      ]
     },
     {
       "id": 18,

region/lowernorfair/west/Screw Attack Room.json

@@ -612,6 +612,47 @@
           "speedBooster": true
         }
       },
+      "requires": [
+        {"notable": "Transition Screwjump"},
+        "h_canNavigateHeatRooms",
+        "ScrewAttack",
+        "HiJump",
+        "canWalljump",
+        {"heatFrames": 150}
+      ],
+      "clearsObstacles": ["A"],
+      "note": "Run through the doorway with enough momentum to break the bomb blocks with Screw."
+    },
+    {
+      "link": [2, 3],
+      "name": "Transition Screwjump (Tricky Jump)",
+      "entranceCondition": {
+        "comeInRunning": {
+          "minTiles": 5.4375,
+          "speedBooster": true
+        }
+      },
+      "requires": [
+        {"notable": "Transition Screwjump"},
+        "h_canNavigateHeatRooms",
+        "ScrewAttack",
+        "HiJump",
+        "canTrickyJump",
+        "canWalljump",
+        {"heatFrames": 150}
+      ],
+      "clearsObstacles": ["A"],
+      "note": "Run through the doorway with enough momentum to break the bomb blocks with Screw."
+    },
+    {
+      "link": [2, 3],
+      "name": "Transition Screwjump (No Walljump)",
+      "entranceCondition": {
+        "comeInRunning": {
+          "minTiles": 7,
+          "speedBooster": true
+        }
+      },
       "requires": [
         {"notable": "Transition Screwjump"},
         "h_canNavigateHeatRooms",
@@ -638,6 +679,7 @@
         "ScrewAttack",
         "HiJump",
         "canTrickyDashJump",
+        "canWalljump",
         {"heatFrames": 150}
       ],
       "clearsObstacles": ["A"],

region/maridia/inner-pink/Botwoon's Room.json

@@ -258,6 +258,18 @@
         "The left corner can be used to avoid most attacks and may be worth using even in the opening of the fight for safety."
       ]
     },
+    {
+      "link": [1, 1],
+      "name": "Botwoon Microwave",
+      "requires": [
+        "h_canNavigateUnderwater",
+        "Charge",
+        "Plasma",
+        "canXRayWaitForIFrames"
+      ],
+      "setsFlags": ["f_DefeatedBotwoon"],
+      "flashSuitChecked": true
+    },
     {
       "id": 23,
       "link": [1, 2],
@@ -516,6 +528,23 @@
         "Botwoon still gets hit. So there's a safe way to take no damage."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "Back-Side Microwave",
+      "requires": [
+        {"notable": "Back-Side Fight with Charge and Wave"},
+        "h_canNavigateUnderwater",
+        "Charge",
+        "Plasma",
+        "Wave",
+        "canXRayWaitForIFrames"
+      ],
+      "setsFlags": ["f_DefeatedBotwoon"],
+      "flashSuitChecked": true,
+      "note": [
+        "Shoot through the wall and use the microwave trick to defeat Botwoon."
+      ]
+    },
     {
       "id": 32,
       "link": [2, 2],

region/maridia/inner-yellow/Northwest Maridia Bug Room.json

@@ -517,26 +517,97 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 1],
+      "name": "Space Jump",
+      "requires": [
+        "SpaceJump",
+        {"or": [
+          "h_canUsePowerBombs",
+          "ScrewAttack",
+          "Plasma",
+          {"and": [
+            "Ice",
+            "Wave",
+            "Spazer"
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"enemyDamage": {
+              "enemy": "Menu",
+              "type": "contact",
+              "hits": 1
+            }}
+          ]},
+          {"enemyDamage": {
+            "enemy": "Menu",
+            "type": "contact",
+            "hits": 4
+          }}
+        ]}
+      ],
+      "note": "Kill the Menus and Space Jump up.",
+      "devNote": "With Space Jump alone with low tech, tanking the damage is not likely going to work."
+    },
     {
       "id": 23,
       "link": [3, 1],
-      "name": "Base",
+      "name": "HiJump",
       "requires": [
+        "HiJump",
         {"or": [
+          "h_canUsePowerBombs",
+          "ScrewAttack",
+          "Plasma",
           {"and": [
-            "HiJump",
-            {"or": [
-              "canCrouchJump",
-              "canDownGrab",
-              "canWalljump",
-              "SpeedBooster"
-            ]}
+            "Ice",
+            "Wave",
+            "Spazer"
           ]},
+          {"enemyDamage": {
+            "enemy": "Menu",
+            "type": "contact",
+            "hits": 2
+          }}
+        ]},
+        {"or": [
+          "canCarefulJump",
+          "canCrouchJump",
+          "canDownGrab",
+          "canWalljump"
+        ]}
+      ],
+      "note": [
+        "Kill or tank the Menus or spin jump directly from the safety to the right up to the ledge.",
+        "With a spin jump, Samus can make it to the ledge without a wall jump or other means."
+      ],
+      "devNote": "The safe direct jump is not expected here and is included in another srat, but it is still worth mentioning here."
+    },
+    {
+      "link": [3, 1],
+      "name": "Speedy Jump",
+      "requires": [
+        "SpeedBooster",
+        "canTrickyJump"
+      ],
+      "note": "Use the full runway to jump up to the higher ledge."
+    },
+    {
+      "link": [3, 1],
+      "name": "Jump From Safety, Menu Avoid",
+      "requires": [
+        "canDodgeWhileShooting",
+        {"or": [
           "SpaceJump",
-          "canTrickyDashJump"
+          "HiJump"
         ]}
       ],
-      "devNote": "The menus don't really matter with these strats."
+      "note": [
+        "From the safe ledge on the lower right, jump directly to the top ledge without getting hit by the Menus.",
+        "With HiJump, a spin jump can get Samus onto the ledge.",
+        "With Space Jump, perform one jump without luring the Menus, then a second to get onto the ledge."
+      ],
+      "devNote": "canDodgeWhileShooting isn't optimal here, but it is a similar difficulty of dodging."
     },
     {
       "id": 24,
@@ -546,7 +617,7 @@
         "canTrickyJump",
         {"or": [
           "canPreciseWalljump",
-          "canSpringBallJumpMidAir"
+          "canTrickySpringBallJump"
         ]}
       ]
     },

region/maridia/roomDiagrams/inner-green_PantsRoom_220.png

@@ -1249,7 +1249,11 @@
       "flashSuitChecked": true,
       "note": [
         "Freeze the Mella at a precise location in order to jump through the crumble block, then wall jump up the long channel and mid air morph to get out.",
-        "The Mella pixel positioning window is larger and higher with Morph and an X-Ray Stand Up."
+        "The Mella pixel positioning window is larger and higher with Morph and an X-Ray Stand Up.",
+        "One normalization which requires moonwalk: Kill all but the middle Mella without letting the middle one move from its starting location by keeping it frozen if Samus passes through.",
+        "From the right, moonwalk backwards one pixel at a time until the Mella is no longer on screen. Shoot ice towards it, then move it on screen so that it is frozen immediately.",
+        "Move to the left and press against (but don't roll under) the speed blocks before the Mella thaws. Moonwalk backwards 5 pixels, then in very quick succession, press right and then jump to do a buffered spin jump.",
+        "The Mella should move horizontally and can then be used to clip through the crumble block."
       ],
       "devNote": "While the high pixel position looks possible, it is fairly unreasonable, as it also requires very precise horizontal positioning and the Mellas are chaotic."
     },