Merge pull request #1740 from blkerby/grapple-beam-shinecharges

Grapple Beam Room shinecharges

Author: osse101

region/norfair/crocomire/Grapple Beam Room.json

@@ -111,18 +111,49 @@
     {
       "id": 4,
       "link": [1, 2],
-      "name": "Come In Shinecharged for Item Grab and Escape",
+      "name": "Come In Shinecharging for Item Grab and Escape",
       "entranceCondition": {
-        "comeInShinecharged": {
-          "framesRequired": 165
+        "comeInShinecharging": {
+          "length": 0,
+          "openEnd": 1
         }
       },
       "requires": [
-        "canShinechargeMovementComplex"
+        "canShinechargeMovementTricky"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 2],
+      "name": "Come In Shinecharging, Leave Shinecharged",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 0,
+          "openEnd": 1
+        }
+      },
+      "requires": [
+        "canShinechargeMovementComplex"
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {
+          "framesRemaining": 40
+        }
+      },
+      "unlocksDoors": [
+        {
+          "types": ["super"],
+          "requires": [{"shineChargeFrames": 5}]
+        },
+        {
+          "types": ["missiles", "powerbomb"],
+          "requires": [
+            "never"
+          ]
+        }
+      ]
+    },
     {
       "id": 5,
       "link": [2, 1],
@@ -137,7 +168,7 @@
     {
       "id": 6,
       "link": [2, 1],
-      "name": "Shinespark",
+      "name": "Come In Shinecharging, Shinespark",
       "entranceCondition": {
         "comeInShinecharging": {
           "length": 9,
@@ -151,10 +182,10 @@
     {
       "id": 7,
       "link": [2, 1],
-      "name": "Enter Shinecharged Shinespark",
+      "name": "Come In Shinecharged, Shinespark",
       "entranceCondition": {
         "comeInShinecharged": {
-          "framesRequired": 13
+          "framesRequired": 10
         }
       },
       "requires": [
@@ -171,6 +202,100 @@
         {"shinespark": {"frames": 40}}
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "Come In Shinecharging, Leave With Spark (HiJump Wall Climb, Partial Runway)",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 5,
+          "openEnd": 0
+        }
+      },
+      "requires": [
+        "HiJump",
+        "canShinechargeMovementTricky",
+        "canFastWalljumpClimb",
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "unlocksDoors": [
+        {
+          "types": ["super"],
+          "requires": []
+        },
+        {
+          "types": ["missiles", "powerbomb"],
+          "requires": [
+            "never"
+          ]
+        }
+      ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Come In Shinecharging, Leave With Spark (HiJump Wall Climb, Full Runway)",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 9,
+          "openEnd": 0
+        }
+      },
+      "requires": [
+        "HiJump",
+        "canShinechargeMovementTricky",
+        "canFastWalljumpClimb",
+        "canInsaneJump",
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "unlocksDoors": [
+        {
+          "types": ["super"],
+          "requires": []
+        },
+        {
+          "types": ["missiles", "powerbomb"],
+          "requires": [
+            "never"
+          ]
+        }
+      ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Come In Shinecharging, Leave With Spark (Bootless Wall Climb)",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 0,
+          "openEnd": 1
+        }
+      },
+      "requires": [
+        "canShinechargeMovementTricky",
+        "canFastWalljumpClimb",
+        "canInsaneJump",
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "unlocksDoors": [
+        {
+          "types": ["super"],
+          "requires": []
+        },
+        {
+          "types": ["missiles", "powerbomb"],
+          "requires": [
+            "never"
+          ]
+        }
+      ]
+    },
     {
       "id": 9,
       "link": [2, 1],
@@ -289,7 +414,7 @@
       "name": "Come In Shinecharged for Item Grab and Escape",
       "entranceCondition": {
         "comeInShinecharged": {
-          "framesRequired": 60
+          "framesRequired": 70
         }
       },
       "requires": [