Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions region/norfair/crocomire/Cosine Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
{"and": [
"h_artificialMorphIBJ",
Expand Down Expand Up @@ -182,12 +183,9 @@
}
},
"requires": [
"canTrickyGMode",
"h_artificialMorphBombHorizontally",
{"ammo": {"type": "PowerBomb", "count": 6}},
{"or": [
"canTrickyGMode",
{"acidFrames": 212}
]}
{"ammo": {"type": "PowerBomb", "count": 6}}
],
"collectsItems": [2],
"flashSuitChecked": true,
Expand Down
3 changes: 2 additions & 1 deletion region/norfair/crocomire/Crocomire's Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,9 @@
{
"id": 20,
"link": [3, 4],
"name": "G-mode Morph Ceiling Bomb Jump",
"name": "G-Mode Morph Ceiling Bomb Jump",
"requires": [
"canEnterGMode",
"h_artificialMorphLongCeilingBombJump",
"canBeVeryPatient",
{"obstaclesCleared": ["A"]}
Expand Down
1 change: 1 addition & 0 deletions region/norfair/crocomire/Grapple Beam Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
9 changes: 5 additions & 4 deletions region/norfair/crocomire/Indiana Jones Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,7 @@
"comesThroughToilet": "any"
},
"requires": [
"canComplexGMode",
"canManipulateMellas",
{"or": [
"h_preciseIceClip",
Expand Down Expand Up @@ -1652,7 +1653,7 @@
"link": [6, 2],
"name": "G-Mode Morph Mella Ice Clip, Door Lock Skip",
"requires": [
"canEnterGMode",
"canComplexGMode",
"canManipulateMellas",
{"or": [
"h_preciseIceClip",
Expand Down Expand Up @@ -1714,7 +1715,7 @@
"link": [7, 1],
"name": "G-Mode Morph Spring Ball, IBJ, Remote Acquire",
"requires": [
"canEnterGMode",
"canComplexGMode",
"h_artificialMorphLongIBJ",
"h_artificialMorphJumpIntoIBJ"
],
Expand All @@ -1727,7 +1728,7 @@
"link": [7, 1],
"name": "G-Mode Morph Long Diagonal Bomb Jump, Remote Acquire",
"requires": [
"canEnterGMode",
"canComplexGMode",
{"notable": "G-Mode Morph Long Diagonal Bomb Jump"},
"h_artificialMorphDiagonalBombJump",
"h_artificialMorphLongIBJ"
Expand All @@ -1741,7 +1742,7 @@
"link": [7, 2],
"name": "G-Mode Morph, IBJ, Remote Acquire",
"requires": [
"canEnterGMode",
"canComplexGMode",
"h_artificialMorphLongIBJ"
],
"collectsItems": [3],
Expand Down
2 changes: 2 additions & 0 deletions region/norfair/crocomire/Post Crocomire Farming Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"flashSuitChecked": true,
Expand All @@ -1217,6 +1218,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
}
},
"requires": [
"canComplexGMode",
"h_heatedDirectGModeLeaveSameDoor"
],
"collectsItems": [2],
Expand Down
9 changes: 8 additions & 1 deletion region/norfair/west/Business Center.json
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -1554,6 +1555,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -1617,6 +1619,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2195,7 +2198,8 @@
"morphed": false
}
},
"flashSuitChecked": true
"flashSuitChecked": true,
"devNote": "FIXME: There could be a 4->7 variant with an ice clip or CF clip through the shot blocks."
},
{
"id": 75,
Expand Down Expand Up @@ -2416,6 +2420,7 @@
}
},
"requires": [
"canComplexGMode",
"canXRayClimb"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2549,6 +2554,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb",
"canBePatient"
],
Expand Down Expand Up @@ -3179,6 +3185,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
12 changes: 11 additions & 1 deletion region/norfair/west/Crocomire Escape.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,18 @@
"HiJump",
"SpeedBooster"
]},
"h_lavaProof"
{"and": [
"canComplexGMode",
"h_lavaProof"
]}
]},
"h_heatedGModeOpenDifferentDoor"
],
"flashSuitChecked": true,
"note": [
"Go over the plateau, or under it with lava protection.",
"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."
],
"devNote": "FIXME: Damage through the lava could work, or maybe a Geruta damage boost. (Energy from immobile or CF)"
},
{
Expand Down Expand Up @@ -740,6 +747,7 @@
}
},
"requires": [
"canComplexGMode",
"canTrickyUseFrozenEnemies",
"canTrickyDodgeEnemies",
{"or": [
Expand All @@ -763,6 +771,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"SpaceJump",
{"and": [
Expand Down Expand Up @@ -815,6 +824,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphLongIBJ",
"h_artificialMorphJumpIntoIBJ"
Expand Down
3 changes: 2 additions & 1 deletion region/norfair/west/Crocomire Speedway.json
Original file line number Diff line number Diff line change
Expand Up @@ -2200,7 +2200,7 @@
"ScrewAttack",
{"ammo": {"type": "Missile", "count": 3}},
{"ammo": {"type": "Super", "count": 3}},
"canInsaneJump"
"canComplexGMode"
]}
],
"flashSuitChecked": true,
Expand All @@ -2216,6 +2216,7 @@
"link": [7, 2],
"name": "G-Mode, Fix Camera, Speedy Exit",
"requires": [
"canComplexGMode",
"h_heatedGMode",
"h_getBlueSpeedMaxRunway",
{"heatFrames": 375}
Expand Down
1 change: 1 addition & 0 deletions region/norfair/west/Crumble Shaft.json
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,7 @@
}
},
"requires": [
"canComplexGMode",
"h_heatProof",
"canLongXRayClimb",
"canBePatient"
Expand Down
8 changes: 6 additions & 2 deletions region/norfair/west/Hi Jump Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@
}
},
"requires": [
"canComplexGMode",
"h_artificialMorphSpringBallBombJump",
"h_additionalBomb"
],
Expand Down Expand Up @@ -418,6 +419,7 @@
}
},
"requires": [
"canComplexGMode",
{"or": [
"h_artificialMorphIBJ",
{"and": [
Expand Down Expand Up @@ -521,6 +523,7 @@
}
},
"requires": [
"canComplexGMode",
{"itemNotCollectedAtNode": 3},
"canRiskPermanentLossOfAccess",
{"or": [
Expand Down Expand Up @@ -788,6 +791,7 @@
}
},
"requires": [
"canComplexGMode",
"h_artificialMorphMovement"
],
"collectsItems": [3],
Expand Down Expand Up @@ -855,7 +859,7 @@
"link": [4, 1],
"name": "Remote Acquire",
"requires": [
"canEnterGMode",
"canComplexGMode",
{"obstaclesCleared": ["D"]}
],
"collectsItems": [4],
Expand All @@ -879,7 +883,7 @@
"link": [4, 3],
"name": "Remote Acquire",
"requires": [
"canEnterGMode",
"canComplexGMode",
{"obstaclesCleared": ["D"]}
],
"collectsItems": [4],
Expand Down
1 change: 1 addition & 0 deletions region/norfair/west/Ice Beam Gate Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@
}
},
"requires": [
"canComplexGMode",
"canLongXRayClimb"
],
"bypassesDoorShell": true,
Expand Down
1 change: 1 addition & 0 deletions region/norfair/west/Ice Beam Tutorial Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,6 +532,7 @@
}
},
"requires": [
"canComplexGMode",
"Gravity",
"h_artificialMorphPowerBomb",
"canNeutralDamageBoost",
Expand Down