Skip to content

Commit 17ecc54

Browse files
blkerbyblkerby
committed
feedback updates
1 parent 3723e88 commit 17ecc54

1 file changed

Lines changed: 49 additions & 17 deletions

File tree

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

Lines changed: 49 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,12 @@
395395
"canWalljump"
396396
]},
397397
{"and": [
398+
{"noBlueSuit": {}},
398399
"HiJump",
399400
"canSpringBallJumpMidAir"
400401
]},
401402
{"and": [
403+
{"noBlueSuit": {}},
402404
"canBeVeryPatient",
403405
{"or": [
404406
"canLongIBJ",
@@ -499,6 +501,7 @@
499501
"link": [2, 1],
500502
"name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Frozen Geruta Step",
501503
"requires": [
504+
{"noBlueSuit": {}},
502505
"canComplexGMode",
503506
"h_heatProof",
504507
"canBeVeryPatient",
@@ -538,6 +541,7 @@
538541
}
539542
},
540543
"requires": [
544+
{"noBlueSuit": {}},
541545
"canTrickyUseFrozenEnemies",
542546
"canTrickyDodgeEnemies",
543547
{"or": [
@@ -548,7 +552,7 @@
548552
],
549553
"flashSuitChecked": true,
550554
"blueSuitChecked": true,
551-
"devNote": "FIXME: A variant with only ice and reset fall speed could be added, but is probably unreasonable."
555+
"devNote": "FIXME: By staying up with the Geruta the whole time, this could be done without HiJump or Spring Ball and could carry a blue suit."
552556
},
553557
{
554558
"id": 51,
@@ -570,10 +574,18 @@
570574
]},
571575
{"and": [
572576
"HiJump",
573-
"canSpringBallJumpMidAir"
577+
"canSpringBallJumpMidAir",
578+
{"or": [
579+
{"noBlueSuit": {}},
580+
{"and": [
581+
"Gravity",
582+
{"lavaFrames": 25}
583+
]}
584+
]}
574585
]},
575586
{"and": [
576587
{"notable": "Spring Ball Bomb Boost"},
588+
{"noBlueSuit": {}},
577589
"canSpringBallJumpMidAir",
578590
"canUnmorphBombBoost",
579591
"h_crouchJumpDownGrab",
@@ -583,9 +595,12 @@
583595
]}
584596
]},
585597
{"and": [
586-
"canHorizontalShinespark",
587-
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
588-
{"shinespark": {"frames": 40, "excessFrames": 18}}
598+
{"or": [
599+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
600+
"h_storedSpark"
601+
]},
602+
"canMidairShinespark",
603+
{"shinespark": {"frames": 12, "excessFrames": 2}}
589604
]},
590605
{"and": [
591606
{"notable": "Ceiling Mockball Spring Fling"},
@@ -611,6 +626,7 @@
611626
}
612627
},
613628
"requires": [
629+
{"noBlueSuit": {}},
614630
{"or": [
615631
"h_artificialMorphLongIBJ",
616632
"h_artificialMorphJumpIntoIBJ"
@@ -816,6 +832,7 @@
816832
}
817833
},
818834
"requires": [
835+
{"noBlueSuit": {}},
819836
"canRemoteAcquire",
820837
"canTrickyUseFrozenEnemies",
821838
"canTrickyDodgeEnemies",
@@ -828,7 +845,7 @@
828845
"collectsItems": [3],
829846
"flashSuitChecked": true,
830847
"blueSuitChecked": true,
831-
"devNote": "FIXME: A variant with only ice and reset fall speed could be added, but is probably unreasonable."
848+
"devNote": "FIXME: By staying up with the Geruta the whole time, this could be done without HiJump or Spring Ball and could carry blue suit."
832849
},
833850
{
834851
"id": 54,
@@ -851,19 +868,30 @@
851868
]},
852869
{"and": [
853870
"HiJump",
854-
"canSpringBallJumpMidAir"
871+
"canSpringBallJumpMidAir",
872+
{"or": [
873+
{"noBlueSuit": {}},
874+
{"and": [
875+
"Gravity",
876+
{"lavaFrames": 25}
877+
]}
878+
]}
855879
]},
856880
{"and": [
857881
{"notable": "Spring Ball Bomb Boost"},
882+
{"noBlueSuit": {}},
858883
"canSpringBallJumpMidAir",
859884
"canUnmorphBombBoost",
860885
"h_crouchJumpDownGrab",
861886
"canInsaneJump"
862887
]},
863888
{"and": [
864-
"canHorizontalShinespark",
865-
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
866-
{"shinespark": {"frames": 40, "excessFrames": 18}}
889+
{"or": [
890+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
891+
"h_storedSpark"
892+
]},
893+
"canMidairShinespark",
894+
{"shinespark": {"frames": 12, "excessFrames": 2}}
867895
]},
868896
{"and": [
869897
{"notable": "Ceiling Mockball Spring Fling"},
@@ -880,8 +908,7 @@
880908
"blueSuitChecked": true,
881909
"note": "Touch the item as little as possible in order to prevent PLMs from being overloaded, so the platforms below remain solid.",
882910
"devNote": [
883-
"There is no leniency option for using an extra Power Bomb, because it will contribute to PLM overload. (2 PBs is technically barely possible)",
884-
"FIXME: A variant with shinesparking can be added. (It would require energy free sparks)"
911+
"There is no leniency option for using an extra Power Bomb, because it will contribute to PLM overload. (2 PBs is technically barely possible)"
885912
]
886913
},
887914
{
@@ -895,6 +922,7 @@
895922
}
896923
},
897924
"requires": [
925+
{"noBlueSuit": {}},
898926
"canRemoteAcquire",
899927
{"or": [
900928
"h_artificialMorphLongIBJ",
@@ -1113,6 +1141,7 @@
11131141
"link": [2, 3],
11141142
"name": "Jump into IBJ",
11151143
"requires": [
1144+
"canDash",
11161145
"canJumpIntoIBJ",
11171146
"canBombHorizontally",
11181147
{"heatFrames": 810},
@@ -1636,8 +1665,8 @@
16361665
{"or": [
16371666
{"noBlueSuit": {}},
16381667
{"and": [
1639-
{"haveBlueSuit": {}},
1640-
"Gravity"
1668+
"Gravity",
1669+
{"lavaFrames": 25}
16411670
]}
16421671
]}
16431672
]},
@@ -1653,9 +1682,12 @@
16531682
]}
16541683
]},
16551684
{"and": [
1656-
"canHorizontalShinespark",
1657-
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
1658-
{"shinespark": {"frames": 40, "excessFrames": 18}}
1685+
{"or": [
1686+
{"canShineCharge": {"usedTiles": 15, "openEnd": 2}},
1687+
"h_storedSpark"
1688+
]},
1689+
"canMidairShinespark",
1690+
{"shinespark": {"frames": 12, "excessFrames": 2}}
16591691
]},
16601692
{"and": [
16611693
{"notable": "Ceiling Mockball Spring Fling"},

0 commit comments

Comments
 (0)