Merge remote-tracking branch 'upstream/master' into tricky-wall-jump

Author: blkerby

region/brinstar/green/Green Hill Zone.json

@@ -209,72 +209,62 @@
       "clearsObstacles": ["B"],
       "flashSuitChecked": true
     },
-    {
-      "id": 2,
-      "link": [1, 1],
-      "name": "Leave Shinecharged (HiJump)",
-      "requires": [
-        "HiJump",
-        {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
-        "canShinechargeMovementTricky",
-        {"shineChargeFrames": 130}
-      ],
-      "exitCondition": {
-        "leaveShinecharged": {}
-      },
-      "flashSuitChecked": true,
-      "note": [
-        "Use the runway below the bug pipe to gain a shinecharge.",
-        "Use HiJump to reach the door with shinecharge frames remaining."
-      ],
-      "devNote": [
-        "One tile of runway is considered unusable in order to have space to quickly jump up onto the bomb blocks above.",
-        "It could also be possible to break the bomb blocks, but this doesn't seem very worth considering."
-      ]
-    },
     {
       "id": 3,
       "link": [1, 1],
-      "name": "Leave Shinecharged (Wall Jump)",
+      "name": "Leave Shinecharged (Far Runway)",
       "requires": [
-        "canWalljump",
         {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
         "canShinechargeMovementTricky",
-        {"shineChargeFrames": 170}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"shineChargeFrames": 130}
+          ]},
+          {"and": [
+            "canWalljump",
+            {"shineChargeFrames": 170}
+          ]},
+          {"shineChargeFrames": 175}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
       "note": [
-        "Use the runway below the bug pipe to gain a shinecharge.",
-        "Use a wall jump to reach the door with shinecharge frames remaining."
+        "Use the runway below the bug pipe to gain a shinecharge and reach the door with shinecharge frames remaining."
       ],
       "devNote": [
         "One tile of runway is considered unusable in order to have space to quickly jump up onto the bomb blocks above.",
         "It could also be possible to break the bomb blocks, potentially increasing the framesRemaining slightly."
       ]
     },
     {
-      "id": 4,
+      "id": 88,
       "link": [1, 1],
-      "name": "Leave Shinecharged (Ledge Grabs)",
+      "name": "Leave Shinecharged (Close Runway)",
       "requires": [
-        {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
+        {"canShineCharge": {"usedTiles": 14, "openEnd": 1}},
+        {"or": [
+          {"canShineCharge": {"usedTiles": 14, "openEnd": 0}},
+          {"shineChargeFrames": 15}
+        ]},
         "canShinechargeMovementTricky",
-        {"shineChargeFrames": 175}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"shineChargeFrames": 75}
+          ]},
+          {"shineChargeFrames": 80}
+        ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
       "note": [
-        "Use the runway below the bug pipe to gain a shinecharge.",
-        "Use precise ledge grabs to barely reach the door with shinecharge frames remaining."
-      ],
-      "devNote": [
-        "One tile of runway is considered unusable in order to have space to quickly jump up onto the bomb blocks above.",
-        "It could also be possible to break the bomb blocks, potentially increasing the framesRemaining slightly."
+        "Use the short runway below the door to gain a shinecharge and reach the door with shinecharge frames remaining."
       ]
     },
     {
@@ -1022,20 +1012,20 @@
     {
       "id": 40,
       "link": [2, 2],
-      "name": "Leave Shinecharged (HiJump)",
+      "name": "Leave Shinecharged (Far Runway)",
       "requires": [
         "HiJump",
         {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
         "canShinechargeMovementComplex",
-        {"shineChargeFrames": 155}
+        {"shineChargeFrames": 150}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
       "note": [
         "Use the runway below the bug pipe to gain a shinecharge.",
-        "Use HiJump to reach the door with shinecharge frames remaining."
+        "Use Hi-Jump to reach the door with shinecharge frames remaining."
       ],
       "devNote": [
         "One tile of runway is considered unusable in order to have space to quickly jump up onto the bomb blocks above.",
@@ -1045,7 +1035,7 @@
     {
       "id": 41,
       "link": [2, 2],
-      "name": "Leave With Spark",
+      "name": "Leave With Spark (Far Runway)",
       "requires": [
         "canPreciseWalljump",
         {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
@@ -1065,6 +1055,34 @@
         "It could also be possible to break the bomb blocks, but this doesn't seem very worth considering."
       ]
     },
+    {
+      "id": 89,
+      "link": [2, 2],
+      "name": "Leave Shinecharged (Close Runway)",
+      "requires": [
+        {"canShineCharge": {"usedTiles": 14, "openEnd": 1}},
+        "canShinechargeMovementComplex",
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"shineChargeFrames": 135}
+          ]},
+          {"and": [
+            "canTrickyDashJump",
+            "canWalljump",
+            "canShinechargeMovementTricky",
+            {"shineChargeFrames": 155}
+          ]}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "Use the runway below the door to gain a shinecharge and leave with shinecharge frames remaining."
+      ]
+    },
     {
       "id": 42,
       "link": [2, 2],
@@ -1741,6 +1759,6 @@
       ]
     }
   ],
-  "nextStratId": 88,
+  "nextStratId": 90,
   "nextNotableId": 7
 }

region/crateria/central/Climb.json

@@ -2117,14 +2117,28 @@
         {"notable": "Behemoth Shinespark"},
         "Morph",
         {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
-        {"shinespark": {"frames": 147, "excessFrames": 124}},
+        {"or": [
+          {"shinespark": {"frames": 147, "excessFrames": 124}},
+          {"and": [
+            "h_ZebesIsAwake",
+            "canTrickyUseFrozenEnemies",
+            {"shinespark": {"frames": 24, "excessFrames": 1}}
+          ]}
+        ]},
         {"obstaclesCleared": ["A"]},
         {"or": [
           "h_ClimbWithoutLava",
           {"obstaclesNotCleared": ["B"]}
         ]}
       ],
-      "note": "Diagonal shinespark up the climb to break the bomb blocks to the morph tunnels on the right."
+      "note": [
+        "Diagonal shinespark up the climb to break the bomb blocks to the morph tunnels on the right.",
+        "A frozen Pirate can be used to stop the spark just above the bottom tunnel."
+      ],
+      "devNote": [
+        "FIXME: if Zebes is awake, it is possible to farm the Pirates in the room after breaking the blocks;",
+        "this also applies to the other forms of Behemoth spark in this room (as long as the lava is not active)."
+      ]
     },
     {
       "id": 98,

region/crateria/east/The Moat.json

@@ -1106,6 +1106,7 @@
       ]
     },
     {
+      "id": 64,
       "link": [3, 2],
       "name": "CWJ Bomb Boost",
       "requires": [
@@ -1267,6 +1268,6 @@
       ]
     }
   ],
-  "nextStratId": 64,
+  "nextStratId": 65,
   "nextNotableId": 4
 }

region/lowernorfair/west/Acid Statue Room.json

@@ -417,6 +417,7 @@
       ]
     },
     {
+      "id": 48,
       "link": [2, 1],
       "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharged)",
       "entranceCondition": {
@@ -443,6 +444,7 @@
       ]
     },
     {
+      "id": 49,
       "link": [2, 1],
       "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharging)",
       "entranceCondition": {
@@ -553,6 +555,7 @@
       ]
     },
     {
+      "id": 50,
       "link": [2, 3],
       "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharged)",
       "entranceCondition": {
@@ -585,6 +588,7 @@
       ]
     },
     {
+      "id": 51,
       "link": [2, 3],
       "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharging)",
       "entranceCondition": {
@@ -971,6 +975,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 48,
+  "nextStratId": 52,
   "nextNotableId": 1
 }

region/maridia/inner-green/Pants Room.json

@@ -468,7 +468,8 @@
               "canTrickyWalljump"
             ]}
           ]},
-          "h_pauseAbuseMinimalReserveRefill"
+          "h_pauseAbuseMinimalReserveRefill",
+          "canTrickyDodgeEnemies"
         ]}
       ],
       "note": [

region/maridia/inner-pink/Aqueduct.json

@@ -2926,16 +2926,20 @@
         "h_navigateUnderwater",
         "canEnemyStuckMoonfall",
         "canBePatient",
-        {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}}
+        {"or": [
+          {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}},
+          "canFreeFallClip"
+        ]}
       ],
       "note": [
         "Use two snails to perform an 'Enemy Stuck Moonfall' to bypass the bomb blocks above the middle left door.",
         "Position one snail on the above door shell, and the second above the corner of pipe below.",
         "Samus will clip through the lower snail, taking damage, then continue through a segment of pipe where the crumble blocks can be reached.",
         "Facing both snails during the moonfall while positioning Samus for the clip can be precise.",
-        "Depending on the exact heights of the snails, it may be necessary to pose change while clipping."
-      ],
-      "devNote": "FIXME: This may be possible damageless by shooting the snail at a precise time."
+        "Depending on the exact heights of the snails, it may be necessary to pose change while clipping.",
+        "Damage from the snail can be avoided by shooting the snail at a precise time:",
+        "the water cycle or Samus' air bubbles can be used as a cue for the timing."
+      ]
     },
     {
       "id": 120,