Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion region/brinstar/blue/Morph Ball Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"note": "Unmorph and quickly kill the hoppers on entry."
},
{
"id": 92,
"link": [1, 1],
"name": "Blue Speed Entry",
"entranceCondition": {
Expand Down Expand Up @@ -775,6 +776,7 @@
]
},
{
"id": 93,
"link": [1, 1],
"name": "Come In Blue Spinning",
"entranceCondition": {
Expand Down Expand Up @@ -1232,6 +1234,7 @@
]
},
{
"id": 94,
"link": [1, 5],
"name": "Come In Blue Spinning, Speedball",
"entranceCondition": {
Expand Down Expand Up @@ -2035,6 +2038,6 @@
}
],
"notables": [],
"nextStratId": 92,
"nextStratId": 95,
"nextNotableId": 1
}
7 changes: 4 additions & 3 deletions region/brinstar/green/Early Supers Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
"devNote": ["This strat avoids the need to dash."]
},
{
"id": 61,
"link": [1, 2],
"name": "Wall Ice Clip X-Ray Climb Gate Clip",
"requires": [
Expand All @@ -449,10 +450,10 @@
"Freeze a Zeb inside the pillar below the gate. The Zeb's face should stick out slightly if it's frozen in the correct position.",
"Run or walk into the pillar to clip into it. Press Down to crouch, then X-Ray climb to clip into the gate and walk through it."
],
"detailNote": [
"detailNote": [
"Walking into the pillar is possible but is more precise and may require several tries."
],
"devNote": ["This strat avoids the need to dash."]
"devNote": ["This strat avoids the need to dash."]
},
{
"id": 13,
Expand Down Expand Up @@ -1422,6 +1423,6 @@
]
}
],
"nextStratId": 61,
"nextStratId": 62,
"nextNotableId": 4
}
6 changes: 3 additions & 3 deletions region/brinstar/green/Green Hill Zone.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@
]
},
{
"id": 99,
"link": [1, 1],
"name": "Gain Flash Suit (Geegas R-Mode Knockback Spark)",
"entranceCondition": {
Expand All @@ -333,8 +334,7 @@
{"or": [
{"disableEquipment": "ETank"},
"canBeVeryPatient"
]
},
]},
{"canShineCharge": {"usedTiles": 18, "openEnd": 1}},
"h_RModeKnockbackSpark"
],
Expand Down Expand Up @@ -2073,6 +2073,6 @@
]
}
],
"nextStratId": 99,
"nextStratId": 100,
"nextNotableId": 7
}
3 changes: 2 additions & 1 deletion region/brinstar/green/Noob Bridge.json
Original file line number Diff line number Diff line change
Expand Up @@ -737,6 +737,7 @@
"blueSuitChecked": true
},
{
"id": 41,
"link": [2, 2],
"name": "Leave With Temporary Blue",
"requires": [
Expand Down Expand Up @@ -805,6 +806,6 @@
]
}
],
"nextStratId": 41,
"nextStratId": 42,
"nextNotableId": 2
}
3 changes: 2 additions & 1 deletion region/brinstar/green/Spore Spawn Kihunter Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,7 @@
"blueSuitChecked": true
},
{
"id": 27,
"link": [2, 2],
"name": "Leave With Temporary Blue",
"requires": [
Expand Down Expand Up @@ -620,6 +621,6 @@
]
}
],
"nextStratId": 27,
"nextStratId": 28,
"nextNotableId": 2
}
5 changes: 4 additions & 1 deletion region/crateria/west/Gauntlet Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,7 @@
"blueSuitChecked": true
},
{
"id": 70,
"link": [1, 4],
"name": "Come In Getting Blue Speed, Blue Space Jump, Kill Zebo on Entry",
"entranceCondition": {
Expand All @@ -767,6 +768,7 @@
"blueSuitChecked": true
},
{
"id": 71,
"link": [1, 4],
"name": "Blue Space Jump, In-Room Runway",
"requires": [
Expand Down Expand Up @@ -795,6 +797,7 @@
"blueSuitChecked": true
},
{
"id": 72,
"link": [1, 4],
"name": "Come In Blue Spinning, Blue Space Jump",
"entranceCondition": {
Expand Down Expand Up @@ -1617,7 +1620,7 @@
]
}
],
"nextStratId": 70,
"nextStratId": 73,
"nextNotableId": 3,
"devNote": ["FIXME: Add canLongChainTemporaryBlue left-to-right strats."]
}
3 changes: 2 additions & 1 deletion region/crateria/west/Terminator Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,7 @@
]
},
{
"id": 25,
"link": [2, 2],
"name": "Gain Blue Suit (Slope X-Mode)",
"requires": [
Expand Down Expand Up @@ -481,6 +482,6 @@
}
],
"notables": [],
"nextStratId": 25,
"nextStratId": 26,
"nextNotableId": 1
}
3 changes: 2 additions & 1 deletion region/lowernorfair/east/Mickey Mouse Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -2995,6 +2995,7 @@
"detailNote": "This variant is only useful if Samus needs to break some of the Bomb blocks to go up after collecting the item."
},
{
"id": 107,
"link": [9, 4],
"name": "Multiviola Clip, Flash Suit the Blocks",
"requires": [
Expand Down Expand Up @@ -3071,6 +3072,6 @@
]
}
],
"nextStratId": 107,
"nextStratId": 108,
"nextNotableId": 5
}
17 changes: 12 additions & 5 deletions region/maridia/inner-pink/Aqueduct.json
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@
"blueSuitChecked": true
},
{
"id": 199,
"link": [1, 1],
"name": "R-Mode Entry",
"entranceCondition": {
Expand Down Expand Up @@ -550,14 +551,15 @@
"blueSuitChecked": true
},
{
"id": 200,
"link": [2, 1],
"name": "Gravity Jump",
"requires": [
"canGravityJump"
],
"wallJumpAvoid": true,
"flashSuitChecked": true,
"blueSuitChecked": true,
"wallJumpAvoid": true
"blueSuitChecked": true
},
{
"id": 13,
Expand Down Expand Up @@ -1355,6 +1357,7 @@
]
},
{
"id": 201,
"link": [2, 2],
"name": "R-Mode Entry",
"entranceCondition": {
Expand Down Expand Up @@ -1792,6 +1795,7 @@
"note": "Watch out for snails coming from above, or aggressive snails from below, who will either block or attack Samus."
},
{
"id": 202,
"link": [2, 9],
"name": "Gravity Jump",
"requires": [
Expand All @@ -1804,9 +1808,9 @@
]}
]}
],
"wallJumpAvoid": true,
"flashSuitChecked": true,
"blueSuitChecked": true,
"wallJumpAvoid": true,
"note": [
"Gravity Jump up to the top with HiJump.",
"It is possible to jump up without HiJump with a precise jump and equipping Spring Ball and Gravity at the peak of the jump."
Expand Down Expand Up @@ -2418,6 +2422,7 @@
"blueSuitChecked": true
},
{
"id": 203,
"link": [5, 5],
"name": "R-Mode Entry",
"entranceCondition": {
Expand Down Expand Up @@ -2995,6 +3000,7 @@
]
},
{
"id": 204,
"link": [6, 6],
"name": "R-Mode Entry",
"entranceCondition": {
Expand Down Expand Up @@ -3133,6 +3139,7 @@
]
},
{
"id": 205,
"link": [6, 6],
"name": "R-Mode Forced Standup clip",
"requires": [
Expand All @@ -3154,9 +3161,9 @@
]},
{"autoReserveTrigger": {}}
],
"bypassesDoorShell": "yes",
"flashSuitChecked": true,
"blueSuitChecked": true,
"bypassesDoorShell": "yes",
"note": [
"Gain Reserve Energy with a Crystal Flash or farm Yards with Bombs or Speed Booster.",
"Shoot a Yard with a beam shot to anger it, then Morph on top of another against the door.",
Expand Down Expand Up @@ -4131,7 +4138,7 @@
]
}
],
"nextStratId": 199,
"nextStratId": 206,
"nextNotableId": 10,
"devNote": [
"FIXME: An obstacle or two could be added to represent the bomb blocks and crumble blocks, and simple 1->9 strats could be added;",
Expand Down
4 changes: 3 additions & 1 deletion region/maridia/inner-pink/West Sand Pit.json
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@
]
},
{
"id": 42,
"link": [7, 5],
"name": "Spring Ball into IBJ",
"requires": [
Expand All @@ -733,6 +734,7 @@
]
},
{
"id": 43,
"link": [7, 5],
"name": "Gravity, Spring Ball, Power Bomb Boost",
"requires": [
Expand Down Expand Up @@ -827,6 +829,6 @@
]
}
],
"nextStratId": 42,
"nextStratId": 44,
"nextNotableId": 4
}
3 changes: 2 additions & 1 deletion region/maridia/outer/Mt. Everest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1404,6 +1404,7 @@
]
},
{
"id": 294,
"link": [2, 6],
"name": "Leave Shinecharged",
"requires": [
Expand Down Expand Up @@ -6818,7 +6819,7 @@
]
}
],
"nextStratId": 294,
"nextStratId": 295,
"nextNotableId": 14,
"devNote": [
"FIXME: A 4->6 grapple teleport is possible, but the wrong-side transition will usually put Samus out-of-bounds. "
Expand Down
4 changes: 3 additions & 1 deletion region/norfair/crocomire/Crocomire's Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@
"blueSuitChecked": true
},
{
"id": 73,
"link": [2, 2],
"name": "Leave With Temporary Blue",
"requires": [
Expand All @@ -496,6 +497,7 @@
"blueSuitChecked": true
},
{
"id": 74,
"link": [2, 2],
"name": "Leave With Temporary Blue - Crocomire Alive",
"requires": [
Expand Down Expand Up @@ -1456,6 +1458,6 @@
]
}
],
"nextStratId": 73,
"nextStratId": 75,
"nextNotableId": 2
}
8 changes: 6 additions & 2 deletions region/norfair/crocomire/Post Crocomire Farming Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1333,6 +1333,7 @@
]
},
{
"id": 100,
"link": [3, 4],
"name": "Leave Shinecharged (Wall Jump)",
"requires": [
Expand Down Expand Up @@ -1703,6 +1704,7 @@
"blueSuitChecked": true
},
{
"id": 101,
"link": [4, 1],
"name": "Insane, Damageless, Continuous Wall Jump",
"requires": [
Expand All @@ -1714,7 +1716,9 @@
"canInsaneWallJump",
"canBeVeryPatient",
{"or": [
{"enemyKill": {"enemies": [["Ripper 2 (green)"]]}},
{"enemyKill": {
"enemies": [["Ripper 2 (green)"]]
}},
{"and": [
"h_enemyDrops",
{"or": [
Expand Down Expand Up @@ -2097,6 +2101,6 @@
"note": "Use the moving platform (Kamer) to elevate the Gamets."
}
],
"nextStratId": 100,
"nextStratId": 102,
"nextNotableId": 3
}
Loading
Loading