Merge branch 'master' into ws-check-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/Crab Maze.json

@@ -140,7 +140,8 @@
         {"resetRoom": {"nodes": [1]}},
         {"cycleFrames": 1080}
       ],
-      "farmCycleDrops": [{"enemy": "Sciser", "count": 1}]
+      "farmCycleDrops": [{"enemy": "Sciser", "count": 1}],
+      "flashSuitChecked": true
     },
     {
       "id": 27,
@@ -166,7 +167,8 @@
           {"cycleFrames": 1550}
         ]}
       ],
-      "farmCycleDrops": [{"enemy": "Sciser", "count": 8}]
+      "farmCycleDrops": [{"enemy": "Sciser", "count": 8}],
+      "flashSuitChecked": true
     },
     {
       "id": 3,
@@ -186,7 +188,8 @@
         "leaveWithDoorFrameBelow": {
           "height": 2
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 5,
@@ -199,7 +202,8 @@
           "leftPosition": -2.5,
           "rightPosition": 2.5
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 6,
@@ -315,7 +319,8 @@
       "name": "Base",
       "requires": [
         "Morph"
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 11,
@@ -485,6 +490,7 @@
           "steepUpTiles": 1
         }
       },
+      "flashSuitChecked": true,
       "devNote": "Because the next tile is a slope into the water, it behaves like no open end."
     },
     {
@@ -501,7 +507,8 @@
           "steepUpTiles": 5,
           "steepDownTiles": 1
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 15,
@@ -522,7 +529,8 @@
         "leaveWithSpark": {
           "position": "bottom"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 25,
@@ -541,6 +549,7 @@
       "exitCondition": {
         "leaveShinecharged": {}
       },
+      "flashSuitChecked": true,
       "note": [
         "The ideal setup begins by standing 5 tiles away from the water, at the top of the slope.",
         "Run toward the water, releasing forward for 5 frames before re-pressing it on the last possible frame before entering the water.",
@@ -603,7 +612,8 @@
           {"cycleFrames": 420}
         ]}
       ],
-      "farmCycleDrops": [{"enemy": "Sciser", "count": 3}]
+      "farmCycleDrops": [{"enemy": "Sciser", "count": 3}],
+      "flashSuitChecked": true
     },
     {
       "id": 18,
@@ -635,21 +645,24 @@
             ]}
           ]}
         ]}
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 20,
       "link": [3, 1],
       "name": "Base",
       "requires": [
         "Morph"
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 21,
       "link": [3, 2],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     }
   ],
   "notables": [],

region/crateria/east/Crateria Kihunter Room.json

@@ -108,7 +108,8 @@
           "steepUpTiles": 5,
           "steepDownTiles": 2
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 2,
@@ -134,13 +135,15 @@
       "id": 4,
       "link": [1, 2],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 5,
       "link": [2, 1],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 6,
@@ -152,7 +155,8 @@
         }
       },
       "requires": [],
-      "bypassesDoorShell": true
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true
     },
     {
       "id": 7,
@@ -169,7 +173,8 @@
           "blockPositions": [[3, 12]]
         }
       },
-      "bypassesDoorShell": true
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true
     },
     {
       "id": 8,
@@ -186,7 +191,8 @@
           "blockPositions": [[3, 13]]
         }
       },
-      "bypassesDoorShell": true
+      "bypassesDoorShell": true,
+      "flashSuitChecked": true
     },
     {
       "id": 9,
@@ -238,7 +244,8 @@
           "length": 4,
           "openEnd": 1
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 11,
@@ -274,7 +281,8 @@
           },
           "minExtraRunSpeed": "$3.E"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 13,
@@ -295,7 +303,8 @@
           },
           "minExtraRunSpeed": "$0.8"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 14,
@@ -317,7 +326,8 @@
           "minExtraRunSpeed": "$1.9",
           "movementType": "uncontrolled"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 15,
@@ -334,6 +344,7 @@
           }
         }
       },
+      "flashSuitChecked": true,
       "devNote": ["FIXME: A longer runway could be used if getting blue speed."]
     },
     {
@@ -404,7 +415,8 @@
       "farmCycleDrops": [
         {"enemy": "Sciser", "count": 2},
         {"enemy": "Kihunter (green)", "count": 2}
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 18,
@@ -440,22 +452,15 @@
       "note": [
         "Jump and aim down to lower the camera to see where the crabs are.",
         "Alternatively use a Power Bomb to kill them or risk tanking a hit."
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 21,
       "link": [3, 2],
       "name": "Base",
-      "requires": []
-    },
-    {
-      "id": 22,
-      "link": [3, 3],
-      "name": "Leave Normally",
       "requires": [],
-      "exitCondition": {
-        "leaveNormally": {}
-      }
+      "flashSuitChecked": true
     },
     {
       "id": 23,
@@ -489,6 +494,7 @@
         "canTrickyUseFrozenEnemies"
       ],
       "bypassesDoorShell": true,
+      "flashSuitChecked": true,
       "note": [
         "Freeze the two Scisers to set up a moonfall between them, and aim down.",
         "Hold left to move to the right at the correct time, which will set up an automatic turn-around, allowing Samus to clip past the floating platform below, past the door shell, and through the transition.",
@@ -506,6 +512,7 @@
       "requires": [
         {"shinespark": {"frames": 2, "excessFrames": 2}}
       ],
+      "flashSuitChecked": true,
       "note": "Enter on the right side of the doorway to reduce the amount of energy used.",
       "devNote": "This strat is not useful in-room, but can satisfy a strat in the room before with an exit shinespark."
     },