Merge remote-tracking branch 'upstream/master' into norfair-west-flash-suit

Author: blkerby

region/brinstar/kraid/Kraid Room.json

@@ -158,6 +158,7 @@
         ]}
       ],
       "setsFlags": ["f_DefeatedKraid"],
+      "flashSuitChecked": true,
       "note": "Getting up during Phase 2 can be done by jumping on Kraid's projectile platforms or a well timed crouch jump + down grab."
     },
     {
@@ -181,6 +182,7 @@
         ]}
       ],
       "setsFlags": ["f_DefeatedKraid"],
+      "flashSuitChecked": true,
       "note": [
         "Only 2 Missiles are needed to get Kraid to stand up, after which they are farmable.",
         "Getting up during Phase 2 can be done by jumping on Kraid's projectile platforms or a well timed crouch jump + down grab."
@@ -223,6 +225,7 @@
         ]}
       ],
       "setsFlags": ["f_DefeatedKraid"],
+      "flashSuitChecked": true,
       "note": [
         "4 supers are required to kill Kraid. Only 1 is needed to get him to stand up, after which they are farmable, even though the drop rate is low.",
         "Getting up during Phase 2 can be done by jumping on Kraid's projectile platforms or a well timed crouch jump + down grab."

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -500,6 +500,7 @@
         "h_crouchJumpDownGrab"
       ],
       "clearsObstacles": ["C", "D"],
+      "flashSuitChecked": true,
       "note": [
         "This crouch jump down grab is a little tighter than most.",
         "The Kihunters can be killed from below but there is a chance one will drop down the hole. Watch them before breaking the shot block."

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -1441,23 +1441,27 @@
           "canPseudoScrew"
         ]},
         {"or": [
+          "Morph",
           {"and": [
             "HiJump",
+            "canTrickyJump",
             {"or": [
               "canCrouchJump",
               "canDownGrab"
             ]}
           ]},
-          "canTrickyJump",
-          "Morph"
+          "canInsaneJump"
         ]}
       ],
       "clearsObstacles": ["B"],
+      "flashSuitChecked": true,
       "wallJumpAvoid": true,
       "note": [
         "Start the elevator ride by using Screw Attack or Pseudo Screw in the hole.",
         "Kago the elevator to fall back in and hit the elevator again. This is much easier while the elevator is still rising, but can still be done with Morph afterwards.",
-        "Unless HiJump is owned, this will need to be done once more to get high enough to get to the blue gate."
+        "Without HiJump, this will need to be done once more to get high enough to get to the blue gate,",
+        "and, without Morph, Samus will need to Kago the second elevator section first-try, without jumping out of the first section of elevator.",
+        "After triggering the third section of elevator, move out, to the right, then jump onto the raised elevator before it is too tall."
       ]
     },
     {

region/brinstar/red/Caterpillar Room.json

@@ -859,6 +859,7 @@
       "clearsObstacles": ["B"],
       "resetsObstacles": ["A"],
       "farmCycleDrops": [{"enemy": "Zero", "count": 3}],
+      "flashSuitChecked": true,
       "devNote": [
         "Resetting at the bottom of the room (node 3) is covered in a separate 3->3 strat."
       ]
@@ -1657,7 +1658,8 @@
       "name": "Crouch Jump Down Grab",
       "requires": [
         "h_crouchJumpDownGrab"
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 61,

region/brinstar/red/Red Tower.json

@@ -2439,6 +2439,7 @@
         "h_crouchJumpDownGrab",
         {"obstaclesNotCleared": ["A"]}
       ],
+      "flashSuitChecked": true,
       "note": "Using a crouch jump, get the Beetom attach to Samus. Quickly freeze it before it deals damage, if Samus is at very low energy."
     },
     {

region/crateria/east/East Ocean.json

@@ -1222,7 +1222,7 @@
           "canSpaceJumpWaterBounce",
           {"and": [
             "SpaceJump",
-            "h_crouchJumpDownGrab"
+            "h_underwaterCrouchJumpDownGrab"
           ]}
         ]}
       ],

region/lowernorfair/east/Amphitheatre.json

@@ -1250,23 +1250,27 @@
         {"obstaclesNotCleared": ["A"]},
         "h_heatProof",
         "canSuitlessLavaDive",
-        "canCrouchJump",
         "h_doubleSpringBallJumpWithHiJump",
         "canTrickyJump",
-        {"acidFrames": 330},
-        {"acidFrames": 1000}
+        {"acidFrames": 375},
+        {"or": [
+          "canInsaneJump",
+          {"acidFrames": 450}
+        ]}
       ],
       "unlocksDoors": [
         {"types": ["super"], "requires": []},
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
       ],
+      "flashSuitChecked": true,
+      "wallJumpAvoid": true,
       "note": [
         "Acid allows for more time than water to perform Spring Ball jumps.",
         "This gives just barely enough time to fit in three spring ball jumps."
       ],
       "devNote": [
-        "This strat is only used to avoid walljumping.",
-        "1000 leniency frames for retries, and so this does not become the expected strat"
+        "A crouch jump is not required.",
+        "The leniency frames are worst-case scenario of not having enough time for the last jump, which is the most common way to fail."
       ]
     },
     {
@@ -1279,22 +1283,31 @@
         "HiJump",
         "canTrickyJump",
         "canGravityJump",
-        "h_crouchJumpDownGrab",
+        {"or": [
+          "h_crouchJumpDownGrab",
+          {"and": [
+            "canTrickyCarryFlashSuit",
+            "canDownGrab"
+          ]}
+        ]},
         "canSpringBallJumpMidAir",
-        {"heatFrames": 600},
-        {"acidFrames": 600}
+        {"heatFrames": 50},
+        {"acidFrames": 50},
+        {"gravitylessHeatFrames": 300},
+        {"gravitylessAcidFrames": 300}
       ],
       "unlocksDoors": [
         {"types": ["super"], "requires": []},
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
       ],
+      "flashSuitChecked": true,
+      "wallJumpAvoid": true,
       "note": [
         "Perform a gravity jump followed by a springball jump to reach the left side door.",
-        "The gravity jump timing is very precise."
+        "The gravity jump will only get high enough if it is within the last two frames, and the Spring Ball jump must be delayed and near the peak of the jump."
       ],
       "devNote": [
-        "This strat is only used to avoid walljumping.",
-        "FIXME: Gravity heat reduction is disabled for part of this strat."
+        "It is possible to do this with a flash suit, and no crouch jump, but it requires a frame perfect jump and then a Spring Ball jump within 3 pixels of its peak."
       ]
     },
     {

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -2364,7 +2364,8 @@
         {"types": ["powerbomb"], "requires": [], "useImplicitRequires": false}
       ],
       "clearsObstacles": ["A"],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": "It is possible to wait for a Viola to circle the room and fall from the ceiling, but it is faster to jump into the respawning block."
     },
     {
       "id": 57,

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

@@ -1192,17 +1192,24 @@
       "name": "Bug Boost Escape",
       "requires": [
         "HiJump",
+        "canCameraManip",
         "canHorizontalDamageBoost",
-        "canTrickyJump",
-        "canCrouchJump",
+        "canTrickyDodgeEnemies",
+        {"or": [
+          "canCrouchJump",
+          "canTrickyCarryFlashSuit"
+        ]},
         {"enemyDamage": {"enemy": "Fireflea", "type": "contact", "hits": 1}}
       ],
+      "flashSuitChecked": true,
+      "wallJumpAvoid": true,
       "note": [
-        "Set up to Damage boost off the highest Fireflea at the apex of your jump, next to the Ridley claw.",
-        "It's precise, and can only be attempted once.",
-        "Morphing can make the boost a little easier."
-      ],
-      "devNote": "This strat is just to skip a walljump."
+        "Set up to Damage boost off the highest Fireflea at the apex of Samus' jump, right next to the statue's claw.",
+        "The positioning of the Fireflea is very precise, and this can only be attempted once.",
+        "To position the Fireflea, jump to move it on camera and move it off camera while it is at the top of its circle.",
+        "Be careful not to touch the Fireflea while setting up its precise positioning.",
+        "Note that morphing can make the boost a little easier, and a crouch jump can also help, but is not required."
+      ]
     },
     {
       "id": 50,

region/lowernorfair/east/Mickey Mouse Room.json

@@ -967,7 +967,7 @@
     {
       "id": 31,
       "link": [4, 2],
-      "name": "Base",
+      "name": "Base - Blocks Mostly Intact",
       "requires": [
         {"obstaclesCleared": ["B"]},
         {"heatFrames": 160},
@@ -989,6 +989,34 @@
             {"heatFrames": 60}
           ]}
         ]}
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [4, 2],
+      "name": "Jump Into Respawning Block - Blocks Mostly Intact",
+      "requires": [
+        {"obstaclesCleared": ["B"]},
+        {"heatFrames": 600},
+        "canJumpIntoRespawningBlock",
+        {"or": [
+          {"heatFrames": 900},
+          {"and": [
+            "canInsaneJump",
+            "canComplexCarryFlashSuit"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "wallJumpAvoid": true,
+      "note": [
+        "Jump into the respawning shot block. It helps significantly to aim down to get trapped into the block.",
+        "A normalized method to set this up is to shoot the block then immediately perform 5 full-height jumps."
+      ],
+      "devNote": [
+        "The 900 heat frame option gives two leniency attempts.",
+        "This is likely only useful to avoid a crouch jump and preserve a flash suit.",
+        "This is not needed on strats that go directly from 9 to 2, because they require a crouch jump or X-ray."
       ]
     },
     {