Skip to content

Commit 4a856c1

Browse files
osse101osse101
authored
Merge pull request #2730 from kjbranch/easy-old-incompletes
Logic for some of the easy old incomplete videos
2 parents b58762c + 88ac9be commit 4a856c1

8 files changed

Lines changed: 173 additions & 7 deletions

File tree

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5153,8 +5153,7 @@
51535153
}
51545154
},
51555155
"requires": [
5156-
"canTrickyJump",
5157-
"canSpringBallBounce"
5156+
"canTrickyJump"
51585157
],
51595158
"flashSuitChecked": true,
51605159
"devNote": [

‎region/brinstar/red/Red Tower.json‎

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2086,7 +2086,24 @@
20862086
}
20872087
},
20882088
"requires": [
2089-
{"shinespark": {"frames": 45, "excessFrames": 5}}
2089+
{"or": [
2090+
{"shinespark": {"frames": 45, "excessFrames": 6}},
2091+
{"and": [
2092+
"canMidairShinespark",
2093+
{"shinespark": {"frames": 37, "excessFrames": 6}}
2094+
]},
2095+
{"and": [
2096+
"canMidairShinespark",
2097+
"HiJump",
2098+
{"shinespark": {"frames": 33, "excessFrames": 6}}
2099+
]},
2100+
{"and": [
2101+
"canShinechargeMovementComplex",
2102+
"HiJump",
2103+
"canSpeedyJump",
2104+
{"shinespark": {"frames": 26, "excessFrames": 5}}
2105+
]}
2106+
]}
20902107
],
20912108
"flashSuitChecked": true,
20922109
"devNote": [
@@ -2609,7 +2626,24 @@
26092626
}
26102627
},
26112628
"requires": [
2612-
{"shinespark": {"frames": 45, "excessFrames": 5}}
2629+
{"or": [
2630+
{"shinespark": {"frames": 45, "excessFrames": 6}},
2631+
{"and": [
2632+
"canMidairShinespark",
2633+
{"shinespark": {"frames": 37, "excessFrames": 6}}
2634+
]},
2635+
{"and": [
2636+
"canMidairShinespark",
2637+
"HiJump",
2638+
{"shinespark": {"frames": 33, "excessFrames": 6}}
2639+
]},
2640+
{"and": [
2641+
"canShinechargeMovementComplex",
2642+
"HiJump",
2643+
"canSpeedyJump",
2644+
{"shinespark": {"frames": 26, "excessFrames": 5}}
2645+
]}
2646+
]}
26132647
],
26142648
"flashSuitChecked": true,
26152649
"devNote": [
@@ -3206,6 +3240,47 @@
32063240
],
32073241
"flashSuitChecked": true
32083242
},
3243+
{
3244+
"link": [7, 6],
3245+
"name": "Shinespark (In-Room Shinecharge)",
3246+
"requires": [
3247+
{"or": [
3248+
{"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
3249+
{"and": [
3250+
{"or": [
3251+
{"doorUnlockedAtNode": 3},
3252+
{"doorUnlockedAtNode": 4}
3253+
]},
3254+
{"canShineCharge": {"usedTiles": 13, "openEnd": 0}}
3255+
]},
3256+
{"and": [
3257+
{"doorUnlockedAtNode": 3},
3258+
{"doorUnlockedAtNode": 4},
3259+
{"canShineCharge": {"usedTiles": 14, "openEnd": 0}}
3260+
]}
3261+
]},
3262+
"canMidairShinespark",
3263+
{"or": [
3264+
{"shinespark": {"frames": 37, "excessFrames": 6}},
3265+
{"and": [
3266+
"HiJump",
3267+
{"shinespark": {"frames": 33, "excessFrames": 6}}
3268+
]},
3269+
{"and": [
3270+
"canShinechargeMovementComplex",
3271+
"HiJump",
3272+
"canSpeedyJump",
3273+
{"shinespark": {"frames": 26, "excessFrames": 5}}
3274+
]}
3275+
]}
3276+
],
3277+
"unlocksDoors": [
3278+
{"nodeId": 3, "types": ["ammo"], "requires": []},
3279+
{"nodeId": 4, "types": ["ammo"], "requires": []}
3280+
],
3281+
"flashSuitChecked": true,
3282+
"blueSuitChecked": true
3283+
},
32093284
{
32103285
"id": 106,
32113286
"link": [7, 6],
@@ -3214,6 +3289,10 @@
32143289
"h_storedSpark",
32153290
{"or": [
32163291
{"shinespark": {"frames": 37, "excessFrames": 6}},
3292+
{"and": [
3293+
"HiJump",
3294+
{"shinespark": {"frames": 33, "excessFrames": 6}}
3295+
]},
32173296
{"and": [
32183297
"canConsecutiveWalljump",
32193298
{"shinespark": {"frames": 13, "excessFrames": 6}}

‎region/crateria/central/Climb Supers Room.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@
648648
},
649649
"requires": [
650650
"canTrickyJump",
651-
"canLateralMidAirMorph",
652651
"canSpringFling"
653652
],
654653
"flashSuitChecked": true,

‎region/crateria/central/Parlor and Alcatraz.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,21 @@
584584
"flashSuitChecked": true,
585585
"blueSuitChecked": true
586586
},
587+
{
588+
"link": [1, 8],
589+
"name": "Come in with Speedball",
590+
"entranceCondition": {
591+
"comeInSpeedballing": {
592+
"runway": {
593+
"length": 0,
594+
"openEnd": 1
595+
}
596+
}
597+
},
598+
"requires": [],
599+
"flashSuitChecked": true,
600+
"devNote": "None of the tiles in-room are usable, because there is no reason to speedball if you can come in gaining blue speed."
601+
},
587602
{
588603
"id": 12,
589604
"link": [1, 8],

‎region/crateria/west/Gauntlet Entrance.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,43 @@
447447
"flashSuitChecked": true,
448448
"blueSuitChecked": true
449449
},
450+
{
451+
"link": [1, 2],
452+
"name": "Come in Shinecharging, Shinespark",
453+
"entranceCondition": {
454+
"comeInShinecharging": {
455+
"length": 6,
456+
"openEnd": 0,
457+
"steepUpTiles": 1,
458+
"steepDownTiles": 1
459+
}
460+
},
461+
"requires": [
462+
"canHorizontalShinespark",
463+
{"or": [
464+
{"shinespark": {"frames": 92, "excessFrames": 9}},
465+
{"and": [
466+
"canHorizontalMidairShinespark",
467+
{"shinespark": {"frames": 86, "excessFrames": 16}}
468+
]},
469+
{"and": [
470+
"canShinechargeMovementComplex",
471+
"Morph",
472+
{"shinespark": {"frames": 66, "excessFrames": 0}}
473+
]}
474+
]}
475+
],
476+
"flashSuitChecked": true,
477+
"blueSuitChecked": true,
478+
"devNote": [
479+
"Shinespark against the bomb blocks or from the raised spot in order to make it all the way through",
480+
"to avoid bonking and potentially falling in the acid.",
481+
"With 99 Energy, it is best to spark from directly above the flat tile to the right of the raised part of the runway.",
482+
"With at least 105 Energy, it is best to spark against the right wall.",
483+
"With Morph, it is also possible to quickly spark from the flat tile or somewhat low if sparking midair,",
484+
"in order to bonk on the last row of bomb blocks and not fall into the acid."
485+
]
486+
},
450487
{
451488
"id": 12,
452489
"link": [1, 2],

‎region/lowernorfair/east/Main Hall.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,6 @@
590590
}
591591
},
592592
"requires": [
593-
"canSpringBallBounce",
594593
{"heatFrames": 265}
595594
],
596595
"flashSuitChecked": true

‎region/maridia/inner-pink/Draygon's Room.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1175,6 +1175,24 @@
11751175
"flashSuitChecked": true,
11761176
"devNote": "FIXME: with this and several other cross-room strats, it would be possible to leave with temporary blue, if we had a way to encode the requirement to come in blue."
11771177
},
1178+
{
1179+
"link": [1, 2],
1180+
"name": "Cross Room Spring Ball Bounce",
1181+
"entranceCondition": {
1182+
"comeInWithSpringBallBounce": {
1183+
"speedBooster": "any",
1184+
"movementType": "uncontrolled",
1185+
"remoteAndLandingMinTiles": [[1, 1]]
1186+
}
1187+
},
1188+
"requires": [
1189+
"canCrossRoomJumpIntoWater"
1190+
],
1191+
"flashSuitChecked": true,
1192+
"blueSuitChecked": true,
1193+
"note": "Perform an uncontrolled Spring Ball Bounce near the door. This requires touching approximately the bottom third of the transition.",
1194+
"devNote": "With more than a single tile at the door, it is likely easier to use the runway and spin jump instead."
1195+
},
11781196
{
11791197
"id": 60,
11801198
"link": [1, 2],

‎region/wreckedship/main/Bowling Alley.json‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1025,6 +1025,27 @@
10251025
],
10261026
"flashSuitChecked": true
10271027
},
1028+
{
1029+
"link": [2, 6],
1030+
"name": "Come In Shinecharging, Shinespark",
1031+
"entranceCondition": {
1032+
"comeInShinecharging": {
1033+
"length": 2,
1034+
"openEnd": 0
1035+
}
1036+
},
1037+
"requires": [
1038+
{"or": [
1039+
{"shinespark": {"frames": 89, "excessFrames": 7}},
1040+
{"and": [
1041+
"canHorizontalMidairShinespark",
1042+
{"shinespark": {"frames": 82, "excessFrames": 9}}
1043+
]}
1044+
]}
1045+
],
1046+
"flashSuitChecked": true,
1047+
"blueSuitChecked": true
1048+
},
10281049
{
10291050
"id": 74,
10301051
"link": [2, 6],
@@ -1114,7 +1135,6 @@
11141135
"requires": [
11151136
"canTrickyJump",
11161137
"canSpringFling",
1117-
"canLateralMidAirMorph",
11181138
"canUseIFrames",
11191139
{"spikeHits": 1}
11201140
],

0 commit comments

Comments
 (0)