Skip to content

Commit 12017b1

Browse files
nn357nn357
authored
Merge branch 'master' into xmodebluesuitstuff
2 parents 73b84f8 + 041fceb commit 12017b1

56 files changed

Lines changed: 3147 additions & 518 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎helpers.json‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,8 +1421,16 @@
14211421
"canInsaneJump"
14221422
]}
14231423
]
1424+
},
1425+
{
1426+
"name": "h_storedSpark",
1427+
"requires": [
1428+
{"or": [
1429+
{"useFlashSuit": {}},
1430+
{"blueSuitShinecharge": {}}
1431+
]}
1432+
]
14241433
}
1425-
14261434
]
14271435
},
14281436
{
@@ -1615,6 +1623,21 @@
16151623
"IBJ is not usable for underwater rooms without Gravity."
16161624
]
16171625
},
1626+
{
1627+
"name": "h_RModeCanRefillReserves",
1628+
"requires": [
1629+
{"or": [
1630+
{"and": [
1631+
{"resourceAvailable": [{"type": "RegularEnergy", "count": 99}]},
1632+
{"disableEquipment": "ETank"}
1633+
]},
1634+
{"and": [
1635+
{"resourceMissingAtMost": [{"type": "RegularEnergy", "count": 0}]},
1636+
"canRiskPermanentLossOfAccess"
1637+
]}
1638+
]}
1639+
]
1640+
},
16181641
{
16191642
"name": "h_RModeKnockbackSpark",
16201643
"requires": [

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@
150150
"flashSuitChecked": true
151151
},
152152
{
153+
"id": 54,
153154
"link": [1, 1],
154155
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
155156
"entranceCondition": {
@@ -160,8 +161,8 @@
160161
"h_CrystalFlash",
161162
{"disableEquipment": "Varia"},
162163
{"disableEquipment": "Gravity"},
163-
{"canShineCharge": { "usedTiles": 16, "openEnd": 1 } },
164-
{"autoReserveTrigger": { }},
164+
{"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
165+
{"autoReserveTrigger": {}},
165166
"canRModeSparkInterrupt"
166167
],
167168
"flashSuitChecked": true,
@@ -173,14 +174,15 @@
173174
]
174175
},
175176
{
177+
"id": 55,
176178
"link": [1, 1],
177179
"name": "R-Mode Spark Interrupt from Right Door (Gain Blue Suit)",
178180
"requires": [
179181
{"obstaclesCleared": ["A"]},
180182
"h_CrystalFlash",
181183
"canTrickyJump",
182-
{"canShineCharge": { "usedTiles": 14, "openEnd": 1 } },
183-
{"autoReserveTrigger": { }},
184+
{"canShineCharge": {"usedTiles": 14, "openEnd": 1}},
185+
{"autoReserveTrigger": {}},
184186
"canRModeSparkInterrupt"
185187
],
186188
"resetsObstacles": ["A"],
@@ -851,13 +853,13 @@
851853
"flashSuitChecked": true
852854
},
853855
{
856+
"id": 56,
854857
"link": [2, 3],
855858
"name": "R-Mode Right Door Entry for Spark Interrupt (Gain Blue Suit)",
856859
"entranceCondition": {
857860
"comeInWithRMode": {}
858861
},
859-
"requires": [
860-
],
862+
"requires": [],
861863
"clearsObstacles": ["A"],
862864
"flashSuitChecked": true,
863865
"blueSuitChecked": true
@@ -1004,6 +1006,6 @@
10041006
}
10051007
],
10061008
"notables": [],
1007-
"nextStratId": 54,
1009+
"nextStratId": 57,
10081010
"nextNotableId": 1
1009-
}
1011+
}

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,10 +521,9 @@
521521
{"or": [
522522
"h_CrystalFlash",
523523
{"and": [
524-
{"disableEquipment": "ETank"},
525-
{"resourceAvailable": [{"type": "Energy", "count": 90}]},
524+
"h_RModeCanRefillReserves",
526525
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
527-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
526+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
528527
]}
529528
]},
530529
{"canShineCharge": {"usedTiles": 30, "openEnd": 0}},
@@ -870,10 +869,9 @@
870869
{"and": [
871870
"Morph",
872871
"h_destroyBombWalls",
873-
{"disableEquipment": "ETank"},
874-
{"resourceAvailable": [{"type": "Energy", "count": 90}]},
872+
"h_RModeCanRefillReserves",
875873
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
876-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
874+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
877875
]}
878876
]},
879877
{"canShineCharge": {"usedTiles": 30, "openEnd": 0}},

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,19 @@
263263
{"or": [
264264
"h_CrystalFlash",
265265
{"and": [
266-
{"disableEquipment": "ETank"},
267-
{"resourceAvailable": [{"type": "Energy", "count": 95}]},
266+
"h_RModeCanRefillReserves",
268267
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
269268
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
270-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}},
271-
"canBePatient"
269+
{"or": [
270+
{"and": [
271+
{"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
272+
"canBePatient"
273+
]},
274+
{"and": [
275+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
276+
"canBeExtremelyPatient"
277+
]}
278+
]}
272279
]}
273280
]},
274281
"canTrickyDodgeEnemies",
@@ -1263,12 +1270,20 @@
12631270
"h_CrystalFlash",
12641271
{"and": [
12651272
"h_usePowerBomb",
1266-
{"disableEquipment": "ETank"},
1267-
{"resourceAvailable": [{"type": "Energy", "count": 95}]},
1273+
"h_RModeCanRefillReserves",
12681274
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
12691275
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
12701276
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}},
1271-
"canBePatient"
1277+
{"or": [
1278+
{"and": [
1279+
{"partialRefill": {"type": "ReserveEnergy", "limit": 5}},
1280+
"canBePatient"
1281+
]},
1282+
{"and": [
1283+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
1284+
"canBeVeryPatient"
1285+
]}
1286+
]}
12721287
]}
12731288
]},
12741289
{"or": [

‎region/brinstar/green/Brinstar Pre-Map Room.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,7 @@
171171
"flashSuitChecked": true
172172
},
173173
{
174+
"id": 29,
174175
"link": [1, 2],
175176
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
176177
"entranceCondition": {
@@ -182,15 +183,14 @@
182183
"h_CrystalFlash",
183184
{"and": [
184185
"h_bombThings",
185-
{"disableEquipment": "ETank"},
186-
{"resourceAvailable": [{"type": "Energy", "count": 90}]},
186+
"h_RModeCanRefillReserves",
187187
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
188188
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
189-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
189+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
190190
]}
191191
]},
192192
{"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
193-
{"autoReserveTrigger": { }},
193+
{"autoReserveTrigger": {}},
194194
"canRModeSparkInterrupt"
195195
],
196196
"clearsObstacles": ["A"],
@@ -418,6 +418,7 @@
418418
"flashSuitChecked": true
419419
},
420420
{
421+
"id": 30,
421422
"link": [2, 2],
422423
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
423424
"entranceCondition": {
@@ -427,15 +428,14 @@
427428
{"or": [
428429
"h_CrystalFlash",
429430
{"and": [
430-
{"disableEquipment": "ETank"},
431-
{"resourceAvailable": [{"type": "Energy", "count": 95}]},
431+
"h_RModeCanRefillReserves",
432432
{"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
433433
{"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
434-
{"partialRefill": {"type": "ReserveEnergy", "limit": 1}}
434+
{"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
435435
]}
436436
]},
437437
{"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
438-
{"autoReserveTrigger": { }},
438+
{"autoReserveTrigger": {}},
439439
"canRModeSparkInterrupt"
440440
],
441441
"flashSuitChecked": true,
@@ -583,6 +583,6 @@
583583
}
584584
],
585585
"notables": [],
586-
"nextStratId": 29,
586+
"nextStratId": 31,
587587
"nextNotableId": 1
588588
}

‎region/brinstar/green/Early Supers Room.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,7 @@
497497
]
498498
},
499499
{
500+
"id": 52,
500501
"link": [1, 3],
501502
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
502503
"entranceCondition": {
@@ -506,7 +507,7 @@
506507
"Morph",
507508
{"refill": ["Energy"]},
508509
{"canShineCharge": {"usedTiles": 30, "openEnd": 1}},
509-
{"autoReserveTrigger": { }},
510+
{"autoReserveTrigger": {}},
510511
"canRModeSparkInterrupt"
511512
],
512513
"clearsObstacles": ["A"],
@@ -545,6 +546,7 @@
545546
"devNote": "This setup takes damage, but you can farm before and after."
546547
},
547548
{
549+
"id": 53,
548550
"link": [1, 4],
549551
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
550552
"entranceCondition": {
@@ -1031,6 +1033,7 @@
10311033
]
10321034
},
10331035
{
1036+
"id": 54,
10341037
"link": [2, 4],
10351038
"name": "R-Mode Spark Interrupt (Gain Blue Suit)",
10361039
"entranceCondition": {
@@ -1115,6 +1118,7 @@
11151118
"flashSuitChecked": true
11161119
},
11171120
{
1121+
"id": 55,
11181122
"link": [3, 1],
11191123
"name": "Blue Suit",
11201124
"requires": [
@@ -1190,6 +1194,6 @@
11901194
]
11911195
}
11921196
],
1193-
"nextStratId": 52,
1197+
"nextStratId": 56,
11941198
"nextNotableId": 4
11951199
}

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -366,15 +366,16 @@
366366
"flashSuitChecked": true
367367
},
368368
{
369+
"id": 95,
369370
"link": [1, 1],
370371
"name": "R-Mode Entry",
371372
"entranceCondition": {
372373
"comeInWithRMode": {}
373374
},
374375
"requires": [],
376+
"clearsObstacles": ["R-Mode"],
375377
"flashSuitChecked": true,
376-
"blueSuitChecked": true,
377-
"clearsObstacles": ["R-Mode"]
378+
"blueSuitChecked": true
378379
},
379380
{
380381
"id": 8,
@@ -554,15 +555,16 @@
554555
]
555556
},
556557
{
558+
"id": 96,
557559
"link": [2, 2],
558560
"name": "R-Mode Entry",
559561
"entranceCondition": {
560562
"comeInWithRMode": {}
561563
},
562564
"requires": [],
565+
"clearsObstacles": ["R-Mode"],
563566
"flashSuitChecked": true,
564-
"blueSuitChecked": true,
565-
"clearsObstacles": ["R-Mode"]
567+
"blueSuitChecked": true
566568
},
567569
{
568570
"id": 14,
@@ -982,15 +984,16 @@
982984
"flashSuitChecked": true
983985
},
984986
{
987+
"id": 97,
985988
"link": [3, 3],
986989
"name": "R-Mode Entry",
987990
"entranceCondition": {
988991
"comeInWithRMode": {}
989992
},
990993
"requires": [],
994+
"clearsObstacles": ["R-Mode"],
991995
"flashSuitChecked": true,
992-
"blueSuitChecked": true,
993-
"clearsObstacles": ["R-Mode"]
996+
"blueSuitChecked": true
994997
},
995998
{
996999
"id": 31,
@@ -1621,15 +1624,16 @@
16211624
"flashSuitChecked": true
16221625
},
16231626
{
1627+
"id": 98,
16241628
"link": [4, 4],
16251629
"name": "R-Mode Entry",
16261630
"entranceCondition": {
16271631
"comeInWithRMode": {}
16281632
},
16291633
"requires": [],
1634+
"clearsObstacles": ["R-Mode"],
16301635
"flashSuitChecked": true,
1631-
"blueSuitChecked": true,
1632-
"clearsObstacles": ["R-Mode"]
1636+
"blueSuitChecked": true
16331637
},
16341638
{
16351639
"id": 49,
@@ -2141,6 +2145,7 @@
21412145
"flashSuitChecked": true
21422146
},
21432147
{
2148+
"id": 99,
21442149
"link": [7, 7],
21452150
"name": "Use Flash Suit - R-Mode Spark Interrupt (Gain Blue Suit)",
21462151
"requires": [
@@ -2167,6 +2172,7 @@
21672172
]
21682173
},
21692174
{
2175+
"id": 100,
21702176
"link": [7, 7],
21712177
"name": "X-Mode Shinecharge, R-Mode Spark Interrupt (Gain Blue Suit)",
21722178
"requires": [
@@ -2256,7 +2262,7 @@
22562262
]
22572263
}
22582264
],
2259-
"nextStratId": 95,
2265+
"nextStratId": 101,
22602266
"nextNotableId": 8,
22612267
"devNote": ["FIXME: add a strat to take temporary blue from the top to the bottom-right."]
2262-
}
2268+
}

0 commit comments

Comments
 (0)