Skip to content

Commit de5511a

Browse files
kjbranchkjbranch
committed
Remove spawnAt: Ridley, Amphitheatre, Screw
1 parent 6249bd3 commit de5511a

5 files changed

Lines changed: 269 additions & 121 deletions

File tree

‎region/lowernorfair/east/Amphitheatre.json‎

Lines changed: 144 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
}
2929
],
3030
"useImplicitDoorUnlocks": false,
31-
"spawnAt": 6
31+
"useImplicitComeInNormally": false,
32+
"useImplicitComeInWithMockball": false,
33+
"useImplicitCarryGModeBackThrough": false,
34+
"useImplicitCarryGModeMorphBackThrough": false
3235
},
3336
{
3437
"id": 2,
@@ -56,12 +59,6 @@
5659
"name": "Below Left Door Junction",
5760
"nodeType": "junction",
5861
"nodeSubType": "junction"
59-
},
60-
{
61-
"id": 6,
62-
"name": "Left Door Spawn At Junction",
63-
"nodeType": "junction",
64-
"nodeSubType": "junction"
6562
}
6663
],
6764
"enemies": [
@@ -122,7 +119,8 @@
122119
"to": [
123120
{"id": 1},
124121
{"id": 3},
125-
{"id": 6}
122+
{"id": 4},
123+
{"id": 5}
126124
]
127125
},
128126
{
@@ -156,15 +154,6 @@
156154
"to": [
157155
{"id": 1}
158156
]
159-
},
160-
{
161-
"from": 6,
162-
"to": [
163-
{"id": 1},
164-
{"id": 3},
165-
{"id": 4},
166-
{"id": 5}
167-
]
168157
}
169158
],
170159
"strats": [
@@ -187,6 +176,59 @@
187176
],
188177
"devNote": "FIXME: Add acid-filled version of the runway, and requirements to unlock the door with Missiles and Power Bombs."
189178
},
179+
{
180+
"link": [1, 1],
181+
"name": "Land in Door Frame",
182+
"entranceCondition": {
183+
"comeInNormally": {}
184+
},
185+
"requires": [
186+
"canPrepareForNextRoom",
187+
"canInsaneJump",
188+
{"heatFrames": 55},
189+
{"doorUnlockedAtNode": 1}
190+
],
191+
"unlocksDoors": [
192+
{"types": ["super"], "requires": []},
193+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
194+
],
195+
"devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
196+
},
197+
{
198+
"link": [1, 1],
199+
"name": "Door Stuck, Open Door",
200+
"entranceCondition": {
201+
"comeInWithDoorStuckSetup": {}
202+
},
203+
"requires": [
204+
"canPrepareForNextRoom",
205+
{"heatFrames": 55},
206+
{"doorUnlockedAtNode": 1}
207+
],
208+
"unlocksDoors": [
209+
{"types": ["ammo"], "requires": []}
210+
],
211+
"devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
212+
},
213+
{
214+
"id": 36,
215+
"link": [1, 1],
216+
"name": "SpinJump Entry",
217+
"requires": [
218+
"canPrepareForNextRoom",
219+
{"or": [
220+
"SpaceJump",
221+
"canWalljump"
222+
]},
223+
{"heatFrames": 80},
224+
{"doorUnlockedAtNode": 1}
225+
],
226+
"unlocksDoors": [
227+
{"types": ["super"], "requires": []},
228+
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
229+
],
230+
"devNote": "This would technically clear A, but depending on what is being done here, there will likely be too much acid to cross the room."
231+
},
190232
{
191233
"id": 2,
192234
"link": [1, 1],
@@ -254,6 +296,26 @@
254296
"flashSuitChecked": true,
255297
"devNote": "Artificial morph will allow Samus not to fall; real Morph is not sufficient."
256298
},
299+
{
300+
"id": 37,
301+
"link": [1, 3],
302+
"name": "Base",
303+
"entranceCondition": {
304+
"comeInNormally": {}
305+
},
306+
"requires": [
307+
{"or": [
308+
"ScrewAttack",
309+
{"heatFrames": 60}
310+
]},
311+
{"heatFrames": 300}
312+
],
313+
"clearsObstacles": ["A"],
314+
"note": [
315+
"Falling into the room while holding right is safe at low horizontal speed.",
316+
"Pirates can be shot with any weapon to prevent them from firing."
317+
]
318+
},
257319
{
258320
"id": 5,
259321
"link": [1, 3],
@@ -294,6 +356,71 @@
294356
"Pirates can be shot with any weapon to prevent them from firing."
295357
]
296358
},
359+
{
360+
"link": [1, 3],
361+
"name": "Fall Into Room With Mockball",
362+
"entranceCondition": {
363+
"comeInWithMockball": {
364+
"adjacentMinTiles": 0,
365+
"remoteAndLandingMinTiles": [[0, 0]],
366+
"speedBooster": "any"
367+
}
368+
},
369+
"requires": [
370+
{"or": [
371+
"ScrewAttack",
372+
{"heatFrames": 60}
373+
]},
374+
{"heatFrames": 300}
375+
],
376+
"clearsObstacles": ["A"],
377+
"flashSuitChecked": true,
378+
"devNote": [
379+
"FIXME: There are better ways to fall to 3, but coming in with an unfamiliar speed could land Samus in a bad position."
380+
]
381+
},
382+
{
383+
"id": 38,
384+
"link": [1, 4],
385+
"name": "SpaceJump",
386+
"entranceCondition": {
387+
"comeInNormally": {}
388+
},
389+
"requires": [
390+
"canPrepareForNextRoom",
391+
"SpaceJump",
392+
{"heatFrames": 500}
393+
],
394+
"clearsObstacles": ["A"]
395+
},
396+
{
397+
"id": 39,
398+
"link": [1, 5],
399+
"name": "Base",
400+
"entranceCondition": {
401+
"comeInNormally": {}
402+
},
403+
"requires": [
404+
{"heatFrames": 180}
405+
],
406+
"clearsObstacles": ["A"]
407+
},
408+
{
409+
"link": [1, 5],
410+
"name": "Fall Into Room With Mockball",
411+
"entranceCondition": {
412+
"comeInWithMockball": {
413+
"adjacentMinTiles": 0,
414+
"remoteAndLandingMinTiles": [[0, 0]],
415+
"speedBooster": "any"
416+
}
417+
},
418+
"requires": [
419+
{"heatFrames": 180}
420+
],
421+
"clearsObstacles": ["A"],
422+
"flashSuitChecked": true
423+
},
297424
{
298425
"id": 7,
299426
"link": [2, 1],
@@ -958,66 +1085,6 @@
9581085
"This strat is only used to avoid walljumping.",
9591086
"FIXME: Gravity heat reduction is disabled for part of this strat."
9601087
]
961-
},
962-
{
963-
"id": 36,
964-
"link": [6, 1],
965-
"name": "SpinJump Entry",
966-
"requires": [
967-
"canPrepareForNextRoom",
968-
{"or": [
969-
"SpaceJump",
970-
"canWalljump",
971-
{"and": [
972-
"canTrickyJump",
973-
"canMomentumConservingTurnaround"
974-
]},
975-
"canStationarySpinJump"
976-
]},
977-
{"heatFrames": 80}
978-
],
979-
"clearsObstacles": ["A"],
980-
"unlocksDoors": [
981-
{"types": ["super"], "requires": []},
982-
{"types": ["missiles", "powerbomb"], "requires": ["never"]}
983-
]
984-
},
985-
{
986-
"id": 37,
987-
"link": [6, 3],
988-
"name": "Base",
989-
"requires": [
990-
{"or": [
991-
"ScrewAttack",
992-
{"heatFrames": 60}
993-
]},
994-
{"heatFrames": 300}
995-
],
996-
"clearsObstacles": ["A"],
997-
"note": [
998-
"Falling into the room while holding right is safe at low horizontal speed.",
999-
"Pirates can be shot with any weapon to prevent them from firing."
1000-
]
1001-
},
1002-
{
1003-
"id": 38,
1004-
"link": [6, 4],
1005-
"name": "SpaceJump",
1006-
"requires": [
1007-
"canPrepareForNextRoom",
1008-
"SpaceJump",
1009-
{"heatFrames": 500}
1010-
],
1011-
"clearsObstacles": ["A"]
1012-
},
1013-
{
1014-
"id": 39,
1015-
"link": [6, 5],
1016-
"name": "Base",
1017-
"requires": [
1018-
{"heatFrames": 180}
1019-
],
1020-
"clearsObstacles": ["A"]
10211088
}
10221089
],
10231090
"nextStratId": 40,

0 commit comments

Comments
 (0)