Merge branch 'master' into BlindSpeed

Author: osse101

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

@@ -466,6 +466,28 @@
         "canCarefulJump"
       ]
     },
+    {
+      "id": 51,
+      "link": [2, 1],
+      "name": "Come in Shinecharged, Shinespark",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 15},
+        "canShinechargeMovement",
+        "canMidairShinespark",
+        {"shinespark": {"frames": 7, "excessFrames": 1}},
+        {"or": [
+          "canTrickyJump",
+          {"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "note": [
+        "Sparking only to the edge of the invisible platform helps prevent taking a boulder hit.",
+        "If sparking early, a down-back can help with reaching the platform."
+      ]
+    },
     {
       "id": 24,
       "link": [2, 1],
@@ -813,6 +835,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 51,
+  "nextStratId": 52,
   "nextNotableId": 1
 }

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -4702,6 +4702,7 @@
       "note": "With a runway of at least 12 tiles in the adjacent room, Samus should always be able to jump high enough if she jumps just before hitting the right wall."
     },
     {
+      "id": 252,
       "link": [10, 14],
       "name": "Side Platform Cross Room Jump",
       "entranceCondition": {
@@ -5149,6 +5150,6 @@
       ]
     }
   ],
-  "nextStratId": 252,
+  "nextStratId": 253,
   "nextNotableId": 5
 }

region/brinstar/green/Green Hill Zone.json

@@ -464,6 +464,7 @@
       "devNote": "This is technically possible with 14 tiles but it might require too much precision."
     },
     {
+      "id": 80,
       "link": [1, 2],
       "name": "Side Platform Cross Room Jump",
       "entranceCondition": {
@@ -557,7 +558,7 @@
               "requires": [],
               "note": ["This applies to Metal Pirates Room."],
               "detailNote": ["This has a 3-frame window for the jump."]
-            }            
+            }
           ]
         }
       },
@@ -1579,6 +1580,6 @@
       ]
     }
   ],
-  "nextStratId": 80,
+  "nextStratId": 81,
   "nextNotableId": 7
 }

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

@@ -840,6 +840,7 @@
       "devNote": "This requires extra run speed of at least $6.0."
     },
     {
+      "id": 87,
       "link": [1, 3],
       "name": "Side Platform Cross Room Jump",
       "entranceCondition": {
@@ -1832,6 +1833,6 @@
       ]
     }
   ],
-  "nextStratId": 87,
+  "nextStratId": 88,
   "nextNotableId": 6
 }

region/brinstar/pink/Waterway Energy Tank Room.json

@@ -303,12 +303,15 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 40},
+        {"shineChargeFrames": 20},
         "canHorizontalShinespark",
-        {"shinespark": {"frames": 155, "excessFrames": 10}}
+        {"shinespark": {"frames": 152, "excessFrames": 10}}
       ],
       "clearsObstacles": ["A"],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "note": [
+        "If coming from a water environment, this assumes entering with a small spin jump."
+      ]
     },
     {
       "id": 14,

region/brinstar/red/Red Tower.json

@@ -2483,6 +2483,7 @@
       ]
     },
     {
+      "id": 125,
       "link": [9, 5],
       "name": "HiJump, Space Jump Climb Between the Rippers",
       "requires": [
@@ -2496,6 +2497,7 @@
       ]
     },
     {
+      "id": 126,
       "link": [9, 5],
       "name": "Bootless Space Jump Climb Between the Rippers",
       "requires": [
@@ -2775,6 +2777,6 @@
       ]
     }
   ],
-  "nextStratId": 125,
+  "nextStratId": 127,
   "nextNotableId": 10
 }

region/crateria/east/The Moat.json

@@ -233,6 +233,7 @@
       ]
     },
     {
+      "id": 63,
       "link": [1, 2],
       "name": "Side Platform Cross Room Jump",
       "entranceCondition": {
@@ -1235,6 +1236,6 @@
       ]
     }
   ],
-  "nextStratId": 63,
+  "nextStratId": 64,
   "nextNotableId": 3
 }

region/lowernorfair/east/Fast Pillars Setup Room.json

@@ -888,6 +888,7 @@
       ]
     },
     {
+      "id": 96,
       "link": [1, 4],
       "name": "G-Mode",
       "entranceCondition": {
@@ -922,6 +923,7 @@
       ]
     },
     {
+      "id": 97,
       "link": [1, 4],
       "name": "G-Mode Morph, Power Bomb the Pirate",
       "entranceCondition": {
@@ -932,7 +934,7 @@
       },
       "requires": [
         "h_heatedGMode",
-        {"ammo": { "type": "PowerBomb", "count": 3}},
+        {"ammo": {"type": "PowerBomb", "count": 3}},
         "h_canArtificialMorphIBJ",
         "canInsaneJump",
         {"heatFrames": 80}
@@ -949,6 +951,7 @@
       "devNote": "FIXME: It may be possible to kill the upper pirates in a way where Samus can collect their drops on the path to the door."
     },
     {
+      "id": 98,
       "link": [1, 4],
       "name": "G-Mode Morph, IBJ Pirate Avoid",
       "entranceCondition": {
@@ -1009,6 +1012,7 @@
       ]
     },
     {
+      "id": 99,
       "link": [1, 5],
       "name": "G-Mode Morph, Power Bomb the Blocks",
       "entranceCondition": {
@@ -1255,6 +1259,7 @@
       "flashSuitChecked": true
     },
     {
+      "id": 100,
       "link": [2, 5],
       "name": "G-Mode Morph, Power Bomb the Blocks",
       "entranceCondition": {
@@ -1611,6 +1616,7 @@
       "flashSuitChecked": true
     },
     {
+      "id": 101,
       "link": [3, 5],
       "name": "G-Mode Morph, Power Bomb the Blocks",
       "entranceCondition": {
@@ -1799,6 +1805,7 @@
       "flashSuitChecked": true
     },
     {
+      "id": 102,
       "link": [4, 1],
       "name": "G-Mode",
       "entranceCondition": {
@@ -1814,6 +1821,7 @@
       "note": "Avoid getting hit by one of the pirate's stationary, invisible lasers on G-mode exit."
     },
     {
+      "id": 103,
       "link": [4, 1],
       "name": "G-Mode, Pirate Kill, Pause Abuse",
       "entranceCondition": {
@@ -1836,6 +1844,7 @@
       ]
     },
     {
+      "id": 104,
       "link": [4, 1],
       "name": "G-Mode Morph, Pirate Kill, Pause Abuse",
       "entranceCondition": {
@@ -1846,7 +1855,7 @@
       },
       "requires": [
         "canTrickyGMode",
-        {"ammo": {"type": "PowerBomb","count": 3}},
+        {"ammo": {"type": "PowerBomb", "count": 3}},
         "h_heatedGModePauseAbuse"
       ],
       "flashSuitChecked": true,
@@ -1999,6 +2008,7 @@
       "note": "Fall onto the platform, then wait for the pirate to jump back to the right before returning through the door."
     },
     {
+      "id": 105,
       "link": [4, 5],
       "name": "G-Mode Morph, Power Bomb the Blocks",
       "entranceCondition": {
@@ -2284,6 +2294,6 @@
     }
   ],
   "notables": [],
-  "nextStratId": 96,
+  "nextStratId": 106,
   "nextNotableId": 1
 }