Skip to content

Commit 31d9be2

Browse files
blkerbyblkerby
committed
feedback updates
1 parent fb9cdfb commit 31d9be2

2 files changed

Lines changed: 144 additions & 20 deletions

File tree

‎helpers.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,6 +1949,15 @@
19491949
"h_thornXModeShinecharge",
19501950
"h_thornXModeBlueSuit"
19511951
]
1952+
},
1953+
{
1954+
"name": "h_spikeJumpWithActiveEnemies",
1955+
"requires": [
1956+
{"or": [
1957+
{"noBlueSuit": {}},
1958+
"canBlueSuitSpikeJump"
1959+
]}
1960+
]
19521961
}
19531962
]
19541963
}

‎region/norfair/east/Double Chamber.json‎

Lines changed: 135 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -366,12 +366,29 @@
366366
{"or": [
367367
"SpaceJump",
368368
"canTrickySpringBallJump",
369-
"canWalljump",
369+
{"and": [
370+
"canWalljump",
371+
{"or": [
372+
"canDash",
373+
"HiJump",
374+
{"and": [
375+
"canBlueSuitSpikeJump",
376+
{"spikeHits": 1}
377+
]}
378+
]}
379+
]},
370380
{"and": [
371381
"HiJump",
372382
"canSpeedyJump"
373383
]},
374-
"canPreciseGrapple"
384+
{"and": [
385+
"canPreciseGrapple",
386+
{"or": [
387+
"canDash",
388+
"canUseEnemies",
389+
"canInsaneJump"
390+
]}
391+
]}
375392
]},
376393
"h_heatedGModeOpenDifferentDoor"
377394
],
@@ -417,22 +434,30 @@
417434
"Morph",
418435
{"or": [
419436
"SpaceJump",
420-
"canPreciseGrapple",
437+
{"and": [
438+
"canPreciseGrapple",
439+
"canUseEnemies"
440+
]},
421441
{"and": [
422442
"HiJump",
423443
"canSpringBallJumpMidAir"
424444
]},
425445
{"and": [
446+
"canDash",
426447
"HiJump",
427448
"canWalljump",
428449
"canTrickyJump"
429450
]},
430451
{"and": [
431452
"canWalljump",
432453
"canUseIFrames",
433-
{"spikeHits": 1}
454+
{"spikeHits": 1},
455+
"h_spikeJumpWithActiveEnemies"
434456
]},
435-
"h_IBJFromSpikes"
457+
{"and": [
458+
"h_IBJFromSpikes",
459+
"h_spikeJumpWithActiveEnemies"
460+
]}
436461
]},
437462
"h_heatedGModeOpenDifferentDoor"
438463
],
@@ -552,7 +577,10 @@
552577
"Morph",
553578
{"or": [
554579
"SpaceJump",
555-
"canPreciseGrapple",
580+
{"and": [
581+
"canPreciseGrapple",
582+
"canUseEnemies"
583+
]},
556584
{"and": [
557585
"HiJump",
558586
"canSpringBallJumpMidAir"
@@ -759,6 +787,7 @@
759787
"canTrickyWalljump",
760788
"canConsecutiveWalljump",
761789
"canTrickyJump",
790+
"canFastWalljumpClimb",
762791
"canUseEnemies",
763792
{"heatFrames": 120},
764793
{"or": [
@@ -770,7 +799,8 @@
770799
"blueSuitChecked": true,
771800
"note": "Wall jump up the left wall, perform a delayed wall jump on the Fune to reach the door.",
772801
"devNote": [
773-
"This differs from the canPrepareForNextRoom option of the previous strat only in requiring an air entry."
802+
"This differs from the canPrepareForNextRoom option of the previous strat only in requiring an air entry.",
803+
"FIXME: canFastWalljumpClimb is for difficulty placement."
774804
]
775805
},
776806
{
@@ -1676,7 +1706,17 @@
16761706
{"or": [
16771707
"SpaceJump",
16781708
"canTrickySpringBallJump",
1679-
"canWalljump",
1709+
{"and": [
1710+
"canWalljump",
1711+
{"or": [
1712+
"canDash",
1713+
"HiJump",
1714+
{"and": [
1715+
"canBlueSuitSpikeJump",
1716+
{"spikeHits": 1}
1717+
]}
1718+
]}
1719+
]},
16801720
{"and": [
16811721
"HiJump",
16821722
"canSpeedyJump"
@@ -1744,22 +1784,34 @@
17441784
"Morph",
17451785
{"or": [
17461786
"SpaceJump",
1747-
"canPreciseGrapple",
1787+
{"and": [
1788+
"canPreciseGrapple",
1789+
{"or": [
1790+
"canDash",
1791+
"canUseEnemies",
1792+
"canInsaneJump"
1793+
]}
1794+
]},
17481795
{"and": [
17491796
"HiJump",
17501797
"canSpringBallJumpMidAir"
17511798
]},
17521799
{"and": [
1800+
"canDash",
17531801
"HiJump",
17541802
"canWalljump",
17551803
"canTrickyJump"
17561804
]},
17571805
{"and": [
17581806
"canWalljump",
17591807
"canUseIFrames",
1760-
{"spikeHits": 1}
1808+
{"spikeHits": 1},
1809+
"h_spikeJumpWithActiveEnemies"
17611810
]},
1762-
"h_IBJFromSpikes"
1811+
{"and": [
1812+
"h_IBJFromSpikes",
1813+
"h_spikeJumpWithActiveEnemies"
1814+
]}
17631815
]},
17641816
"h_heatedGModeOpenDifferentDoor"
17651817
],
@@ -2390,7 +2442,10 @@
23902442
"Morph",
23912443
{"or": [
23922444
"SpaceJump",
2393-
"canPreciseGrapple",
2445+
{"and": [
2446+
"canPreciseGrapple",
2447+
"canUseEnemies"
2448+
]},
23942449
{"and": [
23952450
"HiJump",
23962451
"canSpringBallJumpMidAir"
@@ -2579,7 +2634,14 @@
25792634
"requires": [
25802635
{"or": [
25812636
"SpaceJump",
2582-
"canPreciseGrapple",
2637+
{"and": [
2638+
"canPreciseGrapple",
2639+
{"or": [
2640+
"canDash",
2641+
"canUseEnemies",
2642+
"canInsaneJump"
2643+
]}
2644+
]},
25832645
"canInsaneWalljump",
25842646
{"and": [
25852647
"HiJump",
@@ -2714,7 +2776,14 @@
27142776
"requires": [
27152777
{"or": [
27162778
"SpaceJump",
2717-
"canPreciseGrapple",
2779+
{"and": [
2780+
"canPreciseGrapple",
2781+
{"or": [
2782+
"canDash",
2783+
"canUseEnemies",
2784+
"canInsaneJump"
2785+
]}
2786+
]},
27182787
"canInsaneWalljump",
27192788
{"and": [
27202789
"HiJump",
@@ -3028,7 +3097,10 @@
30283097
"canRemoteAcquire",
30293098
{"or": [
30303099
"SpaceJump",
3031-
"canPreciseGrapple",
3100+
{"and": [
3101+
"canPreciseGrapple",
3102+
"canUseEnemies"
3103+
]},
30323104
"canSpringBallJumpMidAir",
30333105
"canInsaneWalljump",
30343106
{"and": [
@@ -3526,7 +3598,6 @@
35263598
{"and": [
35273599
"canDash",
35283600
{"or": [
3529-
"canPreciseGrapple",
35303601
"canTrickySpringBallJump",
35313602
"canInsaneWalljump",
35323603
{"and": [
@@ -3539,6 +3610,14 @@
35393610
]},
35403611
"h_IBJFromSpikes"
35413612
]}
3613+
]},
3614+
{"and": [
3615+
"canPreciseGrapple",
3616+
{"or": [
3617+
"canDash",
3618+
"canUseEnemies",
3619+
"canInsaneJump"
3620+
]}
35423621
]}
35433622
]},
35443623
{"heatFrames": 0}
@@ -3635,7 +3714,6 @@
36353714
{"and": [
36363715
"canDash",
36373716
{"or": [
3638-
"canPreciseGrapple",
36393717
"canTrickySpringBallJump",
36403718
"canInsaneWalljump",
36413719
{"and": [
@@ -3648,12 +3726,21 @@
36483726
]},
36493727
"h_IBJFromSpikes"
36503728
]}
3729+
]},
3730+
{"and": [
3731+
"canPreciseGrapple",
3732+
{"or": [
3733+
"canDash",
3734+
"canUseEnemies",
3735+
"canInsaneJump"
3736+
]}
36513737
]}
36523738
]},
36533739
{"heatFrames": 35}
36543740
],
36553741
"clearsObstacles": ["A"],
36563742
"flashSuitChecked": true,
3743+
"blueSuitChecked": true,
36573744
"note": [
36583745
"Jump onto the crumble blocks to make them solid, then use them as a platform to cross the room.",
36593746
"With Grapple, a running jump then single Grapple swing can be used before PLMs are overloaded, alternatively jump on the crumble blocks and Grapple the Ripper.",
@@ -3695,6 +3782,7 @@
36953782
],
36963783
"clearsObstacles": ["A"],
36973784
"flashSuitChecked": true,
3785+
"blueSuitChecked": true,
36983786
"note": [
36993787
"Jump onto the crumble blocks to make them solid, then use them as a platform to cross the room.",
37003788
"In indirect G-mode, stand where the gate will spawn and exit G-mode to open the gate.",
@@ -3737,6 +3825,7 @@
37373825
],
37383826
"clearsObstacles": ["A"],
37393827
"flashSuitChecked": true,
3828+
"blueSuitChecked": true,
37403829
"note": [
37413830
"Bomb horizontally on room entry to jump over the Ripper and land on the crumble blocks, or use a Power Bomb to kill the Ripper.",
37423831
"In indirect G-mode, stand where the gate will spawn and exit G-mode to open the gate.",
@@ -3758,6 +3847,17 @@
37583847
{"or": [
37593848
"canDash",
37603849
{"heatFrames": 100}
3850+
]},
3851+
{"or": [
3852+
{"spikeHits": 1},
3853+
{"and": [
3854+
"canTrickyJump",
3855+
{"or": [
3856+
"canDash",
3857+
{"disableEquipment": "HiJump"}
3858+
]}
3859+
]},
3860+
"canInsaneJump"
37613861
]}
37623862
],
37633863
"flashSuitChecked": true,
@@ -3788,11 +3888,14 @@
37883888
"canDoubleBombJump",
37893889
"canBombHorizontally"
37903890
]},
3891+
{"and": [
3892+
"canPreciseGrapple",
3893+
"canUseEnemies"
3894+
]},
37913895
{"and": [
37923896
"canDash",
37933897
{"or": [
37943898
"canTrickySpringBallJump",
3795-
"canPreciseGrapple",
37963899
"canInsaneWalljump",
37973900
{"and": [
37983901
"HiJump",
@@ -3916,7 +4019,6 @@
39164019
"canDash",
39174020
{"or": [
39184021
"canTrickySpringBallJump",
3919-
"canPreciseGrapple",
39204022
"canInsaneWalljump",
39214023
{"and": [
39224024
"HiJump",
@@ -3928,6 +4030,14 @@
39284030
]},
39294031
"h_IBJFromSpikes"
39304032
]}
4033+
]},
4034+
{"and": [
4035+
"canPreciseGrapple",
4036+
{"or": [
4037+
"canDash",
4038+
"canUseEnemies",
4039+
"canInsaneJump"
4040+
]}
39314041
]}
39324042
]},
39334043
{"heatFrames": 0}
@@ -4450,6 +4560,10 @@
44504560
{"or": [
44514561
"canDash",
44524562
{"heatFrames": 20}
4563+
]},
4564+
{"or": [
4565+
"canCarefulJump",
4566+
{"spikeHits": 1}
44534567
]}
44544568
],
44554569
"flashSuitChecked": true,
@@ -4728,7 +4842,8 @@
47284842
]},
47294843
"Plasma",
47304844
"h_heatedGModePauseAbuse",
4731-
"canInsaneJump"
4845+
"canInsaneJump",
4846+
"canDash"
47324847
],
47334848
"flashSuitChecked": true,
47344849
"blueSuitChecked": true,

0 commit comments

Comments
 (0)