Skip to content

Commit 4dc7d55

Browse files
blkerbyblkerby
authored
Merge pull request #2124 from blkerby/volcano-room
Refine Volcano Room
2 parents 2c1b7d7 + 365c8c3 commit 4dc7d55

4 files changed

Lines changed: 209 additions & 17 deletions

File tree

‎logicalRequirements.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,22 @@ __Example:__
242242
}}
243243
```
244244

245+
#### lavaFramesWithEnergyDrops object
246+
247+
A `lavaFramesWithEnergyDrops` object represents the need for Samus to spend time in lava, but with the possibility of offsetting some of the lava damage using energy drops from enemies. Any lava damage is logically applied before the energy gain, so Samus must be able to survive the heat before picking up the drops. Any energy gain is logically capped to not exceed the heat damage, so this logical requirement cannot result in a net energy gain.
248+
249+
The actual amount of energy gained typically depends on RNG and also on which ammo types are completely full. The drop probabilities for each enemy type is given in the [enemies](enemies/main.json) file. Because of the randomness involved, the logical amount of energy gain is open to various interpretations. For example, the mean, the median, or a lower confidence limit could be used.
250+
251+
__Example:__
252+
```json
253+
{"lavaFramesWithEnergyDrops": {
254+
"frames": 200,
255+
"drops": [
256+
{"enemy": "Fune", "count": 1}
257+
]
258+
}}
259+
```
260+
245261
#### gravitylessHeatFrames object
246262
A `gravitylessHeatFrames` object represents Samus in a heated environment with Gravity Suit turned off, even if it is available. The number of frames here needs to be represented as `heatFrames` without the reduction effects given by Gravity Suit.
247263

‎region/norfair/east/Volcano Room.json‎

Lines changed: 158 additions & 17 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,18 @@
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}]}
165+
],
166+
"devNote": [
167+
"FIXME: A leaveWithRunway variation could be added, but it would require Speed Booster to be disabled,",
168+
"which would need new schema support in order to properly match entrance conditions in the next room."
150169
]
151170
},
152171
{
@@ -160,19 +179,70 @@
160179
{"and": [
161180
"canCarefulJump",
162181
"canMockball",
163-
{"lavaFrames": 180}
182+
{"lavaFrames": 155}
164183
]},
165-
{"lavaFrames": 220}
184+
{"lavaFrames": 200}
166185
]},
167186
{"or": [
168187
{"and": [
169188
"canSpaceJumpWaterBounce",
170-
{"lavaFrames": 120}
189+
{"or": [
190+
{"and": [
191+
"canPreciseSpaceJump",
192+
{"lavaFrames": 35}
193+
]},
194+
{"lavaFrames": 60}
195+
]}
171196
]},
172197
{"lavaFrames": 150}
173198
]}
199+
],
200+
"exitCondition": {
201+
"leaveNormally": {}
202+
},
203+
"unlocksDoors": [
204+
{"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
205+
{"types": ["super"], "requires": []},
206+
{"types": ["powerbomb"], "requires": [{"lavaFrames": 150}]}
174207
]
175208
},
209+
{
210+
"link": [1, 2],
211+
"name": "Farm Funes and Suitless Lava Dive",
212+
"requires": [
213+
"canSuitlessLavaDive",
214+
"canFarmWhileShooting",
215+
{"enemyKill": {"enemies": [["Fune", "Fune"]], "explicitWeapons": ["PowerBomb"]}},
216+
"canMockball",
217+
{"lavaFramesWithEnergyDrops": {
218+
"frames": 120,
219+
"drops": [{"enemy": "Fune", "count": 1}]
220+
}},
221+
{"lavaFrames": 35},
222+
{"or": [
223+
{"and": [
224+
"canSpaceJumpWaterBounce",
225+
{"or": [
226+
{"and": [
227+
"canPreciseSpaceJump",
228+
{"lavaFrames": 35}
229+
]},
230+
{"lavaFrames": 60}
231+
]}
232+
]},
233+
{"lavaFrames": 150}
234+
]}
235+
],
236+
"exitCondition": {
237+
"leaveNormally": {}
238+
},
239+
"unlocksDoors": [
240+
{"types": ["missiles"], "requires": [{"lavaFrames": 80}]},
241+
{"types": ["super"], "requires": []},
242+
{"types": ["powerbomb"], "requires": [{"lavaFrames": 150}]}
243+
],
244+
"devNote": "FIXME: a Gravity version of this could be added."
245+
},
176246
{
177247
"id": 5,
178248
"link": [2, 1],
@@ -190,11 +260,18 @@
190260
"types": ["missiles"],
191261
"requires": [{"heatFrames": 20}]
192262
},
263+
{
264+
"types": ["super"],
265+
"requires": []
266+
},
193267
{
194268
"types": ["powerbomb"],
195269
"requires": [{"heatFrames": 60}]
196270
}
197-
]
271+
],
272+
"exitCondition": {
273+
"leaveNormally": {}
274+
}
198275
},
199276
{
200277
"id": 6,
@@ -211,7 +288,8 @@
211288
"exitCondition": {
212289
"leaveWithRunway": {
213290
"length": 8,
214-
"openEnd": 1
291+
"openEnd": 1,
292+
"heated": true
215293
}
216294
},
217295
"unlocksDoors": [
@@ -238,7 +316,57 @@
238316
{"heatFrames": 35}
239317
]},
240318
{"heatFrames": 405}
241-
]
319+
],
320+
"unlocksDoors": [
321+
{
322+
"types": ["missiles"],
323+
"requires": [{"heatFrames": 20}]
324+
},
325+
{
326+
"types": ["super"],
327+
"requires": []
328+
},
329+
{
330+
"types": ["powerbomb"],
331+
"requires": [{"heatFrames": 60}]
332+
}
333+
],
334+
"exitCondition": {
335+
"leaveNormally": {}
336+
}
337+
},
338+
{
339+
"link": [2, 1],
340+
"name": "Come in Running, Space Jump",
341+
"entranceCondition": {
342+
"comeInRunning": {
343+
"minTiles": 2,
344+
"speedBooster": "any"
345+
}
346+
},
347+
"requires": [
348+
"Morph",
349+
"SpaceJump",
350+
"canMockball",
351+
{"heatFrames": 390}
352+
],
353+
"unlocksDoors": [
354+
{
355+
"types": ["missiles"],
356+
"requires": [{"heatFrames": 20}]
357+
},
358+
{
359+
"types": ["super"],
360+
"requires": []
361+
},
362+
{
363+
"types": ["powerbomb"],
364+
"requires": [{"heatFrames": 60}]
365+
}
366+
],
367+
"exitCondition": {
368+
"leaveNormally": {}
369+
}
242370
},
243371
{
244372
"id": 10,
@@ -337,6 +465,23 @@
337465
]},
338466
{"heatFrames": 1000}
339467
],
468+
"unlocksDoors": [
469+
{
470+
"types": ["missiles"],
471+
"requires": [{"heatFrames": 20}]
472+
},
473+
{
474+
"types": ["super"],
475+
"requires": []
476+
},
477+
{
478+
"types": ["powerbomb"],
479+
"requires": [{"heatFrames": 60}]
480+
}
481+
],
482+
"exitCondition": {
483+
"leaveNormally": {}
484+
},
340485
"flashSuitChecked": true,
341486
"note": [
342487
"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 +498,12 @@
353498
"entranceCondition": {
354499
"comeInNormally": {}
355500
},
356-
"requires": [
357-
{"heatFrames": 60}
358-
],
501+
"requires": [],
359502
"exitCondition": {
360503
"leaveWithRunway": {
361504
"length": 6,
362-
"openEnd": 1
505+
"openEnd": 1,
506+
"heated": true
363507
}
364508
},
365509
"unlocksDoors": [{"types": ["ammo"], "requires": []}]
@@ -374,10 +518,7 @@
374518
"requires": [
375519
"h_heatedCrystalFlash"
376520
],
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-
]
521+
"flashSuitChecked": true
381522
}
382523
],
383524
"notables": [],

‎schema/m3-requirements.schema.json‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,37 @@
309309
"title": "Gravityless Lava Frames",
310310
"description": "Fulfilled by spending an amount of energy that corresponds to spending a number of frames in lava, with Gravity Suit turned off, even if available."
311311
},
312+
"lavaFramesWithEnergyDrops": {
313+
"type": "object",
314+
"title": "Lava Frames With Energy Drops",
315+
"description": "Fulfilled by spending an amount of energy that corresponds to spending a number of frames in a lava, with some or all damage offset by collecting energy drops.",
316+
"additionalProperties": false,
317+
"properties": {
318+
"frames": {
319+
"type": "integer",
320+
"minimum": 1
321+
},
322+
"drops": {
323+
"type": "array",
324+
"items": {
325+
"type": "object",
326+
"additionalProperties": false,
327+
"properties": {
328+
"enemy": {
329+
"type": "string",
330+
"title": "Enemy Name",
331+
"description": "The name of an enemy that drops can be collected from, as found in the enemies file."
332+
},
333+
"count": {
334+
"type": "integer",
335+
"title": "Count",
336+
"description": "The number of drops that can be collected from this enemy by executing this strat."
337+
}
338+
}
339+
}
340+
}
341+
}
342+
},
312343
"samusEaterFrames": {
313344
"type": "integer",
314345
"minimum": 1,

‎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)