Skip to content

Commit 0418590

Browse files
committed
fix errors
1 parent 5f98978 commit 0418590

2 files changed

Lines changed: 26 additions & 21 deletions

File tree

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,6 +1567,25 @@
15671567
"note": "Kill or get the Beetom stuck below the platform, then lure a Zebbo to the left door. Be careful not to let the Zebbo go off camera or it will despawn.",
15681568
"devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
15691569
},
1570+
{
1571+
"link": [4, 4],
1572+
"name": "X-Mode, Leave With Spark",
1573+
"requires": [
1574+
{"obstaclesCleared": ["A"]},
1575+
"canXMode",
1576+
"h_XModeThornHit",
1577+
"h_shinechargeMaxRunway",
1578+
{"shinespark": {"frames": 62, "excessFrames": 0}}
1579+
],
1580+
"exitCondition": {
1581+
"leaveWithSpark": {}
1582+
},
1583+
"note": [
1584+
"While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
1585+
"by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
1586+
"a second thorn hit can be avoided."
1587+
]
1588+
},
15701589
{
15711590
"id": 88,
15721591
"link": [4, 5],
@@ -1946,24 +1965,6 @@
19461965
"requires": [],
19471966
"flashSuitChecked": true
19481967
},
1949-
{
1950-
"link": [7, 4],
1951-
"name": "X-Mode, Leave With Spark",
1952-
"requires": [
1953-
"canXMode",
1954-
"h_XModeThornHit",
1955-
"h_shinechargeMaxRunway",
1956-
{"shinespark": {"frames": 62, "excessFrames": 0}}
1957-
],
1958-
"exitCondition": {
1959-
"leaveWithSpark": {}
1960-
},
1961-
"note": [
1962-
"While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
1963-
"by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
1964-
"a second thorn hit can be avoided."
1965-
]
1966-
},
19671968
{
19681969
"id": 72,
19691970
"link": [7, 6],

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@
100100
"from": 1,
101101
"to": [
102102
{"id": 1},
103-
{"id": 2}
103+
{"id": 2},
104+
{"id": 3}
104105
]
105106
},
106107
{
@@ -944,13 +945,14 @@
944945
"exitCondition": {
945946
"leaveWithSpark": {}
946947
},
948+
"unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}],
947949
"flashSuitChecked": true,
948950
"note": [
949951
"Use the spikes in the center of the room to gain a shinecharge with X-Mode.",
950952
"Then arm pump until Samus reaches the middle Yapping Maw.",
951953
"Exit X-mode, gain run speed, and jump toward the door and shinespark out."
952954
],
953-
"devNote": "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
955+
"devNote": "Unlocking the door is free since obstacle A being cleared implies it was already unlocked earlier if needed."
954956
},
955957
{
956958
"link": [3, 1],
@@ -974,7 +976,9 @@
974976
"Use the spikes in the center of the room to gain a shinecharge with X-Mode.",
975977
"Then arm pump until Samus reaches the middle Yapping Maw.",
976978
"Exit X-mode, gain run speed, and use Space Jump to reach the door."
977-
]
979+
],
980+
"unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}],
981+
"devNote": "Unlocking the door is free since obstacle A being cleared implies it was already unlocked earlier if needed."
978982
},
979983
{
980984
"id": 52,

0 commit comments

Comments
 (0)