Skip to content

Commit bde16e7

Browse files
blkerbyblkerby
committed
Merge remote-tracking branch 'upstream/master' into grapple-jumps-2
2 parents 3bef1b2 + a5061f9 commit bde16e7

11 files changed

Lines changed: 310 additions & 119 deletions

File tree

‎region/brinstar/green/Spore Spawn Room.json‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,42 @@
9999
],
100100
"flashSuitChecked": true
101101
},
102+
{
103+
"link": [1, 2],
104+
"name": "Plasma SBA Kill from Above (Patient)",
105+
"requires": [
106+
{"notable": "Plasma SBA Kill from Above"},
107+
"Plasma",
108+
"canSpecialBeamAttack",
109+
{"ammo": {"type": "PowerBomb", "count": 2}},
110+
"canBePatient"
111+
],
112+
"setsFlags": ["f_DefeatedSporeSpawn"],
113+
"note": [
114+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
115+
"Spore Spawn will move out of range after the first hit and it will take 9 cycles to come back into range.",
116+
"Stand on the left side of the lowest part of the upper area, facing left for the first hit.",
117+
"9 cycles later, shoot again from the same spot while crouching to kill Spore Spawn."
118+
],
119+
"devNote": "2 Power Bombs total."
120+
},
121+
{
122+
"link": [1, 2],
123+
"name": "Plasma SBA Kill from Above (Microwave)",
124+
"requires": [
125+
{"notable": "Plasma SBA Kill from Above"},
126+
"Plasma",
127+
"canSpecialBeamAttack",
128+
{"ammo": {"type": "PowerBomb", "count": 1}},
129+
"canXRayWaitForIFrames"
130+
],
131+
"setsFlags": ["f_DefeatedSporeSpawn"],
132+
"note": [
133+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
134+
"Stand in the middle of the second lowest platform above Spore Spawn, facing left and crouched.",
135+
"Then use Xray to kill Spore Spawn in 1 cycle."
136+
]
137+
},
102138
{
103139
"id": 3,
104140
"link": [1, 2],
@@ -235,11 +271,20 @@
235271
"id": 1,
236272
"name": "Moondance Clip",
237273
"note": [
238-
"Prepare an extended Moondance and wait for SporeSpawn to move to a side.",
274+
"Prepare an extended Moondance and wait for Spore Spawn to move to a side.",
239275
"In quick succession, Moonfall, turn left, and turn right while holding a spin break button to clip down into the fight arena."
240276
]
277+
},
278+
{
279+
"id": 2,
280+
"name": "Plasma SBA Kill from Above",
281+
"note": [
282+
"Use the Plasma Special Beam Attack to kill Spore Spawn from above.",
283+
"Spore Spawn will move out of range after the first hit and it will take 9 cycles to come back into range.",
284+
"Alternatively, Xray can be used to kill Spore Spawn in 1 cycle."
285+
]
241286
}
242287
],
243288
"nextStratId": 14,
244-
"nextNotableId": 2
289+
"nextNotableId": 3
245290
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2780,6 +2780,7 @@
27802780
"link": [13, 7],
27812781
"name": "Speedball Jump into Raised Bomb Blocks",
27822782
"requires": [
2783+
{"notable": "Off Screen Super Block"},
27832784
{"notable": "Speedball into Raised Bomb Blocks"},
27842785
"canSlowShortCharge",
27852786
{"getBlueSpeed": {"usedTiles": 20, "openEnd": 2}},
@@ -2796,6 +2797,7 @@
27962797
"link": [13, 7],
27972798
"name": "Temporary Blue Bounce into Raised Bomb Blocks",
27982799
"requires": [
2800+
{"notable": "Off Screen Super Block"},
27992801
{"notable": "Speedball into Raised Bomb Blocks"},
28002802
{"canShineCharge": {"usedTiles": 22, "openEnd": 2}},
28012803
"canTemporaryBlue",

‎region/crateria/central/Landing Site.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,6 +808,7 @@
808808
"link": [3, 1],
809809
"name": "Big Jump Leave With Temporary Blue",
810810
"requires": [
811+
{"notable": "Big Jump with Blue Speed"},
811812
{"notable": "Big Jump Leave With Temporary Blue"},
812813
"canTrickyJump",
813814
"Morph",

‎region/lowernorfair/east/Amphitheatre.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -654,6 +654,7 @@
654654
"link": [2, 5],
655655
"name": "Reverse Thread the Needle (Charge Plasma)",
656656
"requires": [
657+
{"notable": "Reverse Acid Dive"},
657658
{"notable": "Reverse Thread the Needle"},
658659
{"obstaclesNotCleared": ["A"]},
659660
"canInsaneJump",
@@ -687,6 +688,7 @@
687688
}
688689
},
689690
"requires": [
691+
{"notable": "Reverse Acid Dive"},
690692
{"notable": "Reverse Thread the Needle"},
691693
{"obstaclesNotCleared": ["A"]},
692694
"canInsaneJump",

‎region/lowernorfair/west/Golden Torizo's Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,6 +1066,7 @@
10661066
"link": [5, 5],
10671067
"name": "Missiles Only Kill",
10681068
"requires": [
1069+
{"notable": "Safe Spot Kill"},
10691070
{"notable": "Missiles Only Kill"},
10701071
"h_heatProof",
10711072
"Morph",

‎region/maridia/inner-pink/East Cactus Alley Room.json‎

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -201,32 +201,82 @@
201201
]
202202
},
203203
{
204-
"id": 3,
205204
"link": [1, 1],
206-
"name": "X-Mode, Leave With Spark",
205+
"name": "X-Mode, Leave Shinecharged",
207206
"requires": [
207+
"h_canShineChargeMaxRunway",
208+
"canShinechargeMovementComplex",
208209
"canXMode",
209210
"h_XModeSpikeHit",
210211
"h_XModeSpikeHit",
211212
{"or": [
212213
"h_XModeSpikeHit",
213-
"canStationarySpinJump"
214+
"canStationarySpinJump",
215+
"canTrickyJump"
214216
]},
215217
"Gravity",
216-
"HiJump",
217-
"SpaceJump",
218-
"canShinechargeMovementComplex",
219-
"canMidairShinespark",
218+
{"or": [
219+
{"and": [
220+
"HiJump",
221+
"SpaceJump",
222+
{"shineChargeFrames": 130}
223+
]},
224+
{"and": [
225+
"HiJump",
226+
"canPreciseWalljump",
227+
{"shineChargeFrames": 160}
228+
]},
229+
{"and": [
230+
"SpaceJump",
231+
"canPreciseWalljump",
232+
{"shineChargeFrames": 160}
233+
]}
234+
]}
235+
],
236+
"exitCondition": {
237+
"leaveShinecharged": {}
238+
},
239+
"flashSuitChecked": true,
240+
"devNote": [
241+
"Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
242+
]
243+
},
244+
{
245+
"id": 3,
246+
"link": [1, 1],
247+
"name": "X-Mode, Leave With Spark",
248+
"requires": [
249+
"canXMode",
250+
"h_XModeSpikeHit",
251+
"h_XModeSpikeHit",
220252
"h_canShineChargeMaxRunway",
221-
{"shinespark": {"frames": 10}}
253+
"canShinechargeMovementTricky",
254+
"canTrickyJump",
255+
"Gravity",
256+
{"or": [
257+
{"and": [
258+
"HiJump",
259+
"canTrickyDashJump"
260+
]},
261+
{"and": [
262+
"canFastWalljumpClimb",
263+
"canPreciseWalljump"
264+
]},
265+
{"and": [
266+
"SpaceJump",
267+
"canInsaneJump",
268+
{"shinespark": {"frames": 3}}
269+
]}
270+
]},
271+
"canMidairShinespark",
272+
{"shinespark": {"frames": 5}}
222273
],
223274
"exitCondition": {
224275
"leaveWithSpark": {}
225276
},
226277
"flashSuitChecked": true,
227278
"devNote": [
228-
"Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount).",
229-
"FIXME: This should be doable with fewer items."
279+
"Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
230280
]
231281
},
232282
{

‎region/maridia/inner-yellow/Watering Hole.json‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -224,100 +224,6 @@
224224
},
225225
"flashSuitChecked": true
226226
},
227-
{
228-
"id": 23,
229-
"link": [1, 1],
230-
"name": "G-Mode Morph - Remote Acquire Left Item",
231-
"entranceCondition": {
232-
"comeInWithGMode": {
233-
"mode": "direct",
234-
"morphed": true
235-
}
236-
},
237-
"requires": [
238-
"canOffScreenMovement",
239-
{"or": [
240-
{"and": [
241-
"canTrickyJump",
242-
"h_canArtificialMorphBombs",
243-
"h_canArtificialMorphSpringBall"
244-
]},
245-
{"and": [
246-
"canInsaneJump",
247-
"h_canArtificialMorphBombs"
248-
]},
249-
{"and": [
250-
"h_canArtificialMorphPowerBomb",
251-
"h_canArtificialMorphPowerBomb"
252-
]},
253-
{"and": [
254-
"h_canArtificialMorphBombs",
255-
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
256-
]}
257-
]},
258-
{"or": [
259-
{"and": [
260-
"Gravity",
261-
{"or": [
262-
"h_canArtificialMorphIBJ",
263-
"h_canArtificialMorphSpringBallBombJump"
264-
]}
265-
]},
266-
"h_canArtificialMorphDoubleSpringBallJump"
267-
]}
268-
],
269-
"collectsItems": [2],
270-
"flashSuitChecked": true,
271-
"note": "Carefully avoid or kill the Zebs and the Choot. The Choot will be easiest to kill with Bombs by staying against the left wall.",
272-
"devNote": "It is possible but unreasonable to collect both items simultaneously."
273-
},
274-
{
275-
"id": 24,
276-
"link": [1, 1],
277-
"name": "G-Mode Morph - Remote Acquire Right Item",
278-
"entranceCondition": {
279-
"comeInWithGMode": {
280-
"mode": "direct",
281-
"morphed": true
282-
}
283-
},
284-
"requires": [
285-
"canOffScreenMovement",
286-
{"or": [
287-
{"and": [
288-
"canTrickyJump",
289-
"h_canArtificialMorphBombs",
290-
"h_canArtificialMorphSpringBall"
291-
]},
292-
{"and": [
293-
"canInsaneJump",
294-
"h_canArtificialMorphBombs"
295-
]},
296-
{"and": [
297-
"h_canArtificialMorphPowerBomb",
298-
"h_canArtificialMorphPowerBomb"
299-
]},
300-
{"and": [
301-
"h_canArtificialMorphBombs",
302-
{"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}}
303-
]}
304-
]},
305-
{"or": [
306-
{"and": [
307-
"Gravity",
308-
{"or": [
309-
"h_canArtificialMorphIBJ",
310-
"h_canArtificialMorphSpringBallBombJump"
311-
]}
312-
]},
313-
"h_canArtificialMorphDoubleSpringBallJump"
314-
]}
315-
],
316-
"collectsItems": [3],
317-
"flashSuitChecked": true,
318-
"note": "Carefully avoid or kill the Zebs and the Choot. The Choot will be easiest to kill with Bombs by staying against the left wall.",
319-
"devNote": "It is possible but unreasonable to collect both items simultaneously."
320-
},
321227
{
322228
"id": 10,
323229
"link": [1, 2],

0 commit comments

Comments
 (0)