Skip to content

Commit b05cc9e

Browse files
blkerbyblkerby
committed
feedback updates
1 parent 70a6337 commit b05cc9e

2 files changed

Lines changed: 136 additions & 69 deletions

File tree

‎region/brinstar/red/Caterpillar Room.json‎

Lines changed: 135 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,114 @@
725725
"Let the Zero lead through the morph tunnel or wait for the it to get very close to Samus before touching the scroll block at the exit."
726726
]
727727
},
728+
{
729+
"link": [2, 2],
730+
"name": "Zero Farm",
731+
"requires": [
732+
{"or": [
733+
{"and": [
734+
{"resetRoom": {"nodes": [2]}},
735+
{"cycleFrames": 460}
736+
]},
737+
{"and": [
738+
{"resetRoom": {"nodes": [4]}},
739+
{"cycleFrames": 660},
740+
{"or": [
741+
"canWalljump",
742+
"HiJump",
743+
{"and": [
744+
"canDoubleBombJump",
745+
{"cycleFrames": 140}
746+
]},
747+
{"and": [
748+
"canSpringBallJumpMidAir",
749+
{"cycleFrames": 40},
750+
"h_doubleEquipmentScreenCycleFrames"
751+
]}
752+
]}
753+
]},
754+
{"and": [
755+
{"resetRoom": {"nodes": [1]}},
756+
{"cycleFrames": 840},
757+
{"or": [
758+
"canWalljump",
759+
"HiJump",
760+
"SpaceJump",
761+
{"and": [
762+
"canDoubleBombJump",
763+
{"cycleFrames": 140},
764+
{"or": [
765+
{"cycleFrames": 140},
766+
"h_crouchJumpDownGrab"
767+
]}
768+
]},
769+
{"and": [
770+
"canSpringBallJumpMidAir",
771+
{"cycleFrames": 40},
772+
"h_doubleEquipmentScreenCycleFrames",
773+
{"or": [
774+
"h_crouchJumpDownGrab",
775+
{"and": [
776+
{"cycleFrames": 40},
777+
"h_doubleEquipmentScreenCycleFrames"
778+
]}
779+
]}
780+
]}
781+
]}
782+
]},
783+
{"and": [
784+
{"resetRoom": {"nodes": [6]}},
785+
{"cycleFrames": 1900},
786+
{"or": [
787+
"canWalljump",
788+
"HiJump",
789+
"SpaceJump",
790+
{"and": [
791+
"canDoubleBombJump",
792+
{"cycleFrames": 140},
793+
{"or": [
794+
{"cycleFrames": 140},
795+
"h_crouchJumpDownGrab"
796+
]}
797+
]},
798+
{"and": [
799+
"canSpringBallJumpMidAir",
800+
{"cycleFrames": 40},
801+
"h_doubleEquipmentScreenCycleFrames",
802+
{"or": [
803+
"h_crouchJumpDownGrab",
804+
{"and": [
805+
{"cycleFrames": 40},
806+
"h_doubleEquipmentScreenCycleFrames"
807+
]}
808+
]}
809+
]}
810+
]}
811+
]}
812+
]},
813+
{"or": [
814+
"Wave",
815+
"Plasma",
816+
{"and": [
817+
"Spazer",
818+
{"cycleFrames": 60}
819+
]},
820+
{"and": [
821+
"ScrewAttack",
822+
{"cycleFrames": 70}
823+
]},
824+
{"cycleFrames": 130}
825+
]}
826+
],
827+
"clearsObstacles": ["B"],
828+
"resetsObstacles": ["A"],
829+
"farmCycleDrops": [
830+
{"enemy": "Zero", "count": 3}
831+
],
832+
"devNote": [
833+
"Resetting at the bottom of the room (node 3) is covered in a separate 3->3 strat."
834+
]
835+
},
728836
{
729837
"id": 27,
730838
"link": [2, 2],
@@ -1358,83 +1466,29 @@
13581466
"link": [3, 3],
13591467
"name": "Zero Farm",
13601468
"requires": [
1469+
{"resetRoom": {"nodes": [3]}},
13611470
{"or": [
13621471
{"and": [
1363-
{"resetRoom": {"nodes": [3]}},
1364-
{"cycleFrames": 290}
1472+
"Grapple",
1473+
{"cycleFrames": 265}
13651474
]},
13661475
{"and": [
1367-
{"resetRoom": {"nodes": [2]}},
1368-
{"cycleFrames": 460}
1476+
"Wave",
1477+
{"cycleFrames": 230}
13691478
]},
13701479
{"and": [
1371-
{"resetRoom": {"nodes": [4]}},
1372-
{"cycleFrames": 660},
1373-
{"or": [
1374-
"canWalljump",
1375-
"HiJump",
1376-
{"and": [
1377-
"canDoubleBombJump",
1378-
{"cycleFrames": 140}
1379-
]},
1380-
{"and": [
1381-
"canSpringBallJumpMidAir",
1382-
{"cycleFrames": 40},
1383-
"h_doubleEquipmentScreenCycleFrames"
1384-
]}
1385-
]}
1480+
"Plasma",
1481+
{"cycleFrames": 230}
13861482
]},
1387-
{"and": [
1388-
{"resetRoom": {"nodes": [1]}},
1389-
{"cycleFrames": 840},
1390-
{"or": [
1391-
"canWalljump",
1392-
"HiJump",
1393-
"SpaceJump",
1394-
{"and": [
1395-
"canDoubleBombJump",
1396-
{"cycleFrames": 280}
1397-
]},
1398-
{"and": [
1399-
"canSpringBallJumpMidAir",
1400-
{"cycleFrames": 80},
1401-
"h_doubleEquipmentScreenCycleFrames",
1402-
"h_doubleEquipmentScreenCycleFrames"
1403-
]}
1404-
]}
1405-
]},
1406-
{"and": [
1407-
{"resetRoom": {"nodes": [6]}},
1408-
{"cycleFrames": 1900},
1409-
{"or": [
1410-
"canWalljump",
1411-
"HiJump",
1412-
"SpaceJump",
1413-
{"and": [
1414-
"canDoubleBombJump",
1415-
{"cycleFrames": 280}
1416-
]},
1417-
{"and": [
1418-
"canSpringBallJumpMidAir",
1419-
{"cycleFrames": 80},
1420-
"h_doubleEquipmentScreenCycleFrames",
1421-
"h_doubleEquipmentScreenCycleFrames"
1422-
]}
1423-
]}
1424-
]}
1425-
]},
1426-
{"or": [
1427-
"Wave",
1428-
"Plasma",
14291483
{"and": [
14301484
"Spazer",
1431-
{"cycleFrames": 60}
1485+
{"cycleFrames": 260}
14321486
]},
14331487
{"and": [
14341488
"ScrewAttack",
1435-
{"cycleFrames": 70}
1489+
{"cycleFrames": 290}
14361490
]},
1437-
{"cycleFrames": 130}
1491+
{"cycleFrames": 350}
14381492
]}
14391493
],
14401494
"clearsObstacles": ["B"],
@@ -2054,13 +2108,23 @@
20542108
"SpaceJump",
20552109
{"and": [
20562110
"canDoubleBombJump",
2057-
{"cycleFrames": 280}
2111+
{"cycleFrames": 140},
2112+
{"or": [
2113+
{"cycleFrames": 140},
2114+
"h_crouchJumpDownGrab"
2115+
]}
20582116
]},
20592117
{"and": [
20602118
"canSpringBallJumpMidAir",
2061-
{"cycleFrames": 80},
2119+
{"cycleFrames": 40},
20622120
"h_doubleEquipmentScreenCycleFrames",
2063-
"h_doubleEquipmentScreenCycleFrames"
2121+
{"or": [
2122+
"h_crouchJumpDownGrab",
2123+
{"and": [
2124+
{"cycleFrames": 40},
2125+
"h_doubleEquipmentScreenCycleFrames"
2126+
]}
2127+
]}
20642128
]}
20652129
]},
20662130
{"or": [
@@ -2075,7 +2139,10 @@
20752139
{"enemy": "Cacatac", "count": 2},
20762140
{"enemy": "Zero", "count": 3}
20772141
],
2078-
"devNote": "It is possible to roll off of the platform above to avoid a mid-air morph."
2142+
"devNote": [
2143+
"It is possible to roll off of the platform above to avoid a mid-air morph.",
2144+
"FIXME: add a Cac-only farm since it can be done with fewer requirements."
2145+
]
20792146
},
20802147
{
20812148
"id": 87,

‎region/brinstar/red/Hellway.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
"link": [1, 1],
9898
"name": "Double Zebbo Farm",
9999
"requires": [
100-
"canTrickyDodgeEnemies",
100+
"canDodgeWhileShooting",
101101
{"cycleFrames": 160}
102102
],
103103
"farmCycleDrops": [

0 commit comments

Comments
 (0)