Merge remote-tracking branch 'upstream/master' into speedy-jump

Author: blkerby

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

@@ -26,7 +26,8 @@
           "strats": [
             {
               "name": "Base",
-              "requires": []
+              "requires": [],
+              "flashSuitChecked": true
             }
           ]
         }

region/brinstar/blue/Morph Ball Room.json

@@ -33,6 +33,7 @@
               "requires": [
                 {"obstaclesCleared": ["C"]}
               ],
+              "flashSuitChecked": true,
               "devNote": "Obstacle can be destroyed either going 1 -> 6 or 6 -> 1."
             }
           ],
@@ -110,7 +111,8 @@
                   "h_ZebesIsAwake",
                   "h_allItemsSpawned"
                 ]}
-              ]
+              ],
+              "flashSuitChecked": true
             }
           ],
           "note": "Item doesn't appear before Zebes is awakened."

region/brinstar/green/Brinstar Pre-Map Room.json

@@ -50,6 +50,7 @@
                 ]}
               ],
               "clearsObstacles": ["A"],
+              "flashSuitChecked": true,
               "note": [
                 "Both sides of the room must be accessed to reach all enemies and unlock the door.",
                 "Beyond that, the enemies can be killed with Power Beam."
@@ -136,7 +137,8 @@
         {"cycleFrames": 120}
       ],
       "resetsObstacles": ["A"],
-      "farmCycleDrops": [{"enemy": "Zeela", "count": 1}]
+      "farmCycleDrops": [{"enemy": "Zeela", "count": 1}],
+      "flashSuitChecked": true
     },
     {
       "id": 2,
@@ -246,6 +248,7 @@
         "canSpeedball"
       ],
       "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
       "devNote": "There are 3 unusable tiles in this runway."
     },
     {
@@ -258,6 +261,7 @@
         "canSpeedball"
       ],
       "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
       "note": "Run on the upper platform to perform the speedball."
     },
     {
@@ -271,6 +275,7 @@
         "canSpeedball"
       ],
       "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
       "note": "Use a frozen Zeela to extend the upper platform to help set up the speedball."
     },
     {
@@ -425,6 +430,7 @@
           }
         }
       },
+      "flashSuitChecked": true,
       "devNote": "It's also possible to do a neutral bounce into an uncontrolled spring ball bounce through the door; but it's unclear if it has any application."
     },
     {
@@ -440,7 +446,8 @@
           },
           "maxExtraRunSpeed": "$2.4"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 22,
@@ -452,7 +459,8 @@
       ],
       "exitCondition": {
         "leaveWithTemporaryBlue": {}
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 23,

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

@@ -179,6 +179,7 @@
         ]}
       ],
       "collectsItems": [3],
+      "flashSuitChecked": true,
       "note": [
         "Speedball through the morph tunnel and use it to break the bomb blocks in front of the hidden Missile location.",
         "This can be done using Spring Ball, or by unmorphing and using temporary blue to bounce through the bomb blocks."
@@ -204,6 +205,7 @@
         ]}
       ],
       "collectsItems": [3],
+      "flashSuitChecked": true,
       "note": [
         "Speedball through the morph tunnel and use it to break the bomb blocks in front of the hidden Missile location.",
         "This can be done using Spring Ball, or by unmorphing and using temporary blue to bounce through the bomb blocks."
@@ -257,6 +259,7 @@
         "canSpringFling"
       ],
       "collectsItems": [3],
+      "flashSuitChecked": true,
       "note": [
         "Gain temporary blue at the end of the runway.",
         "Then spring ball bounce through the tunnel.",
@@ -283,6 +286,7 @@
         "canInsaneJump"
       ],
       "collectsItems": [3],
+      "flashSuitChecked": true,
       "note": [
         "Enter the room with a precisely positioned blue Spring Ball bounce.",
         "Enter the tunnel and bounce all the way through.",

region/brinstar/green/Early Supers Room.json

@@ -187,6 +187,7 @@
           "obstruction": [1, 0]
         }
       },
+      "flashSuitChecked": true,
       "devNote": "Max extra run speed $1.8."
     },
     {
@@ -205,7 +206,8 @@
             "openEnd": 1
           }
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 4,
@@ -224,7 +226,8 @@
           },
           "movementType": "uncontrolled"
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 5,
@@ -238,7 +241,8 @@
             "openEnd": 1
           }
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 6,
@@ -339,6 +343,7 @@
           "note": "Falls down into node 3 with no possiblity of quick crumble escape."
         }
       ],
+      "flashSuitChecked": true,
       "note": [
         "Run then do a very small spin jump to clip into the left side of the first gate.",
         "While inside the gate, back up to get the maximum run distance using either Moonwalk or X-Ray Turnaround and repeat for the next gate.",
@@ -366,6 +371,7 @@
           "note": "Falls down into node 3 with no possiblity of quick crumble escape."
         }
       ],
+      "flashSuitChecked": true,
       "note": [
         "Spawn a Zeb then run and do a very small spin jump to clip into the first gate before the Zeb reaches you.",
         "Do a damage boost off of the Zeb while inside the first gate to get enough speed to clip into the next gate.",
@@ -547,6 +553,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": "Gain blue speed in the other room, jump through the transition, then speedball under the shutters.",
       "devNote": [
         "Slightly higher run speeds can work but with greater difficulty.",
@@ -573,6 +580,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": "Gain blue speed in the other room, Space Jump through the transition, then speedball under the shutters."
     },
     {
@@ -631,6 +639,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": "Gain blue speed in the other room, jump through the transition, then speedball under the shutters."
     },
     {
@@ -761,6 +770,7 @@
           "obstruction": [2, 0]
         }
       },
+      "flashSuitChecked": true,
       "devNote": "Max extra run speed $2.5."
     },
     {
@@ -780,6 +790,7 @@
           }
         }
       },
+      "flashSuitChecked": true,
       "note": "Use the runway below the crumbles at the right side of the room."
     },
     {
@@ -795,7 +806,8 @@
       ],
       "exitCondition": {
         "leaveWithTemporaryBlue": {}
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 47,
@@ -979,7 +991,8 @@
           "canSpringBallJumpMidAir"
         ]}
       ],
-      "clearsObstacles": ["A"]
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true
     },
     {
       "id": 32,
@@ -1000,7 +1013,8 @@
           "blockPositions": [[7, 2]]
         }
       },
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 34,

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -248,7 +248,8 @@
           "length": 4,
           "openEnd": 0
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 2,
@@ -300,6 +301,7 @@
         }
       },
       "collectsItems": [5],
+      "flashSuitChecked": true,
       "devNote": "The item could possibly be avoided depending on the run speed."
     },
     {
@@ -322,6 +324,7 @@
         }
       },
       "collectsItems": [5],
+      "flashSuitChecked": true,
       "devNote": "The item could be avoided by using a shorter landing runway and enough speed"
     },
     {
@@ -339,7 +342,8 @@
           }
         }
       },
-      "collectsItems": [5]
+      "collectsItems": [5],
+      "flashSuitChecked": true
     },
     {
       "id": 7,
@@ -352,7 +356,8 @@
       ],
       "exitCondition": {
         "leaveWithTemporaryBlue": {}
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 8,
@@ -641,6 +646,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": [
         "Land on the crumble blocks while unmorphing, to retain temporary blue.",
         "Then aim down and use a pause buffer to remorph and chain temporary blue."
@@ -997,6 +1003,7 @@
       "exitCondition": {
         "leaveShinecharged": {}
       },
+      "flashSuitChecked": true,
       "note": [
         "With some dash speed, bounce into the opening of the spikeway, and enter X-mode.",
         "The spike knockback will push Samus back out of the spikeway."
@@ -1111,6 +1118,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": [
         "Enter the room with a blue speed jump to speedball through the spike tunnel.",
         "Then perform a long temporary blue chain across the room."
@@ -1136,6 +1144,7 @@
         "leaveWithTemporaryBlue": {}
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": [
         "Gain temporary blue, and use Spring Ball to bounce through the spike tunnel.",
         "Then perform a long temporary blue chain across the room."
@@ -1363,6 +1372,7 @@
         "canUseIFrames",
         "canNeutralDamageBoost"
       ],
+      "flashSuitChecked": true,
       "note": [
         "Freeze a Zebbo inside the wall above the right side of the spikeway, close to the ceiling thorns.",
         "Face right, equip X-Ray, move at least a few pixels away from the wall, and jump straight up into the ceiling thorns.",
@@ -1586,6 +1596,7 @@
           "fallSpeedInTiles": 1
         }
       },
+      "flashSuitChecked": true,
       "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing."
     },
     {
@@ -1604,6 +1615,7 @@
           "fallSpeedInTiles": 2
         }
       },
+      "flashSuitChecked": true,
       "note": [
         "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
         "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing."
@@ -1683,6 +1695,7 @@
       "exitCondition": {
         "leaveWithSpark": {}
       },
+      "flashSuitChecked": true,
       "note": [
         "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
         "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
@@ -1971,6 +1984,7 @@
         }
       },
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "flashSuitChecked": true,
       "note": [
         "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.",
         "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing.",