Skip to content

Commit a7f1ded

Browse files
aquanightaquanight
committed
Simplify upper door farming
1 parent c857226 commit a7f1ded

1 file changed

Lines changed: 41 additions & 123 deletions

File tree

‎region/lowernorfair/east/Lower Norfair Fireflea Room.json‎

Lines changed: 41 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -375,90 +375,48 @@
375375
},
376376
{
377377
"link": [1, 3],
378-
"name": "R-Mode Spark Interrupt (Gain Blue Suit) - Farm Firefleas",
378+
"name": "R-Mode Spark Interrupt (Gain Blue Suit) - Farm for energy",
379379
"entranceCondition": {
380380
"comeInWithRMode": {}
381381
},
382382
"requires": [
383+
"canTrickyJump",
384+
{"or": [
385+
"Morph",
386+
{"enemyKill": {"enemies": [["Boulder"]]}},
387+
{"and": [ {"disableEquipment": "ScrewAttack"}, "canPseudoScrew" ]}
388+
]},
383389
{"or": [
384390
{"and": [
385-
"ScrewAttack",
386-
{"or": [
387-
"canCarefulJump",
388-
"h_usePowerBomb",
389-
{"ammo": {"type": "Super", "count": 1}},
390-
{"and": [ {"disableEquipment": "ScrewAttack"}, "canPseudoScrew" ]},
391-
{"enemyDamage": {"enemy": "Fune", "type": "fireball", "hits": 1}}
392-
]}
391+
{"enemyKill": {"enemies": [["Fune"]]}},
392+
"h_RModeCanRefillReserves",
393+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
394+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]}
393395
]},
394396
{"and": [
395397
"Morph",
396398
{"or": [
397-
"canTrickyJump",
398-
"h_usePowerBomb",
399-
{"ammo": {"type": "Super", "count": 1}},
400-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}},
401-
{"and": [
402-
{"enemyDamage": {"enemy": "Fune", "type": "contact", "hits": 1}},
403-
"canKago",
404-
"canUseIFrames"
405-
]},
406-
{"and": ["Ice", "canCarefulJump"]}
407-
]}
408-
]},
409-
{"and": [
410-
"SpaceJump",
411-
"canCarefulJump",
412-
{"or": [
413-
{"ammo": {"type": "Super", "count": 1}},
414-
{"and": [{"disableEquipment": "ScrewAttack"}, "canPseudoScrew"]},
415-
"Ice",
416-
"canTrickyJump",
417-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
418-
]}
419-
]},
420-
{"and": [
421-
{"or": [
422-
{"ammo": {"type": "Super", "count": 2}},
399+
"h_useSpringBall",
423400
{"and": [
424-
{"ammo": {"type": "Super", "count": 1}},
425-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
426-
]},
427-
{"and": [{"disableEquipment": "ScrewAttack"}, "canPseudoScrew"]}
401+
"h_useMorphBombs",
402+
"canBombHorizontally"
403+
]}
428404
]},
429-
{"or": [
430-
"Ice",
431-
"canCarefulJump"
432-
]}
433-
]},
434-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 2}},
435-
{"and": [
436-
"canInsaneWalljump",
437-
"canInsaneJump"
438-
]}
439-
]},
440-
{"or": [
441-
{"enemyKill": {"enemies": [["Fune"]]}},
442-
"h_useSpringBall",
443-
{"and": [
444-
"h_useMorphBombs",
445-
"canBombHorizontally",
446-
{"or": ["Ice", "canCarefulJump"]}
405+
"h_RModeCanRefillReserves",
406+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
407+
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
408+
{"canShineCharge": {"usedTiles": 17, "gentleUpTiles": 6, "steepUpTiles": 1, "openEnd": 1}},
409+
{"shinespark": {"frames": 9, "excessFrames": 4}}
447410
]}
448411
]},
449-
"h_RModeCanRefillReserves",
450-
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
451-
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
452412
{"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
453413
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
454414
"canRModeSparkInterrupt"
455415
],
456416
"flashSuitChecked": true,
457417
"blueSuitChecked": true,
458418
"note": [
459-
"Leave the top Fune alive as you head down to the fireflea pit. You can farm the top fireflea without",
460-
"having to drop down. Go back up to the top runway and shinecharge, then jump into the top Fune's",
461-
"fireball to interrupt."
419+
"With Supers or PBs, kill all of the Funes except the topmost."
462420
],
463421
"devNote": [
464422
"FIXME: Notable strat 'Morph Over The Fune' for getting over the secret fune (and then R-Jump to get out) isn't included."
@@ -1343,80 +1301,40 @@
13431301
},
13441302
{
13451303
"link": [3, 3],
1346-
"name": "R-Mode Spark Interrupt (Gain Blue Suit) - Farm Firefleas",
1304+
"name": "R-Mode Spark Interrupt (Gain Blue Suit) - Farm for energy",
13471305
"entranceCondition": {
13481306
"comeInWithRMode": {}
13491307
},
13501308
"requires": [
1309+
"canTrickyJump",
1310+
{"or": [
1311+
"Morph",
1312+
{"enemyKill": {"enemies": [["Boulder"]]}},
1313+
{"and": [ {"disableEquipment": "ScrewAttack"}, "canPseudoScrew" ]}
1314+
]},
13511315
{"or": [
13521316
{"and": [
1353-
"ScrewAttack",
1354-
{"or": [
1355-
"canCarefulJump",
1356-
"h_usePowerBomb",
1357-
{"ammo": {"type": "Super", "count": 1}},
1358-
{"and": [ {"disableEquipment": "ScrewAttack"}, "canPseudoScrew" ]},
1359-
{"enemyDamage": {"enemy": "Fune", "type": "fireball", "hits": 1}}
1360-
]}
1317+
{"enemyKill": {"enemies": [["Fune"]]}},
1318+
"h_RModeCanRefillReserves",
1319+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
1320+
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]}
13611321
]},
13621322
{"and": [
13631323
"Morph",
13641324
{"or": [
1365-
"canTrickyJump",
1366-
"h_usePowerBomb",
1367-
{"ammo": {"type": "Super", "count": 1}},
1368-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}},
1369-
{"and": [
1370-
{"enemyDamage": {"enemy": "Fune", "type": "contact", "hits": 1}},
1371-
"canKago",
1372-
"canUseIFrames"
1373-
]},
1374-
{"and": ["Ice", "canCarefulJump"]}
1375-
]}
1376-
]},
1377-
{"and": [
1378-
"SpaceJump",
1379-
"canCarefulJump",
1380-
{"or": [
1381-
{"ammo": {"type": "Super", "count": 1}},
1382-
{"and": [{"disableEquipment": "ScrewAttack"}, "canPseudoScrew"]},
1383-
"Ice",
1384-
"canTrickyJump",
1385-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
1386-
]}
1387-
]},
1388-
{"and": [
1389-
{"or": [
1390-
{"ammo": {"type": "Super", "count": 2}},
1325+
"h_useSpringBall",
13911326
{"and": [
1392-
{"ammo": {"type": "Super", "count": 1}},
1393-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 1}}
1394-
]},
1395-
{"and": [{"disableEquipment": "ScrewAttack"}, "canPseudoScrew"]}
1327+
"h_useMorphBombs",
1328+
"canBombHorizontally"
1329+
]}
13961330
]},
1397-
{"or": [
1398-
"Ice",
1399-
"canCarefulJump"
1400-
]}
1401-
]},
1402-
{"enemyDamage": {"enemy": "Boulder", "type": "contact", "hits": 2}},
1403-
{"and": [
1404-
"canInsaneWalljump",
1405-
"canInsaneJump"
1406-
]}
1407-
]},
1408-
{"or": [
1409-
{"enemyKill": {"enemies": [["Fune"]]}},
1410-
"h_useSpringBall",
1411-
{"and": [
1412-
"h_useMorphBombs",
1413-
"canBombHorizontally",
1414-
{"or": ["Ice", "canCarefulJump"]}
1331+
"h_RModeCanRefillReserves",
1332+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
1333+
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
1334+
{"canShineCharge": {"usedTiles": 17, "gentleUpTiles": 6, "steepUpTiles": 1, "openEnd": 1}},
1335+
{"shinespark": {"frames": 9, "excessFrames": 4}}
14151336
]}
14161337
]},
1417-
"h_RModeCanRefillReserves",
1418-
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
1419-
{"resourceMissingAtMost": [{"type": "PowerBomb", "count": 0}]},
14201338
{"canShineCharge": {"usedTiles": 21, "gentleDownTiles": 3, "gentleUpTiles": 3, "openEnd": 1}},
14211339
{"autoReserveTrigger": {"maxReserveEnergy": 95}},
14221340
"canRModeSparkInterrupt"

0 commit comments

Comments
 (0)