Skip to content

Commit 63adb4d

Browse files
kjbranchkjbranch
authored
Merge pull request #1524 from osse101/LogicChanges
Add more leniencies and trickyjump requirements
2 parents 3212680 + 3a80b09 commit 63adb4d

16 files changed

Lines changed: 290 additions & 95 deletions

‎helpers.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,28 @@
365365
]}
366366
]}
367367
]
368+
},
369+
{
370+
"name": "h_SpringwallOverSpikes",
371+
"requires": [
372+
"canSpringwall",
373+
{"or":[
374+
"canTrickyJump",
375+
{"spikeHits": 2}
376+
]}
377+
],
378+
"devNote": "2 extra attempts for leniency."
379+
},
380+
{
381+
"name": "h_HeatedSpringwall",
382+
"requires": [
383+
"canSpringwall",
384+
{"or":[
385+
"canTrickyJump",
386+
{"heatFrames": 500}
387+
]}
388+
],
389+
"devNote": "2 extra attempts for leniency."
368390
}
369391
]
370392
},

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 42 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,7 @@
794794
"link": [3, 4],
795795
"name": "Base",
796796
"requires": [
797-
{"spikeHits": 4}
797+
{"spikeHits": 5}
798798
]
799799
},
800800
{
@@ -804,7 +804,21 @@
804804
"canIframeSpikeJump",
805805
{"or": [
806806
{"and": [
807-
"canTrickyJump",
807+
"canInsaneJump",
808+
{"spikeHits": 2}
809+
]},
810+
{"spikeHits": 3}
811+
]}
812+
]
813+
},
814+
{
815+
"link": [3, 4],
816+
"name": "Spike Damage Boost",
817+
"requires": [
818+
"canHorizontalDamageBoost",
819+
{"or": [
820+
{"and": [
821+
"canInsaneJump",
808822
{"spikeHits": 2}
809823
]},
810824
{"spikeHits": 3}
@@ -832,8 +846,11 @@
832846
"link": [4, 1],
833847
"name": "X-Ray Access Springwall",
834848
"requires": [
835-
"canSpringwall",
836-
{"spikeHits": 1}
849+
"h_SpringwallOverSpikes",
850+
{"or": [
851+
{"spikeHits": 1},
852+
"canInsaneJump"
853+
]}
837854
]
838855
},
839856
{
@@ -856,9 +873,27 @@
856873
"HiJump",
857874
"SpeedBooster",
858875
{"or": [
859-
"canTrickyJump",
860-
"canWalljump"
876+
{"and": [
877+
"canWalljump",
878+
{"or": [
879+
"canTrickyJump",
880+
{"spikeHits": 1}
881+
]}
882+
]},
883+
{"and": [
884+
"canTrickyDashJump",
885+
"h_canBackIntoCorner",
886+
"canInsaneJump"
887+
]},
888+
{"and": [
889+
"canTrickyDashJump",
890+
{"spikeHits": 1}
891+
]}
861892
]}
893+
],
894+
"note": [
895+
"Run and jump from the safe stair to just reach the door ledge.",
896+
"To avoid walljumping, use a full speed jump or jump from on top of the spikes (stairs or floor)."
862897
]
863898
},
864899
{
@@ -891,6 +926,7 @@
891926
]},
892927
{"and": [
893928
{"spikeHits": 1},
929+
"canHorizontalDamageBoost",
894930
"canPreciseWalljump",
895931
"canIframeSpikeJump"
896932
]}

‎region/lowernorfair/east/The Worst Room In The Game.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1211,7 +1211,7 @@
12111211
"name": "Writg Springwall",
12121212
"requires": [
12131213
"h_canNavigateHeatRooms",
1214-
"canSpringwall",
1214+
"h_HeatedSpringwall",
12151215
"canConsecutiveWalljump",
12161216
{"heatFrames": 300},
12171217
{"or": [

‎region/lowernorfair/west/Golden Torizo's Room.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,8 +1100,7 @@
11001100
"requires": [
11011101
"h_canNavigateHeatRooms",
11021102
"h_canUseMorphBombs",
1103-
"canSpringwall",
1104-
"canTrickySpringBallJump",
1103+
"h_HeatedSpringwall",
11051104
{"heatFrames": 900}
11061105
],
11071106
"note": [

‎region/lowernorfair/west/Screw Attack Room.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,7 @@
638638
"requires": [
639639
"h_canNavigateHeatRooms",
640640
"h_canUseMorphBombs",
641-
"canSpringwall",
642-
"canTrickySpringBallJump",
641+
"h_HeatedSpringwall",
643642
{"heatFrames": 300}
644643
],
645644
"clearsObstacles": ["A"],
@@ -1061,8 +1060,8 @@
10611060
"name": "Springwall",
10621061
"requires": [
10631062
"h_canNavigateHeatRooms",
1064-
"canSpringwall",
1065-
{"heatFrames": 400}
1063+
"h_HeatedSpringwall",
1064+
{"heatFrames": 245}
10661065
]
10671066
},
10681067
{

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,6 @@
705705
"requires": [
706706
"Gravity",
707707
"canSpringwall",
708-
"canTrickySpringBallJump",
709708
{"resetRoom": {
710709
"nodes": [1]
711710
}}

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

Lines changed: 45 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,20 @@
714714
"canSuitlessMaridia",
715715
"HiJump",
716716
{"or": [
717-
"canCarefulJump",
717+
"canTrickyJump",
718+
"canDodgeWhileShooting",
719+
{"enemyDamage": {
720+
"enemy": "Pink Space Pirate (standing)",
721+
"type": "contact",
722+
"hits": 1
723+
}},
724+
{"enemyKill": {
725+
"enemies": [["Pink Space Pirate (standing)"]],
726+
"explicitWeapons": ["Plasma"]
727+
}}
728+
]},
729+
{"or": [
730+
"canTrickyJump",
718731
"canSpringBallJumpMidAir",
719732
{"enemyDamage": {
720733
"enemy": "Pink Space Pirate (standing)",
@@ -726,7 +739,8 @@
726739
"explicitWeapons": ["Plasma"]
727740
}}
728741
]}
729-
]
742+
],
743+
"note": "Shooting towards Pirates will cause them to stop in place and not fire back."
730744
},
731745
{
732746
"link": [2, 6],
@@ -738,6 +752,19 @@
738752
"canStationaryLateralMidAirMorph",
739753
"canSpringFling"
740754
]},
755+
{"or": [
756+
"canTrickyJump",
757+
"canDodgeWhileShooting",
758+
{"enemyDamage": {
759+
"enemy": "Pink Space Pirate (standing)",
760+
"type": "contact",
761+
"hits": 1
762+
}},
763+
{"enemyKill": {
764+
"enemies": [["Pink Space Pirate (standing)"]],
765+
"explicitWeapons": ["Plasma"]
766+
}}
767+
]},
741768
{"or": [
742769
"canTrickyJump",
743770
{"enemyDamage": {
@@ -754,7 +781,8 @@
754781
"note": [
755782
"The second jump is harder than a normal mid-air springball jump.",
756783
"Use either a stationary lateral mid air morph, to gain enough horizontal momentum,",
757-
"or a SpringFling to reduce Samus' fall speed as soon as it begins to build up."
784+
"or a SpringFling to reduce Samus' fall speed as soon as it begins to build up.",
785+
"Shooting towards Pirates will cause them to stop in place and not fire back."
758786
]
759787
},
760788
{
@@ -1370,13 +1398,24 @@
13701398
},
13711399
{
13721400
"link": [6, 7],
1373-
"name": "Suitless",
1401+
"name": "Suitless HiJump",
13741402
"requires": [
13751403
"canSuitlessMaridia",
13761404
"canCarefulJump",
1405+
"HiJump"
1406+
]
1407+
},
1408+
{
1409+
"link": [6, 7],
1410+
"name": "Suitless Springball",
1411+
"requires": [
1412+
"canSuitlessMaridia",
1413+
"canCarefulJump",
1414+
"canSpringBallJumpMidAir",
13771415
{"or": [
1378-
"HiJump",
1379-
"canSpringBallJumpMidAir"
1416+
"canTrickyJump",
1417+
"canStationaryLateralMidAirMorph",
1418+
"canSpringFling"
13801419
]}
13811420
]
13821421
},

‎region/maridia/outer/Main Street.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2869,7 +2869,13 @@
28692869
"Spazer",
28702870
"Wave"
28712871
]},
2872-
"h_canMaxHeightSpringBallJump",
2872+
{"and": [
2873+
"h_canMaxHeightSpringBallJump",
2874+
{"or": [
2875+
"Wave",
2876+
"Spazer"
2877+
]}
2878+
]},
28732879
"Plasma"
28742880
]},
28752881
{"or": [

‎region/maridia/outer/Mama Turtle Room.json‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,11 @@
374374
]}
375375
],
376376
"clearsObstacles": ["A"],
377-
"note": "Requires getting back on Mama Turtle while she is at the right."
377+
"note": [
378+
"Requires getting back on Mama Turtle while she is at the right.",
379+
"The safest way is to have a normalized fall speed with either a full height jump or falling from the ledge above.",
380+
"Shrinking Samus' hitbox after touching the turtles back will also usually help."
381+
]
378382
},
379383
{
380384
"link": [1, 3],
@@ -618,16 +622,7 @@
618622
"requires": [
619623
"canSuitlessMaridia",
620624
"canCarefulJump",
621-
{"or": [
622-
"HiJump",
623-
"Morph"
624-
]},
625-
{"or": [
626-
"HiJump",
627-
"canSpringBallJumpMidAir",
628-
"h_canCrouchJumpDownGrab",
629-
"canUseEnemies"
630-
]}
625+
"HiJump"
631626
]
632627
},
633628
{
@@ -636,18 +631,26 @@
636631
"requires": [
637632
"canSuitlessMaridia",
638633
"canTrickyJump",
639-
"canUseEnemies"
634+
{"or": [
635+
"canSpringBallJumpMidAir",
636+
"h_canCrouchJumpDownGrab",
637+
"canUseEnemies"
638+
]}
640639
],
641640
"note": [
642641
"Jump over or on to Mama Turtle.",
643-
"The easiest method is to jump over her by jumping on her babies, spin jumping off of them and over her, then breaking spin before landing."
642+
"The easiest method is to jump over her by jumping on her babies, or to Morph under her."
644643
]
645644
},
646645
{
647646
"link": [4, 2],
648647
"name": "Grapple",
649648
"requires": [
650-
"Grapple"
649+
"Grapple",
650+
{"or": [
651+
"HiJump",
652+
"canPreciseGrapple"
653+
]}
651654
],
652655
"clearsObstacles": ["B"],
653656
"note": [
@@ -699,6 +702,30 @@
699702
]}
700703
]
701704
},
705+
{
706+
"link": [4, 3],
707+
"name": "Reveal Item while Jumping",
708+
"requires": [
709+
"canDodgeWhileShooting",
710+
"canCarefulJump",
711+
{"or": [
712+
"Wave",
713+
"Spazer",
714+
{"and":[
715+
"canTrickyJump",
716+
"canDodgeWhileShooting",
717+
{"ammo": {"type": "Missile", "count": 5}}
718+
]},
719+
{"and":[
720+
"canTrickyJump",
721+
"canResetFallSpeed",
722+
"canDownBack"
723+
]},
724+
"canInsaneJump"
725+
]}
726+
],
727+
"note": "Reveal the item while jumping to the right wall and collect it as Samus falls past."
728+
},
702729
{
703730
"link": [4, 5],
704731
"name": "Base",
@@ -714,8 +741,7 @@
714741
},
715742
{
716743
"link": [5, 2],
717-
"name": "Mama Turtle Wall Jump Bomb Boost",
718-
"notable": true,
744+
"name": "Wall Jump Bomb Boost",
719745
"requires": [
720746
"canWallJumpBombBoost"
721747
],
@@ -787,7 +813,6 @@
787813
"HiJump",
788814
"canInsaneJump",
789815
"canStationarySpinJump",
790-
"canConsecutiveWalljump",
791816
"canInsaneWalljump",
792817
"canCWJ"
793818
],

0 commit comments

Comments
 (0)