Skip to content

Commit 897648e

Browse files
blkerbyblkerby
committed
feedback updates
1 parent 5152ef0 commit 897648e

4 files changed

Lines changed: 171 additions & 22 deletions

File tree

‎helpers.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2156,6 +2156,22 @@
21562156
"requires": [
21572157
{"thornHits": "n_thornXModeAttempts"}
21582158
]
2159+
},
2160+
{
2161+
"name": "h_RidleyDrops",
2162+
"requires": [
2163+
{"or": [
2164+
{"partialRefill": {"type": "Energy", "limit": 150}},
2165+
{"and": [
2166+
{"resourceAvailable": [{"type": "Energy", "count": 50}]},
2167+
{"partialRefill": {"type": "Energy", "limit": 100}},
2168+
{"partialRefill": {"type": "Missile", "limit": 6}},
2169+
{"partialRefill": {"type": "Super", "limit": 2}},
2170+
{"partialRefill": {"type": "PowerBomb", "limit": 2}}
2171+
]}
2172+
]},
2173+
{"heatFrames": 80}
2174+
]
21592175
}
21602176
]
21612177
}

‎region/lowernorfair/east/Ridley's Room.json‎

Lines changed: 56 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
[2],
8484
[2]
8585
],
86-
"devNote": "FIXME: This node can be eliminated."
86+
"devNote": "The position where Samus lands when holding left after walking into the room from the right."
8787
}
8888
],
8989
"enemies": [
@@ -484,11 +484,26 @@
484484
"link": [1, 3],
485485
"name": "Base",
486486
"requires": [
487-
{"heatFrames": 50}
487+
{"heatFrames": 45}
488488
],
489489
"flashSuitChecked": true,
490490
"blueSuitChecked": true
491491
},
492+
{
493+
"link": [1, 3],
494+
"name": "Ridley without Heat Protection",
495+
"requires": [
496+
{"notable": "Ridley without Heat Protection"},
497+
{"heatFrames": 0},
498+
{"ridleyKill": {}},
499+
"h_RidleyDrops"
500+
],
501+
"setsFlags": ["f_DefeatedRidley"],
502+
"flashSuitChecked": false,
503+
"blueSuitChecked": true,
504+
"note": "Fight Ridley without immunity to heat damage.",
505+
"devNote": ["Heat frames are accounted for as part of the enemyKill."]
506+
},
492507
{
493508
"id": 27,
494509
"link": [1, 3],
@@ -792,7 +807,7 @@
792807
"comeInNormally": {}
793808
},
794809
"requires": [
795-
{"heatFrames": 85}
810+
{"simpleHeatFrames": 85}
796811
],
797812
"flashSuitChecked": true,
798813
"blueSuitChecked": true
@@ -814,6 +829,22 @@
814829
"flashSuitChecked": true,
815830
"blueSuitChecked": true
816831
},
832+
{
833+
"id": 17,
834+
"link": [2, 3],
835+
"name": "Ridley without Heat Protection",
836+
"requires": [
837+
{"notable": "Ridley without Heat Protection"},
838+
{"heatFrames": 0},
839+
{"ridleyKill": {}},
840+
"h_RidleyDrops"
841+
],
842+
"setsFlags": ["f_DefeatedRidley"],
843+
"flashSuitChecked": false,
844+
"blueSuitChecked": true,
845+
"note": "Fight Ridley without immunity to heat damage.",
846+
"devNote": ["Heat frames are accounted for as part of the enemyKill."]
847+
},
817848
{
818849
"id": 29,
819850
"link": [2, 3],
@@ -845,7 +876,7 @@
845876
]},
846877
{"autoReserveTrigger": {}},
847878
{"heatFrames": 520},
848-
{"partialRefill": {"type": "Energy", "limit": 100}}
879+
"h_RidleyDrops"
849880
],
850881
"setsFlags": ["f_DefeatedRidley"],
851882
"flashSuitChecked": true,
@@ -912,7 +943,11 @@
912943
"link": [3, 1],
913944
"name": "Base",
914945
"requires": [
915-
{"heatFrames": 50}
946+
{"heatFrames": 35},
947+
{"or": [
948+
"canDash",
949+
{"heatFrames": 15}
950+
]}
916951
],
917952
"flashSuitChecked": true,
918953
"blueSuitChecked": true
@@ -923,7 +958,17 @@
923958
"name": "Wall Jump",
924959
"requires": [
925960
"canWalljump",
926-
{"heatFrames": 130}
961+
{"or": [
962+
{"and": [
963+
"HiJump",
964+
{"heatFrames": 110}
965+
]},
966+
{"heatFrames": 140}
967+
]},
968+
{"or": [
969+
"canDash",
970+
{"heatFrames": 20}
971+
]}
927972
],
928973
"flashSuitChecked": true,
929974
"blueSuitChecked": true
@@ -950,6 +995,11 @@
950995
"link": [3, 2],
951996
"name": "IBJ",
952997
"requires": [
998+
{"heatFrames": 25},
999+
{"or": [
1000+
"canDash",
1001+
{"heatFrames": 10}
1002+
]},
9531003
{"or": [
9541004
{"and": [
9551005
"canDoubleBombJump",
@@ -1017,21 +1067,6 @@
10171067
"flashSuitChecked": false,
10181068
"blueSuitChecked": true
10191069
},
1020-
{
1021-
"id": 17,
1022-
"link": [3, 3],
1023-
"name": "Ridley without Heat Protection",
1024-
"requires": [
1025-
{"notable": "Ridley without Heat Protection"},
1026-
{"heatFrames": 0},
1027-
{"ridleyKill": {}}
1028-
],
1029-
"setsFlags": ["f_DefeatedRidley"],
1030-
"flashSuitChecked": false,
1031-
"blueSuitChecked": true,
1032-
"note": "Fight Ridley without immunity to heat damage.",
1033-
"devNote": ["Heat frames are accounted for as part of the enemyKill."]
1034-
},
10351070
{
10361071
"id": 13,
10371072
"link": [3, 3],

‎region/lowernorfair/east/The Jail.json‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@
200200
"name": "Base",
201201
"requires": [
202202
{"heatFrames": 105},
203+
{"or": [
204+
"canQuickDrop",
205+
{"heatFrames": 30}
206+
]},
203207
{"or": [
204208
"canDash",
205209
{"heatFrames": 5}
@@ -208,6 +212,99 @@
208212
"flashSuitChecked": true,
209213
"blueSuitChecked": true
210214
},
215+
{
216+
"link": [2, 1],
217+
"name": "Leave With Runway (Short Runway)",
218+
"requires": [
219+
"canDash",
220+
{"heatFrames": 90},
221+
{"or": [
222+
"canQuickDrop",
223+
{"heatFrames": 30}
224+
]}
225+
],
226+
"exitCondition": {
227+
"leaveWithRunway": {
228+
"length": 5,
229+
"openEnd": 0
230+
}
231+
},
232+
"unlocksDoors": [
233+
{
234+
"types": ["missiles"],
235+
"requires": [{"heatFrames": 50}]
236+
},
237+
{"types": ["super"], "requires": []},
238+
{
239+
"types": ["powerbomb"],
240+
"requires": [{"heatFrames": 50}]
241+
}
242+
],
243+
"flashSuitChecked": true,
244+
"blueSuitChecked": true
245+
},
246+
{
247+
"link": [2, 1],
248+
"name": "Leave With Runway (Medium Runway)",
249+
"requires": [
250+
"canDash",
251+
{"heatFrames": 135},
252+
{"or": [
253+
"canQuickDrop",
254+
{"heatFrames": 30}
255+
]}
256+
],
257+
"exitCondition": {
258+
"leaveWithRunway": {
259+
"length": 9,
260+
"openEnd": 0
261+
}
262+
},
263+
"unlocksDoors": [
264+
{
265+
"types": ["missiles"],
266+
"requires": [{"heatFrames": 50}]
267+
},
268+
{"types": ["super"], "requires": []},
269+
{
270+
"types": ["powerbomb"],
271+
"requires": [{"heatFrames": 50}]
272+
}
273+
],
274+
"flashSuitChecked": true,
275+
"blueSuitChecked": true
276+
},
277+
{
278+
"link": [2, 1],
279+
"name": "Leave With Runway (Full Runway)",
280+
"requires": [
281+
"canDash",
282+
{"heatFrames": 210},
283+
{"or": [
284+
"canQuickDrop",
285+
{"heatFrames": 60}
286+
]}
287+
],
288+
"exitCondition": {
289+
"leaveWithRunway": {
290+
"length": 11,
291+
"openEnd": 0
292+
}
293+
},
294+
"unlocksDoors": [
295+
{
296+
"types": ["missiles"],
297+
"requires": [{"heatFrames": 50}]
298+
},
299+
{"types": ["super"], "requires": []},
300+
{
301+
"types": ["powerbomb"],
302+
"requires": [{"heatFrames": 50}]
303+
}
304+
],
305+
"flashSuitChecked": true,
306+
"blueSuitChecked": true
307+
},
211308
{
212309
"id": 16,
213310
"link": [2, 1],

‎schema/m3-string-requirements.schema.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@
496496
"h_spikeSuitSamusEaterLeniency",
497497
"h_spikeSuitPowerBombLeniency",
498498
"h_XModeSpikeHit",
499-
"h_XModeThornHit"
499+
"h_XModeThornHit",
500+
"h_RidleyDrops"
500501
]
501502
}

0 commit comments

Comments
 (0)