Merge branch 'master' into croc-flash-use

Author: kjbranch

helpers.json

@@ -955,6 +955,13 @@
               "Morph"
             ]}
           ]
+        },
+        {
+          "name": "h_runOverRespawningEnemies",
+          "requires": [
+            "canCarefulJump"
+          ],
+          "devNote": "canCarefulJump is used to represent leaving the enemy drops, which isn't a propper fit, but it is a tech with a similar difficulty."
         }
       ]
     },

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -390,7 +390,7 @@
         }
       },
       "requires": [
-        "canCarefulJump",
+        "canTrickyJump",
         "canPreciseWalljump"
       ],
       "note": "A doorsill with an open end is really all the room that's needed on the other side."
@@ -448,15 +448,13 @@
       "name": "Doorsill Jump",
       "requires": [
         "canPreciseWalljump",
-        "canCarefulJump",
+        "canTrickyJump",
         {"or": [
-          "canTrickyJump",
-          "canMoonwalk",
-          "canXRayTurnaround",
-          "Morph"
+          {"spikeHits": 1},
+          "h_canBackIntoCorner"
         ]}
       ],
-      "note": "It's not even necessary to jump through the door, the in-room doorsill gives enough running room to make it up."
+      "note": "It's not necessary to jump through the door, the in-room doorsill gives enough running room to make it up."
     },
     {
       "id": 22,
@@ -489,7 +487,7 @@
             {"shinespark": {"frames": 2, "excessFrames": 2}},
             {"or": [
               "canMoonwalk",
-              "Morph"
+              "canMorphTurnaround"
             ]},
             {"or": [
               {"and": [
@@ -520,12 +518,10 @@
       },
       "requires": [
         "canPreciseWalljump",
-        "canCarefulJump",
+        "canTrickyJump",
         {"or": [
-          "canTrickyJump",
-          "canMoonwalk",
-          "canXRayTurnaround",
-          "Morph"
+          {"spikeHits": 1},
+          "h_canBackIntoCorner"
         ]}
       ],
       "flashSuitChecked": true,
@@ -626,7 +622,7 @@
       "unlocksDoors": [
         {
           "types": ["super"],
-          "requires": []
+          "requires": ["canInsaneJump"]
         },
         {
           "types": ["missiles", "powerbomb"],

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

@@ -496,9 +496,9 @@
     {
       "id": 23,
       "link": [1, 3],
-      "name": "Blue Brinstar E-Tank Ceiling Damage Boost",
+      "name": "Ceiling Damage Boost",
       "requires": [
-        {"notable": "Blue Brinstar E-Tank Ceiling Damage Boost"},
+        {"notable": "Ceiling Damage Boost"},
         "h_ZebesIsAwake",
         "canNeutralDamageBoost",
         {"enemyDamage": {
@@ -559,9 +559,9 @@
     {
       "id": 27,
       "link": [1, 3],
-      "name": "Taco Tank in Blue Brinstar Energy Tank Room",
+      "name": "Taco Tank",
       "requires": [
-        {"notable": "Taco Tank in Blue Brinstar Energy Tank Room"},
+        {"notable": "Taco Tank"},
         "canCWJ",
         "canInsaneWalljump",
         "canStationarySpinJump"
@@ -614,7 +614,7 @@
         }
       },
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank G-Mode Flashing Lights"},
+        {"notable": "G-Mode Flashing Lights"},
         {"or": [
           "h_ZebesNotAwake",
           "h_canArtificialMorphSpringBall",
@@ -688,7 +688,7 @@
         }
       },
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank G-Mode Flashing Lights"},
+        {"notable": "G-Mode Flashing Lights"},
         {"or": [
           "h_ZebesNotAwake",
           "h_canArtificialMorphSpringBall",
@@ -860,9 +860,9 @@
     {
       "id": 45,
       "link": [4, 2],
-      "name": "Blue Brin E-Tank Return Through Crumble Blocks",
+      "name": "Return Through Crumble Blocks",
       "requires": [
-        {"notable": "Blue Brin E-Tank Return Through Crumble Blocks"},
+        {"notable": "Return Through Crumble Blocks"},
         "Morph",
         {"or": [
           "canConsecutiveWalljump",
@@ -1076,9 +1076,9 @@
     {
       "id": 55,
       "link": [4, 2],
-      "name": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb",
+      "name": "Geemer Ice Stuck XRay Climb",
       "requires": [
-        {"notable": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb"},
+        {"notable": "Geemer Ice Stuck XRay Climb"},
         "canWallIceClip",
         "canXRayClimb",
         "Grapple",
@@ -1208,15 +1208,15 @@
   "notables": [
     {
       "id": 1,
-      "name": "Blue Brinstar Energy Tank G-Mode Flashing Lights",
+      "name": "G-Mode Flashing Lights",
       "note": [
         "The eye scanners are particularly annoying while in g-mode. They scan Samus with bright flashing lights which remain for a further distance.",
         "This is notable so a player can disable having to enter these flashing lights. If disabled, Samus will only require being in g-mode in this room if Zebes is awake."
       ]
     },
     {
       "id": 2,
-      "name": "Blue Brinstar E-Tank Ceiling Damage Boost",
+      "name": "Ceiling Damage Boost",
       "note": [
         "Have Samus shoot the shot block revealing the item and then quickly get hit by an enemy at the peak of her jump in order to reach the item.",
         "No directional inputs should be held while getting hit by the enemy in order to have a neutral boost and reach the item.",
@@ -1226,17 +1226,17 @@
     },
     {
       "id": 3,
-      "name": "Taco Tank in Blue Brinstar Energy Tank Room",
+      "name": "Taco Tank",
       "note": "Triple frame perfect dashing stationary spinjump into delayed CWJ and precise hitbox manipulation."
     },
     {
       "id": 4,
-      "name": "Blue Brin E-Tank Return Through Crumble Blocks",
+      "name": "Return Through Crumble Blocks",
       "note": "The Crumble Block does not respawn, so it's possible to grab the items and go back up without breaking the Power Bomb blocks."
     },
     {
       "id": 5,
-      "name": "Blue Brinstar Energy Tank Room - Geemer Ice Stuck XRay Climb",
+      "name": "Geemer Ice Stuck XRay Climb",
       "note": [
         "Keep the two Geemers on screen while moving to the right side of the room.",
         "Freeze the second Geemer as it exits the Morph Tunnel, with the Crumble block.",

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

@@ -335,9 +335,9 @@
     {
       "id": 16,
       "link": [3, 4],
-      "name": "Brinstar Reserve Hole-in-One",
+      "name": "Hole-in-One",
       "requires": [
-        {"notable": "Brinstar Reserve Hole-in-One"},
+        {"notable": "Hole-in-One"},
         "Morph",
         "ScrewAttack",
         {"or": [
@@ -369,7 +369,7 @@
   "notables": [
     {
       "id": 1,
-      "name": "Brinstar Reserve Hole-in-One",
+      "name": "Hole-in-One",
       "note": [
         "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.",
         "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps."

region/brinstar/green/Early Supers Room.json

@@ -233,9 +233,9 @@
     {
       "id": 6,
       "link": [1, 1],
-      "name": "Early Supers Leave With Spark To The Left",
+      "name": "Leave With Spark To The Left",
       "requires": [
-        {"notable": "Early Supers Leave With Spark To The Left"},
+        {"notable": "Leave With Spark To The Left"},
         {"obstaclesNotCleared": ["A"]},
         "h_canCrouchJumpDownGrab",
         {"canShineCharge": {
@@ -293,9 +293,9 @@
     {
       "id": 10,
       "link": [1, 2],
-      "name": "Early Supers Mockball",
+      "name": "Mockball",
       "requires": [
-        {"notable": "Early Supers Mockball"},
+        {"notable": "Mockball"},
         {"obstaclesNotCleared": ["A"]},
         "canMockball"
       ],
@@ -340,9 +340,9 @@
     {
       "id": 12,
       "link": [1, 2],
-      "name": "Early Supers Crouch Gate Clip Damage Boost",
+      "name": "Crouch Gate Clip Damage Boost",
       "requires": [
-        {"notable": "Early Supers Crouch Gate Clip Damage Boost"},
+        {"notable": "Crouch Gate Clip Damage Boost"},
         {"obstaclesNotCleared": ["A"]},
         "canCrouchGateClip",
         "canCameraManip",
@@ -943,7 +943,7 @@
   "notables": [
     {
       "id": 1,
-      "name": "Early Supers Leave With Spark To The Left",
+      "name": "Leave With Spark To The Left",
       "note": [
         "Gain a shinecharge on the long, lower platform in the screen above, then carry it left and down.",
         "Use crumble quick drops, land on the floor at the bottom, spin jump left into the doorway, and activate the spark.",
@@ -952,12 +952,12 @@
     },
     {
       "id": 2,
-      "name": "Early Supers Mockball",
+      "name": "Mockball",
       "note": "Mockball to roll over the crumble blocks without falling down, and under the gate before it closes."
     },
     {
       "id": 3,
-      "name": "Early Supers Crouch Gate Clip Damage Boost",
+      "name": "Crouch Gate Clip Damage Boost",
       "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.",