Merge pull request #2561 from blkerby/notable-updates

Some notable strat refinements

Author: osse101

region/brinstar/red/Red Tower.json

@@ -1366,11 +1366,11 @@
         {"or": [
           {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 9}},
           {"and": [
-            "canInsaneJump",
+            "canBeVeryPatient",
             {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 4}}
           ]},
           {"and": [
-            "canBeVeryPatient",
+            "canBeVeryLucky",
             {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}},
             {"refill": ["Energy"]}
           ]}

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

@@ -745,7 +745,7 @@
       "requires": [
         {"notable": "Back-Side Super Only Fight"},
         "h_navigateUnderwater",
-        "canBeExtremelyPatient",
+        "canBeVeryPatient",
         {"enemyKill": {
           "enemies": [["Reverse Botwoon 1"], ["Reverse Botwoon 2"]],
           "explicitWeapons": ["Super"]

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

@@ -699,15 +699,18 @@
         {"notable": "Suitless HiJump Perfect Bomb Boost"},
         "HiJump",
         "h_underwaterCrouchJump",
-        "canBombJumpWaterEscape"
+        "canBombJumpWaterEscape",
+        {"or": [
+          "canBeVeryLucky",
+          {"ammo": {"type": "PowerBomb", "count": 8}}
+        ]}
       ],
       "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": [
-        "Reach the left side item using a single bomb explosion barely reach it.",
-        "Use HiJump to reach the water line and then use a Bomb Jump Water Escape motion to Bomb jump out of the water.",
-        "Do not Morph until fully out of the water to place the Bomb with the correct height.",
-        "And do not place the Bomb at the max possible height, but a little lower where it will bounce Samus higher."
+        "Use HiJump to reach the water line, wait to morph until fully out of the water,",
+        "place a Power Bomb at the correct height, and use it to boost just high enough to collect the item.",
+        "Do not place the Power Bomb at the maximum possible height, but a little lower where it will bounce Samus higher."
       ]
     },
     {

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

@@ -987,7 +987,7 @@
       "requires": [
         {"notable": "Bootless Walljumpless Space Jump"},
         "canPreciseSpaceJump",
-        "canTrickyJump",
+        "canInsaneJump",
         {"acidFrames": 50}
       ],
       "exitCondition": {

region/wreckedship/main/Bowling Alley.json

@@ -1323,7 +1323,9 @@
         "Climb up about half a screen.",
         "If Phantoon is dead, the last part of the climb should be done carefully to avoid triggering collision with the spikes:",
         "Do not press forward or turn-around except while X-Ray is active.",
-        "For each X-ray stand-up, release the turn-around input quickly to make sure that it is not still held after X-Ray deactivates.",
+        "For each X-ray stand-up, release the turn-around input quickly to make sure that it is not still held after X-Ray deactivates;",
+        "alternatively, hold both angle up and angle down to prevent Samus from touching the spikes",
+        "(though this no longer gives protection if climbing so high that the bottom of Samus' hitbox reaches the spikes).",
         "Once Samus is high enough, unequip X-Ray, jump up (from either standing or crouch) to clip past the spikes, and land, taking a single spike hit.",
         "Then use the i-frames from the spike hit to run and jump to the left to make it to the door.",
         "Samus is high enough after the top of her arm cannon first becomes visible at the bottom of the screen; or up to 3 additional climbs can be performed after that point.",