Skip to content

Commit 6e072f2

Browse files
osse101osse101
authored
Merge pull request #1785 from osse101/WaterRun
Add leniency runway for fish tank
2 parents 7b6f305 + c7a9d45 commit 6e072f2

2 files changed

Lines changed: 151 additions & 27 deletions

File tree

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,35 +1275,27 @@
12751275
]
12761276
},
12771277
{
1278-
"id": 52,
12791278
"link": [2, 9],
12801279
"name": "Suitless Shinespark",
12811280
"entranceCondition": {
1282-
"comeInRunning": {
1283-
"speedBooster": true,
1284-
"minTiles": 2.4375
1281+
"comeInShinecharging": {
1282+
"length": 3,
1283+
"openEnd": 1
12851284
}
12861285
},
12871286
"requires": [
12881287
"canWaterShineCharge",
1289-
"canShinechargeMovement",
1290-
{"canShineCharge": {
1291-
"usedTiles": 25,
1292-
"openEnd": 2
1293-
}},
12941288
{"shinespark": {"frames": 37, "excessFrames": 3}}
12951289
],
12961290
"note": [
1297-
"Enter this room while holding dash in the previous room, before the door transition.",
1298-
"Do not release dash in the water or Samus will not be able to get blue speed.",
1299-
"This is easiest by starting next to the transition (But at least 1 pixel away) so that Samus has very low run speed."
1300-
],
1301-
"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."
1291+
"Begin shinecharging in the previous room and continue through the door transition.",
1292+
"Do not release dash in the water or Samus will not be able to get blue speed."
1293+
]
13021294
},
13031295
{
1304-
"id": 53,
1296+
"id": 52,
13051297
"link": [2, 9],
1306-
"name": "Suitless Shinespark, Low Run Speed",
1298+
"name": "Suitless Shinespark (Short Runway)",
13071299
"entranceCondition": {
13081300
"comeInRunning": {
13091301
"speedBooster": true,
@@ -1312,16 +1304,19 @@
13121304
},
13131305
"requires": [
13141306
"canWaterShineCharge",
1315-
"canShinechargeMovementComplex",
1316-
"h_canShineChargeMaxRunway",
1317-
{"shinespark": {"frames": 34, "excessFrames": 3}}
1307+
"canShinechargeMovement",
1308+
{"canShineCharge": {
1309+
"usedTiles": 25,
1310+
"openEnd": 2
1311+
}},
1312+
{"shinespark": {"frames": 37, "excessFrames": 3}}
13181313
],
13191314
"note": [
13201315
"Enter this room while holding dash in the previous room, before the door transition.",
13211316
"Do not release dash in the water or Samus will not be able to get blue speed.",
1322-
"Start running next to the transition (But at least 1 pixel away) so that Samus has very low run speed."
1317+
"This is easiest by starting close to the transition (but at least 2 pixels away) so that Samus has very low run speed."
13231318
],
1324-
"devNote": "Starting with low run speed is less obvious than trying to shortcharge."
1319+
"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."
13251320
},
13261321
{
13271322
"id": 54,

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 135 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -886,6 +886,34 @@
886886
},
887887
{
888888
"id": 36,
889+
"link": [2, 5],
890+
"name": "Suitless Water Shinecharge (Lenient)",
891+
"entranceCondition": {
892+
"comeInRunning": {
893+
"speedBooster": true,
894+
"minTiles": 4.4375
895+
}
896+
},
897+
"requires": [
898+
"canWaterShineCharge",
899+
{"canShineCharge": {
900+
"usedTiles": 23,
901+
"openEnd": 2
902+
}},
903+
{"or": [
904+
{"shinespark": {"frames": 41, "excessFrames": 7}},
905+
{"and": [
906+
"canDodgeWhileShooting",
907+
"canMidairShinespark",
908+
{"shinespark": {"frames": 38, "excessFrames": 7}}
909+
]}
910+
]}
911+
],
912+
"note": [
913+
"Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time."
914+
]
915+
},
916+
{
889917
"link": [2, 5],
890918
"name": "Suitless Water Shinecharge",
891919
"entranceCondition": {
@@ -896,15 +924,21 @@
896924
},
897925
"requires": [
898926
"canWaterShineCharge",
927+
"canTrickyJump",
928+
"h_canShineChargeMaxRunway",
899929
{"or": [
900930
{"shinespark": {"frames": 41, "excessFrames": 7}},
901931
{"and": [
932+
"canDodgeWhileShooting",
902933
"canMidairShinespark",
903934
{"shinespark": {"frames": 38, "excessFrames": 7}}
904935
]}
905936
]}
906937
],
907-
"note": "Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge."
938+
"note": [
939+
"Start the dash as close to the door transition as possible in order to store the shinespark in time.",
940+
"Stand 2 or 3 pixels from the door for run speed to be low enough going into the next room."
941+
]
908942
},
909943
{
910944
"id": 88,
@@ -1044,11 +1078,17 @@
10441078
"entranceCondition": {
10451079
"comeInRunning": {
10461080
"speedBooster": true,
1047-
"minTiles": 0.4375
1081+
"minTiles": 4.4375
10481082
}
10491083
},
10501084
"requires": [
10511085
"canWaterShineCharge",
1086+
"canShinechargeMovement",
1087+
"canDodgeWhileShooting",
1088+
{"canShineCharge": {
1089+
"usedTiles": 23,
1090+
"openEnd": 2
1091+
}},
10521092
{"or": [
10531093
{"shinespark": {"frames": 43, "excessFrames": 9}},
10541094
{"and": [
@@ -1058,7 +1098,7 @@
10581098
]}
10591099
],
10601100
"note": [
1061-
"Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge.",
1101+
"Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time.",
10621102
"Spark up and fall onto the platform left of the fish."
10631103
]
10641104
},
@@ -1069,11 +1109,15 @@
10691109
"entranceCondition": {
10701110
"comeInRunning": {
10711111
"speedBooster": true,
1072-
"minTiles": 0.4375
1112+
"minTiles": 4.4375
10731113
}
10741114
},
10751115
"requires": [
10761116
"canWaterShineCharge",
1117+
{"canShineCharge": {
1118+
"usedTiles": 23,
1119+
"openEnd": 2
1120+
}},
10771121
{"or": [
10781122
{"shinespark": {"frames": 43, "excessFrames": 26}},
10791123
{"and": [
@@ -1112,10 +1156,95 @@
11121156
]}
11131157
],
11141158
"note": [
1115-
"Start the dash as close to the door transition as possible in order to have a larger window for storing the shinecharge.",
1159+
"Reduce Samus' run speed with a stutter or late dash tap in order to complete the shinecharge in time.",
11161160
"With low energy, shinespark diagonally to the middle ledge on the left."
1161+
]
1162+
},
1163+
{
1164+
"link": [2, 6],
1165+
"name": "Suitless Water Shinecharge Vertical Spark (Short Runway)",
1166+
"entranceCondition": {
1167+
"comeInRunning": {
1168+
"speedBooster": true,
1169+
"minTiles": 0.4375
1170+
}
1171+
},
1172+
"requires": [
1173+
"canWaterShineCharge",
1174+
"canShinechargeMovement",
1175+
"canDodgeWhileShooting",
1176+
"canTrickyJump",
1177+
"h_canShineChargeMaxRunway",
1178+
{"or": [
1179+
{"shinespark": {"frames": 43, "excessFrames": 9}},
1180+
{"and": [
1181+
"canMidairShinespark",
1182+
{"shinespark": {"frames": 38, "excessFrames": 9}}
1183+
]}
1184+
]}
11171185
],
1118-
"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."
1186+
"note": [
1187+
"Start the dash as close to the door transition as possible in order to store the shinespark in time.",
1188+
"Stand 2 or 3 pixels from the door for run speed to be low enough going into the next room.",
1189+
"Spark up and fall onto the platform left of the fish."
1190+
]
1191+
},
1192+
{
1193+
"link": [2, 6],
1194+
"name": "Suitless Water Shinecharge Diagonal Spark (Short Runway)",
1195+
"entranceCondition": {
1196+
"comeInRunning": {
1197+
"speedBooster": true,
1198+
"minTiles": 0.4375
1199+
}
1200+
},
1201+
"requires": [
1202+
"canWaterShineCharge",
1203+
"canTrickyJump",
1204+
"h_canShineChargeMaxRunway",
1205+
{"or": [
1206+
{"shinespark": {"frames": 43, "excessFrames": 26}},
1207+
{"and": [
1208+
"canDodgeWhileShooting",
1209+
"canMidairShinespark",
1210+
{"shinespark": {"frames": 38, "excessFrames": 25}}
1211+
]}
1212+
]},
1213+
{"or": [
1214+
{"enemyDamage": {
1215+
"enemy": "Pink Space Pirate (standing)",
1216+
"type": "contact",
1217+
"hits": 1
1218+
}},
1219+
{"enemyKill": {
1220+
"enemies": [["Pink Space Pirate (standing)"]],
1221+
"explicitWeapons": ["Plasma"]
1222+
}},
1223+
"h_pauseAbuseMinimalReserveRefill",
1224+
{"and": [
1225+
"canControlShinesparkEnd",
1226+
"canUseSpeedEchoes",
1227+
{"resourceAtMost": [{"type": "RegularEnergy", "count": 29}]}
1228+
]},
1229+
{"and": [
1230+
"canInsaneJump",
1231+
"canTrickyDodgeEnemies"
1232+
]}
1233+
]},
1234+
{"or": [
1235+
"h_canCrouchJumpDownGrab",
1236+
"canSpringBallJumpMidAir",
1237+
{"and": [
1238+
"Ice",
1239+
"Plasma"
1240+
]}
1241+
]}
1242+
],
1243+
"note": [
1244+
"Start the dash as close to the door transition as possible in order to store the shinespark in time.",
1245+
"Stand 2 or 3 pixels from the door for run speed to be low enough going into the next room.",
1246+
"With low energy, shinespark diagonally to the middle ledge on the left."
1247+
]
11191248
},
11201249
{
11211250
"id": 43,

0 commit comments

Comments
 (0)