Skip to content

Commit 1c726bb

Browse files
kjbranchkjbranch
authored
Merge pull request #1773 from kjbranch/enemies-cleanup
Enemies Cleanup - Remove dropRequires, farmCycles
2 parents a5bee69 + 0791eb5 commit 1c726bb

66 files changed

Lines changed: 140 additions & 878 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,7 @@
6868
"groupName": "Early Supers Zeb",
6969
"enemyName": "Zeb",
7070
"quantity": 1,
71-
"homeNodes": [1],
72-
"farmCycles": [
73-
{
74-
"name": "Crouch over spawn point",
75-
"cycleFrames": 120,
76-
"requires": []
77-
}
78-
]
71+
"homeNodes": [1]
7972
},
8073
{
8174
"id": "e2",

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -96,48 +96,21 @@
9696
"groupName": "Etecoon E-Tank Left Zebbo",
9797
"enemyName": "Zebbo",
9898
"quantity": 1,
99-
"homeNodes": [7],
100-
"farmCycles": [
101-
{
102-
"name": "Crouch two tiles above spawn point",
103-
"cycleFrames": 130,
104-
"requires": [
105-
{"obstaclesCleared": ["A"]}
106-
]
107-
}
108-
]
99+
"homeNodes": [7]
109100
},
110101
{
111102
"id": "e3",
112103
"groupName": "Etecoon E-Tank Middle Zebbo",
113104
"enemyName": "Zebbo",
114105
"quantity": 1,
115-
"homeNodes": [7],
116-
"farmCycles": [
117-
{
118-
"name": "Crouch over spawn point",
119-
"cycleFrames": 120,
120-
"requires": [
121-
{"obstaclesCleared": ["A"]}
122-
]
123-
}
124-
]
106+
"homeNodes": [7]
125107
},
126108
{
127109
"id": "e4",
128110
"groupName": "Etecoon E-Tank Right Zebbo",
129111
"enemyName": "Zebbo",
130112
"quantity": 1,
131-
"homeNodes": [7],
132-
"farmCycles": [
133-
{
134-
"name": "Crouch two tiles above spawn point",
135-
"cycleFrames": 130,
136-
"requires": [
137-
{"obstaclesCleared": ["A"]}
138-
]
139-
}
140-
]
113+
"homeNodes": [7]
141114
},
142115
{
143116
"id": "e5",

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -64,70 +64,35 @@
6464
"groupName": "Green Hill Zone Top Geega",
6565
"enemyName": "Geega",
6666
"quantity": 1,
67-
"homeNodes": [1],
68-
"farmCycles": [
69-
{
70-
"name": "Single Geega Farm",
71-
"cycleFrames": 160,
72-
"requires": []
73-
}
74-
]
67+
"homeNodes": [1]
7568
},
7669
{
7770
"id": "e2",
7871
"groupName": "Green Hill Zone Top-Middle Geega",
7972
"enemyName": "Geega",
8073
"quantity": 1,
81-
"homeNodes": [1],
82-
"farmCycles": [
83-
{
84-
"name": "Single Geega Farm",
85-
"cycleFrames": 160,
86-
"requires": []
87-
}
88-
]
74+
"homeNodes": [1]
8975
},
9076
{
9177
"id": "e3",
9278
"groupName": "Green Hill Zone Middle Geega",
9379
"enemyName": "Geega",
9480
"quantity": 1,
95-
"homeNodes": [1],
96-
"farmCycles": [
97-
{
98-
"name": "Single Geega Farm",
99-
"cycleFrames": 160,
100-
"requires": []
101-
}
102-
]
81+
"homeNodes": [1]
10382
},
10483
{
10584
"id": "e4",
10685
"groupName": "Green Hill Zone Bottom-Middle Geega",
10786
"enemyName": "Geega",
10887
"quantity": 1,
109-
"homeNodes": [1],
110-
"farmCycles": [
111-
{
112-
"name": "Single Geega Farm",
113-
"cycleFrames": 160,
114-
"requires": []
115-
}
116-
]
88+
"homeNodes": [1]
11789
},
11890
{
11991
"id": "e5",
12092
"groupName": "Green Hill Zone Bottom Geega",
12193
"enemyName": "Geega",
12294
"quantity": 1,
123-
"homeNodes": [1],
124-
"farmCycles": [
125-
{
126-
"name": "Single Geega Farm",
127-
"cycleFrames": 160,
128-
"requires": []
129-
}
130-
]
95+
"homeNodes": [1]
13196
},
13297
{
13398
"id": "e6",

‎region/brinstar/kraid/Kraid Eye Door Room.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,7 @@
4242
"groupName": "Kraid Eye Door Zeb",
4343
"enemyName": "Zeb",
4444
"quantity": 1,
45-
"homeNodes": [1],
46-
"farmCycles": [
47-
{
48-
"name": "Crouch over spawn point",
49-
"cycleFrames": 120,
50-
"requires": []
51-
}
52-
]
45+
"homeNodes": [1]
5346
}
5447
],
5548
"links": [

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -180,42 +180,21 @@
180180
"groupName": "Big Pink Top Zeb",
181181
"enemyName": "Zeb",
182182
"quantity": 1,
183-
"homeNodes": [13],
184-
"farmCycles": [
185-
{
186-
"name": "Crouch over spawn point",
187-
"cycleFrames": 120,
188-
"requires": []
189-
}
190-
]
183+
"homeNodes": [13]
191184
},
192185
{
193186
"id": "e2",
194187
"groupName": "Big Pink Middle Zeb",
195188
"enemyName": "Zeb",
196189
"quantity": 1,
197-
"homeNodes": [13],
198-
"farmCycles": [
199-
{
200-
"name": "Crouch over spawn point",
201-
"cycleFrames": 120,
202-
"requires": []
203-
}
204-
]
190+
"homeNodes": [13]
205191
},
206192
{
207193
"id": "e3",
208194
"groupName": "Big Pink Bottom Zeb",
209195
"enemyName": "Zeb",
210196
"quantity": 1,
211-
"homeNodes": [13],
212-
"farmCycles": [
213-
{
214-
"name": "Crouch over spawn point",
215-
"cycleFrames": 120,
216-
"requires": []
217-
}
218-
]
197+
"homeNodes": [13]
219198
},
220199
{
221200
"id": "e4",

‎region/brinstar/pink/Spore Spawn Farming Room.json‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,14 @@
4040
"groupName": "Spore Spawn Farming Room Left Zebs",
4141
"enemyName": "Zeb",
4242
"quantity": 2,
43-
"homeNodes": [1],
44-
"farmCycles": [
45-
{
46-
"name": "Alternating Farm",
47-
"cycleFrames": 120,
48-
"requires": [],
49-
"note": "Getting the two spawners to desynch and jumping back and forth between the two."
50-
}
51-
]
43+
"homeNodes": [1]
5244
},
5345
{
5446
"id": "e3",
5547
"groupName": "Spore Spawn Farming Room Right Zeb",
5648
"enemyName": "Zeb",
5749
"quantity": 1,
58-
"homeNodes": [1],
59-
"farmCycles": [
60-
{
61-
"name": "Crouch over spawn point",
62-
"cycleFrames": 120,
63-
"requires": []
64-
}
65-
]
50+
"homeNodes": [1]
6651
}
6752
],
6853
"links": [

‎region/brinstar/pink/Spore Spawn Super Room.json‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@
4141
"groupName": "Spore Spawn Supers Zeb",
4242
"enemyName": "Zeb",
4343
"quantity": 1,
44-
"homeNodes": [1],
45-
"farmCycles": [
46-
{
47-
"name": "Crouch over spawn point",
48-
"cycleFrames": 120,
49-
"requires": []
50-
}
51-
]
44+
"homeNodes": [1]
5245
}
5346
],
5447
"links": [

‎region/brinstar/red/Hellway.json‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,50 +33,21 @@
3333
"groupName": "Hellway Left Zebbo",
3434
"enemyName": "Zebbo",
3535
"quantity": 1,
36-
"homeNodes": [1],
37-
"farmCycles": [
38-
{
39-
"name": "Crouch two tiles above spawn point",
40-
"cycleFrames": 130,
41-
"requires": []
42-
}
43-
]
36+
"homeNodes": [1]
4437
},
4538
{
4639
"id": "e2",
4740
"groupName": "Hellway Middle Zebbo",
4841
"enemyName": "Zebbo",
4942
"quantity": 1,
50-
"homeNodes": [1],
51-
"farmCycles": [
52-
{
53-
"name": "Crouch two tiles above spawn point",
54-
"cycleFrames": 130,
55-
"requires": []
56-
}
57-
]
43+
"homeNodes": [1]
5844
},
5945
{
6046
"id": "e3",
6147
"groupName": "Hellway Right Zebbos",
6248
"enemyName": "Zebbo",
6349
"quantity": 2,
64-
"homeNodes": [1],
65-
"farmCycles": [
66-
{
67-
"name": "Turnaround two tiles above spawn",
68-
"cycleFrames": 240,
69-
"requires": [],
70-
"note": "Involves tiny hops to get the drops as well"
71-
},
72-
{
73-
"name": "Grapple turnaround two tiles above spawn",
74-
"cycleFrames": 175,
75-
"requires": [
76-
"Grapple"
77-
]
78-
}
79-
]
50+
"homeNodes": [1]
8051
},
8152
{
8253
"id": "e4",

‎region/brinstar/red/Red Brinstar Fireflea Room.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
"groupName": "Red Brinstar Fireflea Room Left Yapping Maws",
5353
"enemyName": "Yapping Maw",
5454
"quantity": 2,
55-
"betweenNodes": [1, 2],
56-
"dropRequires": ["never"]
55+
"betweenNodes": [1, 2]
5756
},
5857
{
5958
"id": "e3",

‎region/brinstar/red/Red Tower.json‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,7 @@
9999
"groupName": "Red Tower Geegas",
100100
"enemyName": "Geega",
101101
"quantity": 2,
102-
"homeNodes": [1],
103-
"farmCycles": [
104-
{
105-
"name": "Alternating Geega Pipes",
106-
"cycleFrames": 180,
107-
"requires": [],
108-
"note": "Standing on the platform next to the right spawner, must jump to get Geegas to spawn from the left one."
109-
}
110-
]
102+
"homeNodes": [1]
111103
},
112104
{
113105
"id": "e2",

0 commit comments

Comments
 (0)