Skip to content

Commit b2f471c

Browse files
osse101osse101
authored
Merge pull request #2222 from kjbranch/w-maridia-complex
Add canComplexGMode to West Maridia
2 parents f019ea8 + 8414a1e commit b2f471c

6 files changed

Lines changed: 59 additions & 42 deletions

File tree

‎region/maridia/outer/Boyon Gate Hall.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,8 @@
440440
"h_artificialMorphJumpIntoIBJ"
441441
]}
442442
],
443-
"flashSuitChecked": true
443+
"flashSuitChecked": true,
444+
"devNote": "After exiting G-mode, jump just above the vertical shaft in order to fix the camera."
444445
},
445446
{
446447
"id": 66,
@@ -793,7 +794,8 @@
793794
"h_artificialMorphJumpIntoIBJ"
794795
]}
795796
],
796-
"flashSuitChecked": true
797+
"flashSuitChecked": true,
798+
"devNote": "After exiting G-mode, jump just above the vertical shaft in order to fix the camera."
797799
},
798800
{
799801
"id": 34,

‎region/maridia/outer/Crab Hole.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
{
673673
"id": 15,
674674
"link": [1, 4],
675-
"name": "Carry G-Mode Through Tube (Left to Right)",
675+
"name": "Carry G-Mode Through Tube",
676676
"entranceCondition": {
677677
"comeInWithGMode": {
678678
"mode": "any",
@@ -690,7 +690,7 @@
690690
{
691691
"id": 16,
692692
"link": [1, 4],
693-
"name": "Carry G-Mode Morph Through Tube (Left to Right)",
693+
"name": "Carry G-Mode Morph Through Tube",
694694
"entranceCondition": {
695695
"comeInWithGMode": {
696696
"mode": "any",
@@ -2212,7 +2212,7 @@
22122212
{
22132213
"id": 60,
22142214
"link": [2, 5],
2215-
"name": "G-Mode (Bottom to Top)",
2215+
"name": "G-Mode",
22162216
"entranceCondition": {
22172217
"comeInWithGMode": {
22182218
"mode": "any",
@@ -2255,7 +2255,7 @@
22552255
{
22562256
"id": 61,
22572257
"link": [2, 5],
2258-
"name": "G-Mode Morph IBJ (Bottom to Top)",
2258+
"name": "G-Mode Morph IBJ",
22592259
"entranceCondition": {
22602260
"comeInWithGMode": {
22612261
"mode": "any",
@@ -2279,7 +2279,7 @@
22792279
{
22802280
"id": 62,
22812281
"link": [2, 5],
2282-
"name": "G-Mode Morph Gravity Jump (Bottom to Top)",
2282+
"name": "G-Mode Morph Gravity Jump",
22832283
"entranceCondition": {
22842284
"comeInWithGMode": {
22852285
"mode": "any",
@@ -3210,7 +3210,7 @@
32103210
{
32113211
"id": 91,
32123212
"link": [3, 5],
3213-
"name": "G-Mode (Bottom to Top)",
3213+
"name": "G-Mode",
32143214
"entranceCondition": {
32153215
"comeInWithGMode": {
32163216
"mode": "any",
@@ -3253,7 +3253,7 @@
32533253
{
32543254
"id": 92,
32553255
"link": [3, 5],
3256-
"name": "G-Mode Morph IBJ (Bottom to Top)",
3256+
"name": "G-Mode Morph IBJ",
32573257
"entranceCondition": {
32583258
"comeInWithGMode": {
32593259
"mode": "any",
@@ -3277,7 +3277,7 @@
32773277
{
32783278
"id": 93,
32793279
"link": [3, 5],
3280-
"name": "G-Mode Morph Gravity Jump (Bottom to Top)",
3280+
"name": "G-Mode Morph Gravity Jump",
32813281
"entranceCondition": {
32823282
"comeInWithGMode": {
32833283
"mode": "any",
@@ -3493,7 +3493,7 @@
34933493
{
34943494
"id": 98,
34953495
"link": [4, 1],
3496-
"name": "Carry G-Mode Through Tube (Right to Left)",
3496+
"name": "Carry G-Mode Through Tube",
34973497
"entranceCondition": {
34983498
"comeInWithGMode": {
34993499
"mode": "any",
@@ -3511,7 +3511,7 @@
35113511
{
35123512
"id": 99,
35133513
"link": [4, 1],
3514-
"name": "Carry G-Mode Morph Through Tube (Right to Left)",
3514+
"name": "Carry G-Mode Morph Through Tube",
35153515
"entranceCondition": {
35163516
"comeInWithGMode": {
35173517
"mode": "any",

‎region/maridia/outer/Fish Tank.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,7 @@
13071307
},
13081308
"requires": [
13091309
{"notable": "Artificial Morph, Double Spring Ball Jump onto Frozen Fish"},
1310+
"canComplexGMode",
13101311
"h_artificialMorphDoubleSpringBallJump",
13111312
"canInsaneJump",
13121313
"canTrickyUseFrozenEnemies",
@@ -2408,6 +2409,7 @@
24082409
},
24092410
"requires": [
24102411
{"or": [
2412+
"canGravityJump",
24112413
{"and": [
24122414
"Gravity",
24132415
{"or": [
@@ -2427,8 +2429,7 @@
24272429
{"and": [
24282430
"HiJump",
24292431
"canSpringBallJumpMidAir"
2430-
]},
2431-
"canGravityJump"
2432+
]}
24322433
]}
24332434
]},
24342435
{"and": [
@@ -2721,6 +2722,7 @@
27212722
},
27222723
"requires": [
27232724
{"notable": "Artificial Morph, Double Spring Ball Jump onto Frozen Fish"},
2725+
"canComplexGMode",
27242726
"h_artificialMorphDoubleSpringBallJump",
27252727
"canInsaneJump",
27262728
"canTrickyUseFrozenEnemies",

‎region/maridia/outer/Main Street.json‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,6 +1164,7 @@
11641164
},
11651165
"requires": [
11661166
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
1167+
"canComplexGMode",
11671168
"h_navigateUnderwater",
11681169
{"or": [
11691170
"canGravityJump",
@@ -1217,6 +1218,7 @@
12171218
},
12181219
"requires": [
12191220
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
1221+
"canComplexGMode",
12201222
"h_navigateUnderwater",
12211223
{"or": [
12221224
"canGravityJump",
@@ -2202,6 +2204,7 @@
22022204
},
22032205
"requires": [
22042206
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
2207+
"canComplexGMode",
22052208
"h_navigateUnderwater",
22062209
{"or": [
22072210
"canGravityJump",
@@ -2254,6 +2257,7 @@
22542257
},
22552258
"requires": [
22562259
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
2260+
"canComplexGMode",
22572261
"h_navigateUnderwater",
22582262
{"or": [
22592263
"canGravityJump",
@@ -3426,7 +3430,8 @@
34263430
}
34273431
},
34283432
"requires": [
3429-
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
3433+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
3434+
"canComplexGMode"
34303435
],
34313436
"clearsObstacles": ["B"],
34323437
"flashSuitChecked": true,
@@ -3443,7 +3448,8 @@
34433448
}
34443449
},
34453450
"requires": [
3446-
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"}
3451+
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
3452+
"canComplexGMode"
34473453
],
34483454
"flashSuitChecked": true,
34493455
"devNote": "FIXME: Immobile strats may need canBeVeryPatient if they can't be done before the crab is in position"
@@ -4077,6 +4083,7 @@
40774083
},
40784084
"requires": [
40794085
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
4086+
"canComplexGMode",
40804087
"h_navigateUnderwater"
40814088
],
40824089
"clearsObstacles": ["B"],
@@ -4095,6 +4102,7 @@
40954102
},
40964103
"requires": [
40974104
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
4105+
"canComplexGMode",
40984106
"h_navigateUnderwater",
40994107
"h_artificialMorphBombs",
41004108
{"or": [
@@ -4140,6 +4148,7 @@
41404148
},
41414149
"requires": [
41424150
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
4151+
"canComplexGMode",
41434152
"h_navigateUnderwater",
41444153
"h_artificialMorphBombs",
41454154
{"or": [
@@ -4377,7 +4386,7 @@
43774386
"h_artificialMorphPowerBomb",
43784387
"h_artificialMorphPowerBomb",
43794388
{"or": [
4380-
"canInsaneJump",
4389+
"canComplexGMode",
43814390
{"itemCollectedAtNode": 6}
43824391
]}
43834392
],
@@ -4458,7 +4467,7 @@
44584467
"link": [6, 9],
44594468
"name": "Kill Frozen Crab with Wave",
44604469
"requires": [
4461-
"canEnterGMode",
4470+
"canComplexGMode",
44624471
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
44634472
"Wave",
44644473
{"obstaclesCleared": ["C"]}
@@ -4471,7 +4480,7 @@
44714480
"link": [6, 9],
44724481
"name": "Kago Frozen Crab",
44734482
"requires": [
4474-
"canEnterGMode",
4483+
"canComplexGMode",
44754484
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
44764485
"canKago",
44774486
{"or": [
@@ -5198,7 +5207,7 @@
51985207
"link": [11, 6],
51995208
"name": "G-Mode Overload Speed Blocks, Stuck on Frozen Crab",
52005209
"requires": [
5201-
"canEnterGMode",
5210+
"canComplexGMode",
52025211
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
52035212
"canBePatient",
52045213
"h_navigateUnderwater",
@@ -5225,7 +5234,7 @@
52255234
"link": [11, 6],
52265235
"name": "G-Mode Overload Speed Blocks, Bomb Frozen Crab",
52275236
"requires": [
5228-
"canEnterGMode",
5237+
"canComplexGMode",
52295238
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
52305239
"canBePatient",
52315240
"h_navigateUnderwater",
@@ -5258,7 +5267,7 @@
52585267
"link": [11, 6],
52595268
"name": "Direct G-Mode CF Overload Speed Blocks, Reserve Trigger",
52605269
"requires": [
5261-
"canEnterGMode",
5270+
"canComplexGMode",
52625271
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
52635272
"canBePatient",
52645273
"h_navigateUnderwater",
@@ -5296,7 +5305,7 @@
52965305
"link": [11, 11],
52975306
"name": "Indirect G-Mode Crystal Flash",
52985307
"requires": [
5299-
"canEnterGMode",
5308+
"canComplexGMode",
53005309
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
53015310
"h_artificialMorphCrystalFlash",
53025311
{"obstaclesNotCleared": ["B"]}
@@ -5365,7 +5374,7 @@
53655374
"link": [12, 11],
53665375
"name": "G-Mode Overload Speed Blocks (Bombs)",
53675376
"requires": [
5368-
"canEnterGMode",
5377+
"canComplexGMode",
53695378
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
53705379
"h_useMorphBombs",
53715380
"h_navigateUnderwater",
@@ -5496,7 +5505,7 @@
54965505
"link": [13, 11],
54975506
"name": "G-Mode Morph, Overload Speed Blocks (Bombs)",
54985507
"requires": [
5499-
"canEnterGMode",
5508+
"canComplexGMode",
55005509
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
55015510
"h_navigateUnderwater",
55025511
"h_artificialMorphBombs",

0 commit comments

Comments
 (0)