Skip to content

Commit ee13266

Browse files
committed
feedback update
1 parent 540dc01 commit ee13266

2 files changed

Lines changed: 14 additions & 9 deletions

File tree

region/norfair/west/Crocomire Speedway.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -565,23 +565,17 @@
565565
"Spazer",
566566
{"cycleFrames": 300}
567567
]},
568-
{"and": [
569-
"Grapple",
570-
{"cycleFrames": 45}
571-
]},
572568
{"and": [
573569
"canPseudoScrew",
574570
{"cycleFrames": 220}
575-
]},
576-
{"cycleFrames": 120}
571+
]}
577572
]}
578573
],
579574
"farmCycleDrops": [
580575
{"enemy": "Multiviola", "count": 4},
581576
{"enemy": "Red Space Pirate (standing)", "count": 3}
582577
],
583-
"resetsObstacles": ["A"],
584-
"devNote": "Some frames added to account for spike RNG."
578+
"resetsObstacles": ["A"]
585579
},
586580
{
587581
"link": [2, 2],

region/norfair/west/Ice Beam Tutorial Room.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,18 @@
588588
]}
589589
]},
590590
"h_heatProof",
591-
"h_lavaProof",
591+
{"or": [
592+
"h_lavaProof",
593+
{"and": [
594+
"canFarmWhileShooting",
595+
"canPreciseWalljump",
596+
{"cycleFrames": 15}
597+
]},
598+
{"and": [
599+
"SpaceJump",
600+
{"cycleFrames": 10}
601+
]}
602+
]},
592603
"ScrewAttack",
593604
{"cycleFrames": 125}
594605
],

0 commit comments

Comments
 (0)