Skip to content

Commit ad6f69f

Browse files
kjbranchkjbranch
authored
Merge pull request #2224 from kjbranch/w-croc-norfair-complex
Add canComplexGMode to Crocomire and West Norfair
2 parents a65777a + f925ff6 commit ad6f69f

13 files changed

Lines changed: 44 additions & 15 deletions

‎region/norfair/crocomire/Cosine Room.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
}
144144
},
145145
"requires": [
146+
"canComplexGMode",
146147
{"or": [
147148
{"and": [
148149
"h_artificialMorphIBJ",
@@ -182,12 +183,9 @@
182183
}
183184
},
184185
"requires": [
186+
"canTrickyGMode",
185187
"h_artificialMorphBombHorizontally",
186-
{"ammo": {"type": "PowerBomb", "count": 6}},
187-
{"or": [
188-
"canTrickyGMode",
189-
{"acidFrames": 212}
190-
]}
188+
{"ammo": {"type": "PowerBomb", "count": 6}}
191189
],
192190
"collectsItems": [2],
193191
"flashSuitChecked": true,

‎region/norfair/crocomire/Crocomire's Room.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,9 @@
440440
{
441441
"id": 20,
442442
"link": [3, 4],
443-
"name": "G-mode Morph Ceiling Bomb Jump",
443+
"name": "G-Mode Morph Ceiling Bomb Jump",
444444
"requires": [
445+
"canEnterGMode",
445446
"h_artificialMorphLongCeilingBombJump",
446447
"canBeVeryPatient",
447448
{"obstaclesCleared": ["A"]}

‎region/norfair/crocomire/Grapple Beam Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@
333333
}
334334
},
335335
"requires": [
336+
"canComplexGMode",
336337
"canLongXRayClimb"
337338
],
338339
"bypassesDoorShell": true,

‎region/norfair/crocomire/Indiana Jones Room.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@
10081008
"comesThroughToilet": "any"
10091009
},
10101010
"requires": [
1011+
"canComplexGMode",
10111012
"canManipulateMellas",
10121013
{"or": [
10131014
"h_preciseIceClip",
@@ -1652,7 +1653,7 @@
16521653
"link": [6, 2],
16531654
"name": "G-Mode Morph Mella Ice Clip, Door Lock Skip",
16541655
"requires": [
1655-
"canEnterGMode",
1656+
"canComplexGMode",
16561657
"canManipulateMellas",
16571658
{"or": [
16581659
"h_preciseIceClip",
@@ -1714,7 +1715,7 @@
17141715
"link": [7, 1],
17151716
"name": "G-Mode Morph Spring Ball, IBJ, Remote Acquire",
17161717
"requires": [
1717-
"canEnterGMode",
1718+
"canComplexGMode",
17181719
"h_artificialMorphLongIBJ",
17191720
"h_artificialMorphJumpIntoIBJ"
17201721
],
@@ -1727,7 +1728,7 @@
17271728
"link": [7, 1],
17281729
"name": "G-Mode Morph Long Diagonal Bomb Jump, Remote Acquire",
17291730
"requires": [
1730-
"canEnterGMode",
1731+
"canComplexGMode",
17311732
{"notable": "G-Mode Morph Long Diagonal Bomb Jump"},
17321733
"h_artificialMorphDiagonalBombJump",
17331734
"h_artificialMorphLongIBJ"
@@ -1741,7 +1742,7 @@
17411742
"link": [7, 2],
17421743
"name": "G-Mode Morph, IBJ, Remote Acquire",
17431744
"requires": [
1744-
"canEnterGMode",
1745+
"canComplexGMode",
17451746
"h_artificialMorphLongIBJ"
17461747
],
17471748
"collectsItems": [3],

‎region/norfair/crocomire/Post Crocomire Farming Room.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,7 @@
12011201
}
12021202
},
12031203
"requires": [
1204+
"canComplexGMode",
12041205
"canXRayClimb"
12051206
],
12061207
"flashSuitChecked": true,
@@ -1217,6 +1218,7 @@
12171218
}
12181219
},
12191220
"requires": [
1221+
"canComplexGMode",
12201222
"canXRayClimb"
12211223
],
12221224
"bypassesDoorShell": true,

‎region/norfair/crocomire/Post Crocomire Power Bomb Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
}
8585
},
8686
"requires": [
87+
"canComplexGMode",
8788
"h_heatedDirectGModeLeaveSameDoor"
8889
],
8990
"collectsItems": [2],

‎region/norfair/west/Business Center.json‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@
782782
}
783783
},
784784
"requires": [
785+
"canComplexGMode",
785786
"canXRayClimb"
786787
],
787788
"bypassesDoorShell": true,
@@ -1554,6 +1555,7 @@
15541555
}
15551556
},
15561557
"requires": [
1558+
"canComplexGMode",
15571559
"canLongXRayClimb"
15581560
],
15591561
"bypassesDoorShell": true,
@@ -1617,6 +1619,7 @@
16171619
}
16181620
},
16191621
"requires": [
1622+
"canComplexGMode",
16201623
"canXRayClimb"
16211624
],
16221625
"bypassesDoorShell": true,
@@ -2195,7 +2198,8 @@
21952198
"morphed": false
21962199
}
21972200
},
2198-
"flashSuitChecked": true
2201+
"flashSuitChecked": true,
2202+
"devNote": "FIXME: There could be a 4->7 variant with an ice clip or CF clip through the shot blocks."
21992203
},
22002204
{
22012205
"id": 75,
@@ -2416,6 +2420,7 @@
24162420
}
24172421
},
24182422
"requires": [
2423+
"canComplexGMode",
24192424
"canXRayClimb"
24202425
],
24212426
"bypassesDoorShell": true,
@@ -2549,6 +2554,7 @@
25492554
}
25502555
},
25512556
"requires": [
2557+
"canComplexGMode",
25522558
"canLongXRayClimb",
25532559
"canBePatient"
25542560
],
@@ -3179,6 +3185,7 @@
31793185
}
31803186
},
31813187
"requires": [
3188+
"canComplexGMode",
31823189
"canLongXRayClimb"
31833190
],
31843191
"bypassesDoorShell": true,

‎region/norfair/west/Crocomire Escape.json‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,18 @@
165165
"HiJump",
166166
"SpeedBooster"
167167
]},
168-
"h_lavaProof"
168+
{"and": [
169+
"canComplexGMode",
170+
"h_lavaProof"
171+
]}
169172
]},
170173
"h_heatedGModeOpenDifferentDoor"
171174
],
172175
"flashSuitChecked": true,
176+
"note": [
177+
"Go over the plateau, or under it with lava protection.",
178+
"To avoid the Dragon's fireballs, be sure to kill it quickly, overload the drops with the Dragons on the left first, or exit G-mode."
179+
],
173180
"devNote": "FIXME: Damage through the lava could work, or maybe a Geruta damage boost. (Energy from immobile or CF)"
174181
},
175182
{
@@ -740,6 +747,7 @@
740747
}
741748
},
742749
"requires": [
750+
"canComplexGMode",
743751
"canTrickyUseFrozenEnemies",
744752
"canTrickyDodgeEnemies",
745753
{"or": [
@@ -763,6 +771,7 @@
763771
}
764772
},
765773
"requires": [
774+
"canComplexGMode",
766775
{"or": [
767776
"SpaceJump",
768777
{"and": [
@@ -815,6 +824,7 @@
815824
}
816825
},
817826
"requires": [
827+
"canComplexGMode",
818828
{"or": [
819829
"h_artificialMorphLongIBJ",
820830
"h_artificialMorphJumpIntoIBJ"

‎region/norfair/west/Crocomire Speedway.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2200,7 +2200,7 @@
22002200
"ScrewAttack",
22012201
{"ammo": {"type": "Missile", "count": 3}},
22022202
{"ammo": {"type": "Super", "count": 3}},
2203-
"canInsaneJump"
2203+
"canComplexGMode"
22042204
]}
22052205
],
22062206
"flashSuitChecked": true,
@@ -2216,6 +2216,7 @@
22162216
"link": [7, 2],
22172217
"name": "G-Mode, Fix Camera, Speedy Exit",
22182218
"requires": [
2219+
"canComplexGMode",
22192220
"h_heatedGMode",
22202221
"h_getBlueSpeedMaxRunway",
22212222
{"heatFrames": 375}

‎region/norfair/west/Crumble Shaft.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,7 @@
589589
}
590590
},
591591
"requires": [
592+
"canComplexGMode",
592593
"h_heatProof",
593594
"canLongXRayClimb",
594595
"canBePatient"

0 commit comments

Comments
 (0)