Skip to content

Commit 0dbed74

Browse files
committed
Cleanup
1 parent 283becb commit 0dbed74

6 files changed

Lines changed: 21 additions & 18 deletions

File tree

region/norfair/east/Cathedral.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -794,7 +794,8 @@
794794
"farmCycleDrops": [
795795
{"enemy": "Sova", "count": 4},
796796
{"enemy": "Geruta", "count": 3}
797-
]
797+
],
798+
"flashSuitChecked": true
798799
},
799800
{
800801
"id": 27,

region/norfair/east/Double Chamber.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2013,6 +2013,7 @@
20132013
],
20142014
"resetsObstacles": ["A"],
20152015
"farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 1}],
2016+
"flashSuitChecked": true,
20162017
"devNote": "FIXME: It is possible but risky to farm using hijump, walljump, and crumble jumps."
20172018
},
20182019
{
@@ -3124,7 +3125,7 @@
31243125
{"or": [
31253126
{"and": [
31263127
"SpaceJump",
3127-
{"cycleFrames": 510}
3128+
{"cycleFrames": 1060}
31283129
]},
31293130
{"and": [
31303131
"HiJump",
@@ -3135,7 +3136,7 @@
31353136
]},
31363137
{"and": [
31373138
{"resetRoom": {"nodes": [2]}},
3138-
{"cycleFrames": 860}
3139+
{"cycleFrames": 830}
31393140
]},
31403141
{"and": [
31413142
{"resetRoom": {"nodes": [3]}},
@@ -3161,6 +3162,7 @@
31613162
"farmCycleDrops": [
31623163
{"enemy": "Kago", "count": 1}
31633164
],
3165+
"flashSuitChecked": true,
31643166
"devNote": "FIXME: There are more possible item combinations."
31653167
},
31663168
{

region/norfair/east/Frog Speedway.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,7 @@
9999
{"cycleFrames": 330}
100100
],
101101
"farmCycleDrops": [{"enemy": "Beetom", "count": 6}],
102-
"flashSuitChecked": true,
103-
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
104-
"devNote": [
105-
"Health Bomb ends at 50 energy.",
106-
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
107-
]
102+
"flashSuitChecked": true
108103
},
109104
{
110105
"link": [1, 1],
@@ -131,7 +126,7 @@
131126
],
132127
"farmCycleDrops": [{"enemy": "Beetom", "count": 3}],
133128
"flashSuitChecked": true,
134-
"note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
129+
"note": "Kill the Beetoms with Screw Attack or by freezing and using Bombs or Power Bombs.",
135130
"devNote": [
136131
"Health Bomb ends at 50 energy.",
137132
"One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."

region/norfair/east/Green Bubbles Tunnel.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@
134134
]}
135135
],
136136
"collectsItems": [3],
137-
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
137+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
138+
"flashSuitChecked": true
138139
},
139140
{
140141
"link": [1, 1],
@@ -152,7 +153,8 @@
152153
{"cycleFrames": 90}
153154
]}
154155
],
155-
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
156+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
157+
"flashSuitChecked": true
156158
},
157159
{
158160
"id": 3,
@@ -436,7 +438,8 @@
436438
]}
437439
]}
438440
],
439-
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}]
441+
"farmCycleDrops": [{"enemy": "Geruta", "count": 1}],
442+
"flashSuitChecked": true
440443
},
441444
{
442445
"id": 20,

region/norfair/east/Kronic Boost Room.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,8 @@
519519
]}
520520
],
521521
"resetsObstacles": ["A"],
522-
"farmCycleDrops": [{"enemy": "Viola", "count": 4}]
522+
"farmCycleDrops": [{"enemy": "Viola", "count": 4}],
523+
"flashSuitChecked": true
523524
},
524525
{
525526
"id": 13,
@@ -769,7 +770,8 @@
769770
]}
770771
],
771772
"resetsObstacles": ["A"],
772-
"farmCycleDrops": [{"enemy": "Viola", "count": 4}]
773+
"farmCycleDrops": [{"enemy": "Viola", "count": 4}],
774+
"flashSuitChecked": true
773775
},
774776
{
775777
"id": 19,

region/norfair/east/Lava Farm Tunnel.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,8 +1167,9 @@
11671167
]},
11681168
{"heatFrames": 60}
11691169
]},
1170-
{"partialRefill": {"type": "Energy", "limit": 50}}
1170+
{"partialRefill": {"type": "RegularEnergy", "limit": 50}}
11711171
],
1172+
"flashSuitChecked": true,
11721173
"devNote": "Raise energy high enough to use the farm if it is low."
11731174
},
11741175
{
@@ -1191,10 +1192,9 @@
11911192
{"cycleFrames": 20}
11921193
]}
11931194
]}
1194-
11951195
],
11961196
"farmCycleDrops": [{"enemy": "Gamet", "count": 5}],
1197-
"flashSuitChecked": false
1197+
"flashSuitChecked": true
11981198
}
11991199
],
12001200
"notables": [],

0 commit comments

Comments
 (0)