Merge branch 'master' into notable-2

Author: kjbranch

region/brinstar/green/Green Hill Zone.json

@@ -1113,6 +1113,7 @@
         {"notable": "Grapple Teleport Fling to Right (from Moat)"},
         "canInsaneJump"
       ],
+      "wallJumpAvoid": true,
       "note": [
         "After teleporting, extend the Grapple, and swing back and forth to fix the camera and then to gain momentum.",
         "A precisely timed release of Grapple will allow Samus to fling onto the ledge on the right."
@@ -1132,6 +1133,7 @@
         "canTrickyGrappleJump",
         "canInsaneJump"
       ],
+      "wallJumpAvoid": true,
       "note": [
         "After teleporting, swing back and forth to fix the camera.",
         "Swing to the right by soft-bouncing against the door followed by fully extending the Grapple Beam.",
@@ -1458,6 +1460,7 @@
     {
       "id": 5,
       "name": "Grapple Teleport Fling to Right (from Moat)",
+      "wallJumpAvoid": true,
       "note": [
         "After teleporting, extend the Grapple, and swing back and forth to fix the camera and then to gain momentum.",
         "A precisely timed release of Grapple will allow Samus to fling onto the ledge on the right."
@@ -1466,6 +1469,7 @@
     {
       "id": 6,
       "name": "Grapple Teleport into Grapple Jump (from Red Brinstar Firefleas)",
+      "wallJumpAvoid": true,
       "note": [
         "After teleporting, swing back and forth to fix the camera.",
         "Swing to the right by soft-bouncing against the door followed by fully extending the Grapple Beam.",

region/brinstar/kraid/Warehouse Entrance.json

@@ -744,6 +744,7 @@
         "canInsaneJump",
         "canDownGrab"
       ],
+      "wallJumpAvoid": true,
       "note": [
         "Back up against the wall of the single-tile ledge.",
         "Run forward, perform a single arm pump, and jump on the last possible frame.",
@@ -756,6 +757,7 @@
     {
       "id": 1,
       "name": "Arm Pump Jump",
+      "wallJumpAvoid": true,
       "note": [
         "Back up against the wall of the single-tile ledge.",
         "Run forward, perform a single arm pump, and jump on the last possible frame.",

region/brinstar/pink/Pink Brinstar Hopper Room.json

@@ -1067,6 +1067,7 @@
         "canXRayClimb",
         {"enemyDamage": {"enemy": "Sidehopper", "type": "contact", "hits": 2}}
       ],
+      "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": [
         "To minimize damage from the Hoppers, get stuck in the door relatively high and move quickly.",
@@ -1230,14 +1231,12 @@
         ]}
       ],
       "clearsObstacles": ["B"],
+      "wallJumpAvoid": true,
       "note": [
         "The elevator can be raised by clipping a shot into the floor, shot while falling with the right amount of vertical speed.",
         "This can be done with a Missile, Super, or charged Spazer or Plasma shot, a well positioned angle Spazer shot while crouched, or an  or Ice SBA."
       ],
-      "devNote": [
-        "FIXME: Do we need leniency or another tech for this?",
-        "This is only notable as a way to avoid wall jumps."
-      ]
+      "devNote": "FIXME: Do we need leniency or another tech for this?"
     },
     {
       "id": 49,
@@ -1353,12 +1352,12 @@
         ]}
       ],
       "clearsObstacles": ["B"],
+      "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."
-      ],
-      "devNote": "This is only notable as a way to avoid wall jumps."
+      ]
     },
     {
       "id": 55,
@@ -1450,6 +1449,7 @@
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
+      "wallJumpAvoid": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
     {
@@ -1467,6 +1467,7 @@
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
+      "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
@@ -1484,6 +1485,7 @@
         {"shinespark": {"frames": 15, "excessFrames": 6}}
       ],
       "clearsObstacles": ["B"],
+      "wallJumpAvoid": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
     {
@@ -1498,6 +1500,7 @@
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
+      "wallJumpAvoid": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
     {
@@ -1788,6 +1791,7 @@
     {
       "id": 1,
       "name": "Shinespark to Ride the Elevator",
+      "wallJumpAvoid": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
     {
@@ -1801,6 +1805,7 @@
     {
       "id": 3,
       "name": "Hopper X-Ray Climb",
+      "wallJumpAvoid": true,
       "note": [
         "To minimize damage from the Hoppers, get stuck in the door relatively high and move quickly.",
         "Climb up somewhat less than 1 screen, until Samus' head appears between 1 and 3 tiles below the door.",
@@ -1810,6 +1815,7 @@
     {
       "id": 4,
       "name": "Shot Clip to Ride the Elevator",
+      "wallJumpAvoid": true,
       "note": [
         "The elevator can be raised by clipping a shot into the floor, shot while falling with the right amount of vertical speed.",
         "This can be done with a Missile, Super, or charged Spazer or Plasma shot, a well positioned angle Spazer shot while crouched, or an  or Ice SBA."
@@ -1818,6 +1824,7 @@
     {
       "id": 5,
       "name": "Screw and Kago to Ride the Elevator",
+      "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.",

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

@@ -738,6 +738,7 @@
           "note": "Failure leaves you at 3 with a solid crumble block above."
         }
       ],
+      "wallJumpAvoid": true,
       "note": [
         "Perform a quick-drop through the Crumble block, and grab the item.",
         "During the item message box, buffer the inputs to turn around to the right and jump.",
@@ -880,6 +881,7 @@
     {
       "id": 4,
       "name": "Mission Impossible Walljumpless",
+      "wallJumpAvoid": true,
       "note": [
         "Perform a quick-drop through the Crumble block, and grab the item.",
         "During the item message box, buffer the inputs to turn around to the right and jump.",

region/brinstar/red/Red Tower.json

@@ -991,6 +991,7 @@
         {"shinespark": {"frames": 77, "excessFrames": 3}},
         {"ammo": {"type": "Missile", "count": 1}}
       ],
+      "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": [
         "Come in shinecharged from the top left door. With missiles selected, position Samus roughly in the horizontal center of the room.",
@@ -1014,6 +1015,7 @@
         {"shinespark": {"frames": 77, "excessFrames": 3}},
         {"ammo": {"type": "Missile", "count": 1}}
       ],
+      "wallJumpAvoid": true,
       "note": [
         "Come in shinecharging from the top left door. With missiles selected, position Samus roughly in the horizontal center of the room.",
         "Crouch, aim up, then in very quick succession, shoot a missile upwards then spark up.",
@@ -1031,6 +1033,7 @@
         {"shinespark": {"frames": 77, "excessFrames": 3}},
         {"ammo": {"type": "Missile", "count": 1}}
       ],
+      "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": [
         "With missiles selected, position Samus roughly in the horizontal center of the room.",
@@ -1124,6 +1127,7 @@
           ]}
         ]}
       ],
+      "wallJumpAvoid": true,
       "note": [
         "Freeze the Beetom and use it as a platform to climb the room without wall jumps.",
         "This can be done with well-timed Flatley jumps on top of the frozen Beetom,",
@@ -2705,6 +2709,7 @@
     {
       "id": 2,
       "name": "Hero Shot Shinespark",
+      "wallJumpAvoid": true,
       "note": [
         "Come in shinecharged (or shinecharging) from the top left door. With missiles selected, position Samus roughly in the horizontal center of the room.",
         "Crouch, aim up, then in very quick succession, shoot a missile upwards then spark up.",
@@ -2719,6 +2724,7 @@
     {
       "id": 5,
       "name": "Frozen Beetom Ice Climb",
+      "wallJumpAvoid": true,
       "note": [
         "Freeze the Beetom and use it as a platform to climb the room without wall jumps.",
         "This can be done with well-timed Flatley jumps on top of the frozen Beetom,",

region/crateria/central/Parlor and Alcatraz.json

@@ -1764,6 +1764,7 @@
         {"autoReserveTrigger": {"minReserveEnergy": 85}},
         {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
       ],
+      "wallJumpAvoid": true,
       "flashSuitChecked": true,
       "note": [
         "Wait 3 minutes for a global Geemer to waddle over, or shoot a Super 20 to 30 seconds after entering the room to knock it off the ceiling and save a lot of time.",
@@ -2926,6 +2927,7 @@
     {
       "id": 5,
       "name": "Alcatraz Escape Double Damage Boost",
+      "wallJumpAvoid": true,
       "note": [
         "Wait 3 minutes for a global Geemer to waddle over, or shoot a Super 20 to 30 seconds after entering the room to knock it off the ceiling and save a lot of time.",
         "Damage down until Samus is one Geemer hit away from running out of energy, and set reserves to manual.",