Skip to content

Commit 72ef283

Browse files
kjbranchkjbranch
committed
Add canComplexGMode to Crateria
1 parent dea538b commit 72ef283

12 files changed

Lines changed: 136 additions & 52 deletions

‎region/crateria/central/Climb Supers Room.json‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,7 @@
653653
}
654654
},
655655
"requires": [
656+
"canComplexGMode",
656657
{"or": [
657658
{"and": [
658659
{"itemNotCollectedAtNode": 3},
@@ -978,6 +979,7 @@
978979
}
979980
},
980981
"requires": [
982+
"canComplexGMode",
981983
"canLongXRayClimb",
982984
"canBeVeryPatient"
983985
],
@@ -1072,6 +1074,7 @@
10721074
}
10731075
},
10741076
"requires": [
1077+
"canComplexGMode",
10751078
"h_artificialMorphCrystalFlash",
10761079
{"or": [
10771080
{"and": [
@@ -1274,10 +1277,14 @@
12741277
"Morph",
12751278
{"or": [
12761279
"canRiskPermanentLossOfAccess",
1277-
"canLongXRayClimb"
1280+
{"and": [
1281+
"canComplexGMode",
1282+
"canLongXRayClimb",
1283+
"canBeVeryPatient"
1284+
]}
12781285
]},
1279-
{"ammo": {"type": "PowerBomb", "count": 9}},
1280-
"canBeVeryPatient",
1286+
{"ammo": {"type": "PowerBomb", "count": 5}},
1287+
"canBePatient",
12811288
{"or": [
12821289
"canTrivialUseFrozenEnemies",
12831290
"canTrickyJump",
@@ -1290,10 +1297,14 @@
12901297
]}
12911298
],
12921299
"flashSuitChecked": true,
1293-
"note": "Wall jump up 9 times, placing a PB at the top. Only works in direct g-mode with the item still uncollected.",
1300+
"note": [
1301+
"Wall jump up 5 times, placing a Power Bomb precisely in the top right corner to overload PLMs with as few Power Bombs as possible.",
1302+
"This only works in direct G-mode with the item still uncollected."
1303+
],
12941304
"devNote": [
1295-
"FIXME: Using this strat won't risk canRiskPermanentLossOfAccess if the player could x-ray climb instead. However if the adjacent room is heated and Samus is really low energy, this could be a problem.",
1296-
"Placing the Power Bombs lower, on the magic tile, could overload PLMs with fewer, likely with as low as 2 Power Bombs."
1305+
"Using this strat doesn't have canRiskPermanentLossOfAccess if the player could x-ray climb instead: this requires direct G-mode and Samus can freely doorstuck here,",
1306+
"and there is no benefit to going to the item instead of the top left door, unless the item is there.",
1307+
"FIXME: Placing the Power Bombs lower, on the magic tile, could overload PLMs with fewer, likely with as low as 2 Power Bombs."
12971308
]
12981309
},
12991310
{
@@ -1315,9 +1326,9 @@
13151326
"flashSuitChecked": true,
13161327
"note": [
13171328
"Ascend with a long IBJ, then ceiling bomb jump against the speed blocks to overload the PLMs. Falling is very unforgiving.",
1318-
"Note that the boyons can be killed with bombs."
1329+
"Note that the Boyons can be killed with bombs."
13191330
],
1320-
"devNote": "This is technically doable without canBePatient, but would require double bomb jump, morph, a way to bypass Boyons, and never falling."
1331+
"devNote": "This is technically doable without canBeVeryPatient, but would require double bomb jump, Morph, a way to bypass Boyons, and never falling."
13211332
},
13221333
{
13231334
"id": 43,
@@ -1392,6 +1403,7 @@
13921403
}
13931404
},
13941405
"requires": [
1406+
"canComplexGMode",
13951407
{"or": [
13961408
{"and": [
13971409
"canTrivialUseFrozenEnemies",
@@ -1424,7 +1436,7 @@
14241436
"link": [3, 4],
14251437
"name": "Remote Acquire Item",
14261438
"requires": [
1427-
"canEnterGMode",
1439+
"canComplexGMode",
14281440
{"obstaclesCleared": ["C"]}
14291441
],
14301442
"flashSuitChecked": true,
@@ -1447,7 +1459,7 @@
14471459
"link": [3, 5],
14481460
"name": "Remote Acquire Item",
14491461
"requires": [
1450-
"canEnterGMode",
1462+
"canComplexGMode",
14511463
{"obstaclesCleared": ["C"]}
14521464
],
14531465
"flashSuitChecked": true,

‎region/crateria/central/Climb.json‎

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,7 @@
13131313
}
13141314
},
13151315
"requires": [
1316+
"canComplexGMode",
13161317
"canLongXRayClimb",
13171318
"canBeVeryPatient"
13181319
],
@@ -1335,27 +1336,19 @@
13351336
},
13361337
"requires": [
13371338
{"or": [
1339+
"h_artificialMorphSpringBall",
1340+
"h_artificialMorphBombs",
1341+
"h_fourTileJumpMorph"
1342+
]},
1343+
{"or": [
1344+
"Morph",
1345+
"h_ZebesNotAwake",
13381346
{"and": [
13391347
"h_artificialMorphSpringBall",
13401348
{"or": [
13411349
"HiJump",
13421350
"canTrickyDodgeEnemies"
13431351
]}
1344-
]},
1345-
{"and": [
1346-
"Morph",
1347-
{"or": [
1348-
"h_artificialMorphSpringBall",
1349-
"h_artificialMorphBombs",
1350-
"h_fourTileJumpMorph"
1351-
]}
1352-
]},
1353-
{"and": [
1354-
"h_ZebesNotAwake",
1355-
{"or": [
1356-
"h_artificialMorphSpringBall",
1357-
"h_artificialMorphBombs"
1358-
]}
13591352
]}
13601353
]}
13611354
],
@@ -1407,7 +1400,7 @@
14071400
"flashSuitChecked": true,
14081401
"note": [
14091402
"Overload PLMs using the scroll block at the top of the stairs next to the bomb blocks.",
1410-
"Place PBs as high as possible to occasionally kill multiple pirates at a time."
1403+
"Place Power Bombs as high as possible to occasionally kill multiple pirates at a time."
14111404
]
14121405
},
14131406
{
@@ -1543,14 +1536,11 @@
15431536
{"or": [
15441537
"h_artificialMorphSpringBall",
15451538
"h_artificialMorphBombs",
1546-
{"and": [
1547-
"Morph",
1548-
"h_fourTileJumpMorph"
1549-
]}
1539+
"h_fourTileJumpMorph"
15501540
]}
15511541
],
15521542
"flashSuitChecked": true,
1553-
"devNote": "PBs cannot be used, as they will solidify the bomb blocks."
1543+
"devNote": "A Power Bomb cannot be used, as it will solidify the bomb block."
15541544
},
15551545
{
15561546
"id": 66,

‎region/crateria/central/Crateria Tube.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
{
221221
"id": 12,
222222
"link": [1, 2],
223-
"name": "Carry G-Mode Through Tube (Left to Right)",
223+
"name": "Carry G-Mode Through Tube",
224224
"entranceCondition": {
225225
"comeInWithGMode": {
226226
"mode": "any",
@@ -238,7 +238,7 @@
238238
{
239239
"id": 13,
240240
"link": [1, 2],
241-
"name": "Carry G-Mode Morph Through Tube (Left to Right)",
241+
"name": "Carry G-Mode Morph Through Tube",
242242
"entranceCondition": {
243243
"comeInWithGMode": {
244244
"mode": "any",
@@ -410,7 +410,7 @@
410410
{
411411
"id": 24,
412412
"link": [2, 1],
413-
"name": "Carry G-Mode Through Tube (Right to Left)",
413+
"name": "Carry G-Mode Through Tube",
414414
"entranceCondition": {
415415
"comeInWithGMode": {
416416
"mode": "any",
@@ -428,7 +428,7 @@
428428
{
429429
"id": 25,
430430
"link": [2, 1],
431-
"name": "Carry G-Mode Morph Through Tube (Right to Left)",
431+
"name": "Carry G-Mode Morph Through Tube",
432432
"entranceCondition": {
433433
"comeInWithGMode": {
434434
"mode": "any",

‎region/crateria/central/Final Missile Bombway.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
{
291291
"id": 10,
292292
"link": [2, 1],
293-
"name": "G-mode Morph with Bombs",
293+
"name": "G-Mode Morph with Bombs",
294294
"entranceCondition": {
295295
"comeInWithGMode": {
296296
"mode": "any",

‎region/crateria/central/Landing Site.json‎

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -494,14 +494,15 @@
494494
{
495495
"id": 90,
496496
"link": [1, 1],
497-
"name": "G-Mode through Bomb Blocks, Ship Refill",
497+
"name": "G-Mode through Bomb Blocks, Ship Refill, Return",
498498
"entranceCondition": {
499499
"comeInWithGMode": {
500500
"mode": "any",
501501
"morphed": false
502502
}
503503
},
504504
"requires": [
505+
"canComplexGMode",
505506
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]},
506507
{"or": [
507508
"SpaceJump",
@@ -567,7 +568,13 @@
567568
}
568569
},
569570
"requires": [
570-
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
571+
{"or": [
572+
{"and": [
573+
"canComplexGMode",
574+
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
575+
]},
576+
"free"
577+
]}
571578
],
572579
"flashSuitChecked": true,
573580
"note": [
@@ -1365,12 +1372,37 @@
13651372
}
13661373
},
13671374
"requires": [
1375+
"canComplexGMode",
13681376
"canLongXRayClimb",
13691377
"canBePatient"
13701378
],
13711379
"flashSuitChecked": true,
13721380
"note": "Climb up 3 screens."
13731381
},
1382+
{
1383+
"link": [4, 3],
1384+
"name": "G-Mode Deep Stuck X-Ray Climb, Ship Refill",
1385+
"entranceCondition": {
1386+
"comeInWithGMode": {
1387+
"mode": "direct",
1388+
"morphed": false
1389+
}
1390+
},
1391+
"requires": [
1392+
"canComplexGMode",
1393+
{"or": [
1394+
"canWalljump",
1395+
"HiJump",
1396+
"canSpringBallJumpMidAir",
1397+
"h_getBlueSpeedMaxRunway"
1398+
]},
1399+
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]},
1400+
"canLongXRayClimb",
1401+
"canBePatient"
1402+
],
1403+
"flashSuitChecked": true,
1404+
"note": "Refill at the ship then return and X-Ray climb up 3 screens."
1405+
},
13741406
{
13751407
"id": 58,
13761408
"link": [4, 3],
@@ -1421,8 +1453,9 @@
14211453
}
14221454
},
14231455
"requires": [
1456+
"canComplexGMode",
14241457
"canLongXRayClimb",
1425-
"canBeVeryPatient"
1458+
"canBePatient"
14261459
],
14271460
"bypassesDoorShell": true,
14281461
"flashSuitChecked": true,
@@ -1431,6 +1464,35 @@
14311464
"Climb up 3 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door."
14321465
]
14331466
},
1467+
{
1468+
"link": [4, 3],
1469+
"name": "Very Deep Stuck X-Ray Climb, Ship Refill",
1470+
"entranceCondition": {
1471+
"comeInWithGMode": {
1472+
"mode": "direct",
1473+
"morphed": false
1474+
}
1475+
},
1476+
"requires": [
1477+
"canComplexGMode",
1478+
{"or": [
1479+
"canWalljump",
1480+
"HiJump",
1481+
"canSpringBallJumpMidAir",
1482+
"h_getBlueSpeedMaxRunway"
1483+
]},
1484+
{"refill": ["Energy", "Missile", "Super", "PowerBomb"]},
1485+
"canLongXRayClimb",
1486+
"canBePatient"
1487+
],
1488+
"bypassesDoorShell": true,
1489+
"flashSuitChecked": true,
1490+
"note": [
1491+
"Enter with G-mode direct, refill at the ship and return.",
1492+
"Back up to between 1 and 6 pixels from the door transition, and activate X-ray to get very deep stuck in the door.",
1493+
"Climb up 3 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door."
1494+
]
1495+
},
14341496
{
14351497
"id": 61,
14361498
"link": [4, 4],

‎region/crateria/central/Parlor and Alcatraz.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@
483483
"h_artificialMorphMovement",
484484
"h_artificialMorphBombHorizontally",
485485
{"and": [
486+
"canComplexGMode",
486487
"canNeutralDamageBoost",
487488
"h_ZebesIsAwake",
488489
{"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
@@ -1745,6 +1746,7 @@
17451746
}
17461747
},
17471748
"requires": [
1749+
"canTrickyGMode",
17481750
{"notable": "Alcatraz Escape G-Mode Crystal Flash Then Forced Standup"},
17491751
"h_ZebesIsAwake",
17501752
"canBeVeryPatient",

‎region/crateria/central/Pit Room.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@
301301
}
302302
},
303303
"requires": [
304+
"canComplexGMode",
304305
"h_artificialMorphBombs",
305306
"canTrickyJump"
306307
],
@@ -557,7 +558,9 @@
557558
}
558559
},
559560
"requires": [
560-
"h_artificialMorphIBJ"
561+
"canComplexGMode",
562+
"h_artificialMorphIBJ",
563+
"canTrickyJump"
561564
],
562565
"clearsObstacles": ["A"],
563566
"flashSuitChecked": true,

‎region/crateria/east/Crab Maze.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@
370370
{
371371
"id": 12,
372372
"link": [2, 1],
373-
"name": "G-Mode Morph to overload Crumble Block Plms",
373+
"name": "G-Mode Morph, Overload PLMs, Through the Crumble Block",
374374
"entranceCondition": {
375375
"comeInWithGMode": {
376376
"mode": "any",
@@ -407,7 +407,7 @@
407407
}
408408
},
409409
"requires": [
410-
"canInsaneJump",
410+
"canComplexGMode",
411411
"h_artificialMorphSpringBall",
412412
"h_artificialMorphBombs",
413413
"canUseIFrames",

0 commit comments

Comments
 (0)