Merge pull request #2158 from blkerby/green-hill-zone-leave-shinecharged

Green Hill Zone more leaveShinecharged

Author: osse101

region/brinstar/green/Green Hill Zone.json

@@ -209,72 +209,61 @@
       "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)",
-      "requires": [
-        "canWalljump",
+      "name": "Leave Shinecharged (Far Runway)",
+      "requires": [        
         {"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,
       "link": [1, 1],
-      "name": "Leave Shinecharged (Ledge Grabs)",
-      "requires": [
-        {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
+      "name": "Leave Shinecharged (Close Runway)",
+      "requires": [        
+        {"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 +1011,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 +1034,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 +1054,33 @@
         "It could also be possible to break the bomb blocks, but this doesn't seem very worth considering."
       ]
     },
+    {
+      "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],