Add leniency runway for fish tank

Author: osse101

region/maridia/inner-pink/Aqueduct.json

@@ -1281,7 +1281,7 @@
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
-          "minTiles": 2.4375
+          "minTiles": 0.4375
         }
       },
       "requires": [
@@ -1300,29 +1300,6 @@
       ],
       "devNote": "In order for Samus to shinecharge without going too far to the right and without utilizing the low run speed, a one-tap or long adjacent runway is required."
     },
-    {
-      "id": 53,
-      "link": [2, 9],
-      "name": "Suitless Shinespark, Low Run Speed",
-      "entranceCondition": {
-        "comeInRunning": {
-          "speedBooster": true,
-          "minTiles": 0.4375
-        }
-      },
-      "requires": [
-        "canWaterShineCharge",
-        "canShinechargeMovementComplex",
-        "h_canShineChargeMaxRunway",
-        {"shinespark": {"frames": 34, "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.",
-        "Start running next to the transition (But at least 1 pixel away) so that Samus has very low run speed."
-      ],
-      "devNote": "Starting with low run speed is less obvious than trying to shortcharge."
-    },
     {
       "id": 54,
       "link": [2, 10],

region/maridia/outer/Fish Tank.json

@@ -891,21 +891,43 @@
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
-          "minTiles": 0.4375
+          "minTiles": 4.4375
         }
       },
       "requires": [
         "canWaterShineCharge",
         {"or": [
           {"shinespark": {"frames": 41, "excessFrames": 7}},
           {"and": [
+            "canDodgeWhileShooting",
             "canMidairShinespark",
             {"shinespark": {"frames": 38, "excessFrames": 7}}
           ]}
         ]}
       ],
       "note": "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge."
     },
+    {
+      "link": [2, 5],
+      "name": "Suitless Stutter Water Shinecharge",
+      "entranceCondition": {
+        "comeInRunning": {
+          "speedBooster": true,
+          "minTiles": 0.4375
+        }
+      },
+      "requires": [
+        "canStutterWaterShineCharge",
+        {"or": [
+          {"shinespark": {"frames": 41, "excessFrames": 7}},
+          {"and": [
+            "canDodgeWhileShooting",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 38, "excessFrames": 7}}
+          ]}
+        ]}
+      ]
+    },
     {
       "id": 88,
       "link": [2, 5],
@@ -1044,11 +1066,13 @@
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
-          "minTiles": 0.4375
+          "minTiles": 4.4375
         }
       },
       "requires": [
         "canWaterShineCharge",
+        "canShinechargeMovement",
+        "canDodgeWhileShooting",
         {"or": [
           {"shinespark": {"frames": 43, "excessFrames": 9}},
           {"and": [
@@ -1058,7 +1082,6 @@
         ]}
       ],
       "note": [
-        "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge.",
         "Spark up and fall onto the platform left of the fish."
       ]
     },
@@ -1069,7 +1092,7 @@
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": true,
-          "minTiles": 0.4375
+          "minTiles": 4.4375
         }
       },
       "requires": [
@@ -1114,8 +1137,85 @@
       "note": [
         "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge.",
         "With low energy, shinespark diagonally to the middle ledge on the left."
+      ]
+    },
+    {
+      "link": [2, 6],
+      "name": "Suitless Stutter Water Shinecharge Vertical Spark",
+      "entranceCondition": {
+        "comeInRunning": {
+          "speedBooster": true,
+          "minTiles": 0.4375
+        }
+      },
+      "requires": [
+        "canStutterWaterShineCharge",
+        "canShinechargeMovement",
+        "canDodgeWhileShooting",
+        {"or": [
+          {"shinespark": {"frames": 43, "excessFrames": 9}},
+          {"and": [
+            "canMidairShinespark",
+            {"shinespark": {"frames": 38, "excessFrames": 9}}
+          ]}
+        ]}
       ],
-      "devNote": "FIXME: It is possible to get over the space pirate, damageless, but it is challenging, especially when keeping the Skulltera alive for other frozen strats."
+      "note": [
+        "Spark up and fall onto the platform left of the fish."
+      ]
+    },
+    {
+      "link": [2, 6],
+      "name": "Suitless Stutter Water Shinecharge Diagonal Spark",
+      "entranceCondition": {
+        "comeInRunning": {
+          "speedBooster": true,
+          "minTiles": 0.4375
+        }
+      },
+      "requires": [
+        "canStutterWaterShineCharge",
+        {"or": [
+          {"shinespark": {"frames": 43, "excessFrames": 26}},
+          {"and": [
+            "canDodgeWhileShooting",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 38, "excessFrames": 25}}
+          ]}
+        ]},
+        {"or": [
+          {"enemyDamage": {
+            "enemy": "Pink Space Pirate (standing)",
+            "type": "contact",
+            "hits": 1
+          }},
+          {"enemyKill": {
+            "enemies": [["Pink Space Pirate (standing)"]],
+            "explicitWeapons": ["Plasma"]
+          }},
+          "h_pauseAbuseMinimalReserveRefill",
+          {"and": [
+            "canControlShinesparkEnd",
+            "canUseSpeedEchoes",
+            {"resourceAtMost": [{"type": "RegularEnergy", "count": 29}]}
+          ]},
+          {"and": [
+            "canInsaneJump",
+            "canTrickyDodgeEnemies"
+          ]}
+        ]},
+        {"or": [
+          "h_canCrouchJumpDownGrab",
+          "canSpringBallJumpMidAir",
+          {"and": [
+            "Ice",
+            "Plasma"
+          ]}
+        ]}
+      ],
+      "note": [
+        "With low energy, shinespark diagonally to the middle ledge on the left."
+      ]
     },
     {
       "id": 43,