Skip to content

Commit eb32fa6

Browse files
osse101osse101
authored
Merge pull request #1534 from osse101/CrocsSmile
Various logic changes
2 parents d5fcd92 + 599304b commit eb32fa6

12 files changed

Lines changed: 229 additions & 46 deletions

File tree

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
"link": [1, 8],
522522
"name": "SpeedBooster",
523523
"entranceCondition": {
524-
"comeInShinecharging": {
524+
"comeInGettingBlueSpeed": {
525525
"length": 13,
526526
"openEnd": 0,
527527
"steepUpTiles": 2,
@@ -530,6 +530,32 @@
530530
},
531531
"requires": []
532532
},
533+
{
534+
"link": [1, 8],
535+
"name": "In Room Shortcharge",
536+
"requires": [
537+
{"or": [
538+
{"and": [
539+
{"doorUnlockedAtNode": 1},
540+
{"canShineCharge": {
541+
"usedTiles": 14,
542+
"steepUpTiles": 2,
543+
"steepDownTiles": 2,
544+
"openEnd": 0
545+
}}
546+
]},
547+
{"canShineCharge": {
548+
"usedTiles": 13,
549+
"steepUpTiles": 2,
550+
"steepDownTiles": 2,
551+
"openEnd": 0
552+
}}
553+
]}
554+
],
555+
"unlocksDoors": [
556+
{"nodeId": 1, "types": ["ammo"], "requires": []}
557+
]
558+
},
533559
{
534560
"link": [1, 8],
535561
"name": "G-Mode through Terminator Bomb Blocks (from Left)",
@@ -1299,6 +1325,7 @@
12991325
"name": "Space Jump Alcatraz Escape",
13001326
"requires": [
13011327
"canMidAirMorph",
1328+
"canCarefulJump",
13021329
"SpaceJump"
13031330
]
13041331
},

‎region/crateria/east/The Moat.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@
190190
"requires": [
191191
"canSpringBallBounce",
192192
"canDisableEquipment",
193+
{"or": [
194+
"canTrickyJump",
195+
"h_canUseMorphBombs"
196+
]},
193197
{"obstaclesNotCleared": ["A"]}
194198
],
195199
"reusableRoomwideNotable": "Moat SpringBall Bounce",
@@ -203,6 +207,10 @@
203207
"canSpringBallBounce",
204208
"canDisableEquipment",
205209
{"doorUnlockedAtNode": 1},
210+
{"or": [
211+
"canTrickyJump",
212+
"h_canUseMorphBombs"
213+
]},
206214
{"obstaclesNotCleared": ["A"]}
207215
],
208216
"reusableRoomwideNotable": "Moat SpringBall Bounce",

‎region/maridia/inner-pink/Botwoon Energy Tank Room.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -605,19 +605,22 @@
605605
"link": [1, 5],
606606
"name": "Cross Room Jump with Speedbooster",
607607
"entranceCondition": {
608-
"comeInJumping": {
608+
"comeInRunning": {
609609
"speedBooster": true,
610-
"minTiles": 43
610+
"minTiles": 40
611611
}
612612
},
613613
"requires": [
614-
"canTrickyJump",
614+
"canInsaneJump",
615615
"canLateralMidAirMorph",
616-
"canCrossRoomJumpIntoWater"
616+
"canCrossRoomJumpIntoWater",
617+
"canMomentumConservingMorph"
617618
],
618619
"note": [
619-
"Needs max horizontal speed coming from 43 runway tiles in the adjacent room.",
620-
"Jump after the transition."
620+
"Needs near max horizontal speed coming from about 40 runway tiles in the adjacent room.",
621+
"Jump after the transition.",
622+
"Running a longer on the short runway is more difficult at maximum speed, but will increase the success of the jump.",
623+
"A crisp momentum conserving morph can also make up for a jump that is buffered through the door."
621624
]
622625
},
623626
{

‎region/maridia/inner-pink/West Sand Hole.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,13 @@
426426
"link": [5, 6],
427427
"name": "West Sand Hole MidAir Morph",
428428
"requires": [
429-
"h_canFourTileJumpMorph"
429+
{"or": [
430+
"h_canFourTileJumpMorph",
431+
{"and": [
432+
"canPreciseWalljump",
433+
"canWallJumpInstantMorph"
434+
]}
435+
]}
430436
]
431437
},
432438
{

‎region/maridia/inner-yellow/Northwest Maridia Bug Room.json‎

Lines changed: 60 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -442,15 +442,58 @@
442442
"name": "Base",
443443
"requires": [
444444
{"or": [
445-
"HiJump",
445+
{"and": [
446+
"HiJump",
447+
{"or": [
448+
"canCrouchJump",
449+
"canDownGrab",
450+
"canWalljump",
451+
"SpeedBooster"
452+
]}
453+
]},
446454
"SpaceJump",
447-
"canTrickyDashJump",
448-
"canTrickyUseFrozenEnemies",
449-
"canPreciseWalljump"
455+
"canTrickyDashJump"
450456
]}
451457
],
452458
"devNote": "The menus don't really matter with these strats."
453459
},
460+
{
461+
"link": [3, 1],
462+
"name": "Tricky Menu Avoid",
463+
"requires": [
464+
"canTrickyJump",
465+
{"or": [
466+
"canPreciseWalljump",
467+
"canSpringBallJumpMidAir"
468+
]}
469+
]
470+
},
471+
{
472+
"link": [3, 1],
473+
"name": "Frozen Menu Platforms",
474+
"requires": [
475+
"canUseFrozenEnemies",
476+
{"or": [
477+
"Plasma",
478+
"Wave",
479+
"Spazer",
480+
"canTrickyJump",
481+
{"enemyDamage": {
482+
"enemy": "Menu",
483+
"type": "contact",
484+
"hits": 1
485+
}}
486+
]},
487+
{"or": [
488+
"canDodgeWhileShooting",
489+
{"enemyDamage": {
490+
"enemy": "Menu",
491+
"type": "contact",
492+
"hits": 1
493+
}}
494+
]}
495+
]
496+
},
454497
{
455498
"link": [3, 1],
456499
"name": "Kill the Menus",
@@ -466,34 +509,34 @@
466509
"explicitWeapons": [
467510
"PowerBomb",
468511
"ScrewAttack",
469-
"Wave",
470-
"Spazer",
471512
"Plasma",
472513
"Missile",
473-
"Super"
514+
"Super",
515+
"Grapple"
474516
]
475517
}},
476518
{"and": [
477519
{"enemyKill": {
478520
"enemies": [["Menu", "Menu", "Menu"]]
479521
}},
480522
{"or": [
523+
"canFarmWhileShooting",
481524
{"and": [
482525
"canDodgeWhileShooting",
483-
"canTrickyJump"
484-
]},
485-
{"and": [
486-
"canDodgeWhileShooting",
487-
{"enemyDamage": {
488-
"enemy": "Menu",
489-
"type": "contact",
490-
"hits": 1
491-
}}
526+
{"or": [
527+
"Wave",
528+
"Spazer",
529+
{"enemyDamage": {
530+
"enemy": "Menu",
531+
"type": "contact",
532+
"hits": 1
533+
}}
534+
]}
492535
]},
493536
{"enemyDamage": {
494537
"enemy": "Menu",
495538
"type": "contact",
496-
"hits": 2
539+
"hits": 3
497540
}}
498541
]}
499542
]}

‎region/maridia/outer/Crab Tunnel.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,13 +262,30 @@
262262
"link": [2, 1],
263263
"name": "Green Gate Glitch",
264264
"requires": [
265+
"Gravity",
265266
{"or": [
266267
"h_canGreenGateGlitch",
267268
{"obstaclesCleared": ["A"]}
268269
]}
269270
],
270271
"clearsObstacles": ["A"]
271272
},
273+
{
274+
"link": [2, 1],
275+
"name": "Crab Tunnel Suitless Green Gate Glitch",
276+
"notable": true,
277+
"requires": [
278+
{"or": [
279+
"h_canGreenGateGlitch",
280+
{"obstaclesCleared": ["A"]}
281+
]}
282+
],
283+
"clearsObstacles": ["A"],
284+
"note": [
285+
"Perform the Gate Glitch by moving towards the gate and firing the super on the correct frame for it to pass through and reach the button on the other side.",
286+
"Due to the water physics, many traditional setups for the glitch will not work."
287+
]
288+
},
272289
{
273290
"link": [2, 1],
274291
"name": "Indirect G-Mode Gate Despawn",

‎region/maridia/outer/Mt. Everest.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3536,14 +3536,16 @@
35363536
{"or": [
35373537
"canTrickyJump",
35383538
{"and": [
3539-
"canLateralMidAirMorph",
3540-
"canCarefulJump"
3539+
"can4HighMidAirMorph",
3540+
"canCarefulJump",
3541+
"canLateralMidAirMorph"
35413542
]}
35423543
]}
35433544
],
35443545
"note": [
3545-
"Running does not help. This is most easily done with a late jump at the bottom of the slope.",
3546-
"It is a bit less precise with an air ball or turning gravity suit back on and wall jumping on the platform at the end."
3546+
"This is most easily done with a late jump at the bottom of the slope.",
3547+
"It is a bit less precise with an air ball or turning gravity suit back on and wall jumping on the platform at the end.",
3548+
"An alternate method is to airball simultaneously with the gravity jump pause."
35473549
]
35483550
},
35493551
{

‎region/norfair/crocomire/Crocomire's Room.json‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,11 @@
8080
"name": "Missiles",
8181
"notable": false,
8282
"requires": [
83-
{"ammo": {"type": "Missile", "count": 50}}
83+
{"ammo": {"type": "Missile", "count": 25}},
84+
{"or": [
85+
"canDodgeWhileShooting",
86+
{"ammo": {"type": "Missile", "count": 25}}
87+
]}
8488
],
8589
"devNote": "Some farming will still be useful, but without dodging efficiently, many of the drops will be energy."
8690
},
@@ -89,14 +93,11 @@
8993
"notable": false,
9094
"requires": [
9195
"canDodgeWhileShooting",
96+
"canTrickyJump",
9297
{"or": [
9398
{"ammo": {"type": "Missile", "count": 2}},
9499
{"ammo": {"type": "Super", "count": 2}}
95100
]},
96-
{"or": [
97-
"canTrickyJump",
98-
{"ammo": {"type": "Missile", "count": 25}}
99-
]},
100101
{"resourceCapacity": [{"type": "Missile", "count": 10}]}
101102
],
102103
"note": "Farming requires somewhat careful dodging in order to minimize energy drops.",
@@ -112,25 +113,27 @@
112113
{"ammo": {"type": "Super", "count": 8}},
113114
{"or": [
114115
"canDodgeWhileShooting",
115-
{"ammo": {"type": "Super", "count": 5}}
116+
{"ammo": {"type": "Super", "count": 4}}
116117
]},
117118
{"or": [
118-
"canTrickyJump",
119-
{"ammo": {"type": "Super", "count": 2}}
119+
"canFarmWhileShooting",
120+
{"ammo": {"type": "Super", "count": 4}}
120121
]}
121122
],
122123
"note": [
124+
"The hitbox on Croc's mouth may cause direct hits to miss, so jumping and shooting Supers horizontally is recommended.",
123125
"While Crocomire's farmables may drop Supers, the rate is too low to rely on.",
124126
"If you run out, Croc will most likely push you into the spikes.",
125127
"It takes 8 Supers to kill croc if you don't let it move forward."
126-
]
128+
],
129+
"devNote": "canFarmWhileShooting represents accurate shooting, not the ability to farm drops."
127130
},
128131
{
129132
"name": "Crocomire with 5 Missiles",
130133
"notable": true,
131134
"requires": [
132-
"canDodgeWhileShooting",
133-
"canBeVeryPatient",
135+
"canFarmWhileShooting",
136+
"canBePatient",
134137
{"or": [
135138
{"ammo": {"type": "Missile", "count": 2}},
136139
{"ammo": {"type": "Super", "count": 2}}

‎region/norfair/west/Crocomire Escape.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,42 @@
637637
],
638638
"note": "This strat just waits out the Dragon."
639639
},
640+
{
641+
"link": [3, 2],
642+
"name": "Reverse Shinespark",
643+
"requires": [
644+
"canHorizontalShinespark",
645+
{"or": [
646+
{"and": [
647+
{"ammo": {"type": "Super", "count": 1}},
648+
{"heatFrames": 90}
649+
]},
650+
{"obstaclesCleared": ["A"]}
651+
]},
652+
{"or": [
653+
{"and": [
654+
{"doorUnlockedAtNode": 1},
655+
{"heatFrames": 30},
656+
{"canShineCharge": {
657+
"usedTiles": 17,
658+
"openEnd": 0
659+
}}
660+
]},
661+
{"canShineCharge": {
662+
"usedTiles": 16,
663+
"openEnd": 0
664+
}}
665+
]},
666+
{"shinespark": {"frames": 62, "excessFrames": 20}},
667+
{"heatFrames": 450}
668+
],
669+
"clearsObstacles": ["A"],
670+
"unlocksDoors": [
671+
{"nodeId": 1, "types": ["missiles"], "requires": [{"heatFrames": 30}]},
672+
{"nodeId": 1, "types": ["super"], "requires": []},
673+
{"nodeId": 1, "types": ["powerbomb"], "requires": [{"heatFrames": 60}]}
674+
]
675+
},
640676
{
641677
"link": [3, 3],
642678
"name": "Crystal Flash",

0 commit comments

Comments
 (0)