Skip to content

Commit 73c6452

Browse files
committed
Refine Volcano Room
1 parent 28f57ea commit 73c6452

2 files changed

Lines changed: 81 additions & 16 deletions

File tree

region/norfair/east/Volcano Room.json

Lines changed: 77 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -108,22 +108,29 @@
108108
"exitCondition": {
109109
"leaveWithRunway": {
110110
"length": 8,
111-
"openEnd": 1
111+
"openEnd": 1,
112+
"heated": false
112113
}
113-
}
114+
},
115+
"unlocksDoors": [
116+
{"types": ["ammo"], "requires": []}
117+
]
114118
},
115119
{
116120
"id": 2,
117121
"link": [1, 1],
118122
"name": "Crystal Flash",
123+
"entranceCondition": {
124+
"comeInNormally": {}
125+
},
119126
"requires": [
120127
{"resetRoom": {
121128
"nodes": [1]
122129
}},
123130
"h_CrystalFlash"
124131
],
125132
"flashSuitChecked": true,
126-
"devNote": "Resetting the room through node 1 ensures that there is no heat."
133+
"devNote": "The comeInNormally entrance condition ensures that there is no heat."
127134
},
128135
{
129136
"id": 3,
@@ -147,6 +154,14 @@
147154
{"lavaFrames": 60}
148155
]}
149156
]}
157+
],
158+
"exitCondition": {
159+
"leaveNormally": {}
160+
},
161+
"unlocksDoors": [
162+
{"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
163+
{"types": ["super"], "requires": []},
164+
{"types": ["powerbomb"], "requires": [{"lavaFrames": 60}]}
150165
]
151166
},
152167
{
@@ -160,17 +175,25 @@
160175
{"and": [
161176
"canCarefulJump",
162177
"canMockball",
163-
{"lavaFrames": 180}
178+
{"lavaFrames": 160}
164179
]},
165180
{"lavaFrames": 220}
166181
]},
167182
{"or": [
168183
{"and": [
169184
"canSpaceJumpWaterBounce",
170-
{"lavaFrames": 120}
185+
{"lavaFrames": 60}
171186
]},
172187
{"lavaFrames": 150}
173188
]}
189+
],
190+
"exitCondition": {
191+
"leaveNormally": {}
192+
},
193+
"unlocksDoors": [
194+
{"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
195+
{"types": ["super"], "requires": []},
196+
{"types": ["powerbomb"], "requires": [{"lavaFrames": 150}]}
174197
]
175198
},
176199
{
@@ -190,11 +213,18 @@
190213
"types": ["missiles"],
191214
"requires": [{"heatFrames": 20}]
192215
},
216+
{
217+
"types": ["super"],
218+
"requires": []
219+
},
193220
{
194221
"types": ["powerbomb"],
195222
"requires": [{"heatFrames": 60}]
196223
}
197-
]
224+
],
225+
"exitCondition": {
226+
"leaveNormally": {}
227+
}
198228
},
199229
{
200230
"id": 6,
@@ -211,7 +241,8 @@
211241
"exitCondition": {
212242
"leaveWithRunway": {
213243
"length": 8,
214-
"openEnd": 1
244+
"openEnd": 1,
245+
"heated": true
215246
}
216247
},
217248
"unlocksDoors": [
@@ -238,7 +269,24 @@
238269
{"heatFrames": 35}
239270
]},
240271
{"heatFrames": 405}
241-
]
272+
],
273+
"unlocksDoors": [
274+
{
275+
"types": ["missiles"],
276+
"requires": [{"heatFrames": 20}]
277+
},
278+
{
279+
"types": ["super"],
280+
"requires": []
281+
},
282+
{
283+
"types": ["powerbomb"],
284+
"requires": [{"heatFrames": 60}]
285+
}
286+
],
287+
"exitCondition": {
288+
"leaveNormally": {}
289+
}
242290
},
243291
{
244292
"id": 10,
@@ -337,6 +385,23 @@
337385
]},
338386
{"heatFrames": 1000}
339387
],
388+
"unlocksDoors": [
389+
{
390+
"types": ["missiles"],
391+
"requires": [{"heatFrames": 20}]
392+
},
393+
{
394+
"types": ["super"],
395+
"requires": []
396+
},
397+
{
398+
"types": ["powerbomb"],
399+
"requires": [{"heatFrames": 60}]
400+
}
401+
],
402+
"exitCondition": {
403+
"leaveNormally": {}
404+
},
340405
"flashSuitChecked": true,
341406
"note": [
342407
"Enter the morph tunnel then exit G-mode. Shooting the shot block off screen can be done by jumping and shooting up or with Grapple or a Power Bomb.",
@@ -353,13 +418,12 @@
353418
"entranceCondition": {
354419
"comeInNormally": {}
355420
},
356-
"requires": [
357-
{"heatFrames": 60}
358-
],
421+
"requires": [],
359422
"exitCondition": {
360423
"leaveWithRunway": {
361424
"length": 6,
362-
"openEnd": 1
425+
"openEnd": 1,
426+
"heated": true
363427
}
364428
},
365429
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
@@ -374,10 +438,7 @@
374438
"requires": [
375439
"h_heatedCrystalFlash"
376440
],
377-
"flashSuitChecked": true,
378-
"devNote": [
379-
"When coming from 1: A lava proof CF could CF at 1, otherwise going through this door should be less damage than staying in Lava."
380-
]
441+
"flashSuitChecked": true
381442
}
382443
],
383444
"notables": [],

schema/m3-room.schema.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,10 @@
10091009
"type": "string",
10101010
"pattern": "^\\$[0-9|A-F]\\.[0-9|A-F]+$",
10111011
"description": "Minimum extra run speed (in hexadecimal) with which it is possible to leave with this condition."
1012+
},
1013+
"heated": {
1014+
"type": "boolean",
1015+
"description": "Whether the runway is used in a heated environment. This only needs to be specified if the room is only sometimes heated (e.g. Volcano Room)."
10121016
}
10131017
}
10141018
},

0 commit comments

Comments
 (0)