Add notes and balance

Author: osse101

region/maridia/inner-pink/Aqueduct.json

@@ -1275,9 +1275,27 @@
       ]
     },
     {
-      "id": 52,
       "link": [2, 9],
       "name": "Suitless Shinespark",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 3,
+          "openEnd": 1
+        }
+      },
+      "requires": [
+        "canWaterShineCharge",
+        {"shinespark": {"frames": 37, "excessFrames": 3}}
+      ],
+      "note": [
+        "Enter this room while holding dash in the previous room, before the door transition.",
+        "Do not release dash in the water or Samus will not be able to get blue speed."
+      ]
+    },
+    {
+      "id": 52,
+      "link": [2, 9],
+      "name": "Suitless Shinespark (Short Runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,

region/maridia/outer/Fish Tank.json

@@ -887,7 +887,7 @@
     {
       "id": 36,
       "link": [2, 5],
-      "name": "Suitless Water Shinecharge",
+      "name": "Suitless Water Shinecharge (Lenient)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
@@ -896,6 +896,10 @@
       },
       "requires": [
         "canWaterShineCharge",
+        {"canShineCharge": {
+          "usedTiles": 23,
+          "openEnd": 2
+        }},
         {"or": [
           {"shinespark": {"frames": 41, "excessFrames": 7}},
           {"and": [
@@ -905,19 +909,23 @@
           ]}
         ]}
       ],
-      "note": "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge."
+      "note": [
+        "Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time."
+      ]
     },
     {
       "link": [2, 5],
-      "name": "Suitless Stutter Water Shinecharge",
+      "name": "Suitless Water Shinecharge",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
           "minTiles": 0.4375
         }
       },
       "requires": [
-        "canStutterWaterShineCharge",
+        "canWaterShineCharge",
+        "canTrickyJump",
+        "h_canShineChargeMaxRunway",
         {"or": [
           {"shinespark": {"frames": 41, "excessFrames": 7}},
           {"and": [
@@ -926,6 +934,10 @@
             {"shinespark": {"frames": 38, "excessFrames": 7}}
           ]}
         ]}
+      ],
+      "note": [
+        "Start the dash as close to the door transition as possible in order to store the shinespark in time.",
+        "Stand 2 to 5 pixels from the door for run speed to be low enough going into the next room."
       ]
     },
     {
@@ -1073,6 +1085,10 @@
         "canWaterShineCharge",
         "canShinechargeMovement",
         "canDodgeWhileShooting",
+        {"canShineCharge": {
+          "usedTiles": 23,
+          "openEnd": 2
+        }},
         {"or": [
           {"shinespark": {"frames": 43, "excessFrames": 9}},
           {"and": [
@@ -1082,6 +1098,7 @@
         ]}
       ],
       "note": [
+        "Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time.",
         "Spark up and fall onto the platform left of the fish."
       ]
     },
@@ -1097,6 +1114,10 @@
       },
       "requires": [
         "canWaterShineCharge",
+        {"canShineCharge": {
+          "usedTiles": 23,
+          "openEnd": 2
+        }},
         {"or": [
           {"shinespark": {"frames": 43, "excessFrames": 26}},
           {"and": [
@@ -1135,23 +1156,25 @@
         ]}
       ],
       "note": [
-        "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge.",
+        "Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time.",
         "With low energy, shinespark diagonally to the middle ledge on the left."
       ]
     },
     {
       "link": [2, 6],
-      "name": "Suitless Stutter Water Shinecharge Vertical Spark",
+      "name": "Suitless Water Shinecharge Vertical Spark (Short Runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
           "minTiles": 0.4375
         }
       },
       "requires": [
-        "canStutterWaterShineCharge",
+        "canWaterShineCharge",
         "canShinechargeMovement",
         "canDodgeWhileShooting",
+        "canTrickyJump",
+        "h_canShineChargeMaxRunway",
         {"or": [
           {"shinespark": {"frames": 43, "excessFrames": 9}},
           {"and": [
@@ -1161,20 +1184,24 @@
         ]}
       ],
       "note": [
+        "Start the dash as close to the door transition as possible in order to store the shinespark in time.",
+        "Stand 2 to 5 pixels from the door for run speed to be low enough going into the next room.",
         "Spark up and fall onto the platform left of the fish."
       ]
     },
     {
       "link": [2, 6],
-      "name": "Suitless Stutter Water Shinecharge Diagonal Spark",
+      "name": "Suitless Water Shinecharge Diagonal Spark (Short Runway)",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
           "minTiles": 0.4375
         }
       },
       "requires": [
-        "canStutterWaterShineCharge",
+        "canWaterShineCharge",
+        "canTrickyJump",
+        "h_canShineChargeMaxRunway",
         {"or": [
           {"shinespark": {"frames": 43, "excessFrames": 26}},
           {"and": [
@@ -1214,6 +1241,8 @@
         ]}
       ],
       "note": [
+        "Start the dash as close to the door transition as possible in order to store the shinespark in time.",
+        "Stand 2 to 5 pixels from the door for run speed to be low enough going into the next room.",
         "With low energy, shinespark diagonally to the middle ledge on the left."
       ]
     },