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: 4 additions & 4 deletions region/brinstar/blue/Blue Brinstar Boulder Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@
},
"requires": [
"canTrickyJump",
"canPreciseWalljump"
"canPreciseWallJump"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
Expand Down Expand Up @@ -513,7 +513,7 @@
"name": "Doorsill Jump",
"requires": [
"canDash",
"canPreciseWalljump",
"canPreciseWallJump",
"canTrickyJump",
{"or": [
{"spikeHits": 1},
Expand Down Expand Up @@ -674,7 +674,7 @@
}
},
"requires": [
"canPreciseWalljump",
"canPreciseWallJump",
"canTrickyJump",
{"or": [
{"spikeHits": 1},
Expand Down Expand Up @@ -995,7 +995,7 @@
"name": "Naked Walljump",
"requires": [
"canSuitlessMaridia",
"canInsaneWalljump"
"canInsaneWallJump"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
Expand Down
34 changes: 17 additions & 17 deletions region/brinstar/blue/Blue Brinstar Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
"requires": [
{"notable": "Taco Tank"},
"canCWJ",
"canInsaneWalljump",
"canInsaneWallJump",
"canStationarySpinJump"
],
"flashSuitChecked": false,
Expand Down Expand Up @@ -943,7 +943,7 @@
"HiJump",
{"canShineCharge": {"usedTiles": 35, "openEnd": 1}},
"canShinechargeMovementTricky",
"canFastWalljumpClimb",
"canFastWallJumpClimb",
{"shinespark": {"frames": 8, "excessFrames": 0}}
],
"exitCondition": {
Expand All @@ -965,7 +965,7 @@
{"obstaclesCleared": ["A"]}
]},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
"canLongIBJ"
]}
Expand Down Expand Up @@ -1036,7 +1036,7 @@
{"haveBlueSuit": {}}
]},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
{"and": [
"SpaceJump",
{"cycleFrames": 250}
Expand Down Expand Up @@ -1214,7 +1214,7 @@
{"notable": "Return Through Crumble Blocks"},
"Morph",
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
"canLongIBJ"
]},
Expand All @@ -1234,7 +1234,7 @@
{"obstaclesCleared": ["C"]}
]},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
"canLongIBJ"
]},
Expand Down Expand Up @@ -1263,7 +1263,7 @@
{"obstaclesCleared": ["C"]}
]},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]}
],
Expand All @@ -1288,7 +1288,7 @@
]},
"canLongIBJ",
{"and": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"canWallJumpInstantMorph"
]}
]}
Expand Down Expand Up @@ -1406,7 +1406,7 @@
]},
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
"canShinechargeMovementComplex",
"canConsecutiveWalljump",
"canConsecutiveWallJump",
{"shinespark": {"frames": 17, "excessFrames": 3}}
],
"clearsObstacles": ["A", "B", "C"],
Expand All @@ -1430,7 +1430,7 @@
]},
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
"canShinechargeMovementComplex",
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"HiJump",
{"shinespark": {"frames": 9, "excessFrames": 9}}
],
Expand All @@ -1453,7 +1453,7 @@
]},
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
"canShinechargeMovementComplex",
"canFastWalljumpClimb",
"canFastWallJumpClimb",
{"shinespark": {"frames": 9, "excessFrames": 9}}
],
"clearsObstacles": ["A", "B", "C"],
Expand Down Expand Up @@ -1493,7 +1493,7 @@
]},
{"and": [
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]},
{"shinespark": {"frames": 9, "excessFrames": 9}}
Expand Down Expand Up @@ -1521,7 +1521,7 @@
]},
{"and": [
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]},
{"shinespark": {"frames": 9, "excessFrames": 9}}
Expand Down Expand Up @@ -1574,7 +1574,7 @@
"canGMode",
"h_artificialMorphIBJ",
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
{"and": [
"h_artificialMorphLongIBJ",
Expand Down Expand Up @@ -1612,7 +1612,7 @@
"canGMode",
"Morph",
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]},
{"or": [
Expand All @@ -1637,7 +1637,7 @@
"h_artificialMorphPowerBomb",
"h_artificialMorphMovement",
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
{"and": [
{"blueSuitShinecharge": {}},
Expand Down Expand Up @@ -1733,7 +1733,7 @@
{"itemNotCollectedAtNode": 4},
"h_artificialMorphSpringBall",
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
{"and": [
{"blueSuitShinecharge": {}},
Expand Down
8 changes: 4 additions & 4 deletions region/brinstar/green/Green Brinstar Main Shaft.json
Original file line number Diff line number Diff line change
Expand Up @@ -4435,7 +4435,7 @@
{"resourceAtMost": [{"type": "ReserveEnergy", "count": 5}]}
]},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"canLongIBJ",
"SpaceJump"
]},
Expand Down Expand Up @@ -4772,7 +4772,7 @@
{"or": [
"SpaceJump",
"canLongIBJ",
"canConsecutiveWalljump"
"canConsecutiveWallJump"
]}
]
},
Expand Down Expand Up @@ -4942,7 +4942,7 @@
"canTrivialMidAirMorph",
{"or": [
"SpaceJump",
"canConsecutiveWalljump"
"canConsecutiveWallJump"
]}
]},
{"and": [
Expand Down Expand Up @@ -6018,7 +6018,7 @@
"link": [14, 9],
"name": "Full Etecoon Wall Jump Climb",
"requires": [
"canConsecutiveWalljump"
"canConsecutiveWallJump"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
Expand Down
4 changes: 2 additions & 2 deletions region/brinstar/green/Green Hill Zone.json
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@
"name": "Wall Jump to Top Right Door",
"requires": [
{"notable": "Wall Jump to Top Right Door"},
"canPreciseWalljump"
"canPreciseWallJump"
],
"flashSuitChecked": true,
"blueSuitChecked": true,
Expand Down Expand Up @@ -1113,7 +1113,7 @@
"link": [2, 2],
"name": "Leave With Spark (Far Runway)",
"requires": [
"canPreciseWalljump",
"canPreciseWallJump",
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
"canShinechargeMovementTricky",
{"shinespark": {"frames": 19, "excessFrames": 0}}
Expand Down
2 changes: 1 addition & 1 deletion region/brinstar/kraid/Warehouse Entrance.json
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@
"name": "Wall Jump",
"requires": [
"canDash",
"canPreciseWalljump",
"canPreciseWallJump",
{"disableEquipment": "SpeedBooster"}
],
"flashSuitChecked": true,
Expand Down
6 changes: 3 additions & 3 deletions region/brinstar/pink/Big Pink.json
Original file line number Diff line number Diff line change
Expand Up @@ -4085,7 +4085,7 @@
"name": "Zeb Ice Clip",
"requires": [
{"notable": "Zeb Ice Clip"},
"canTrickyWalljump",
"canTrickyWallJump",
"canCameraManip",
{"or": [
"Wave",
Expand All @@ -4111,7 +4111,7 @@
"name": "Blind Zeb Ice Clip (Preserve Flash Suit)",
"requires": [
{"notable": "Blind Zeb Ice Clip (Preserve Flash Suit)"},
"canTrickyWalljump",
"canTrickyWallJump",
"canCameraManip",
"canOffScreenMovement",
{"or": [
Expand Down Expand Up @@ -4140,7 +4140,7 @@
{"notable": "Zeb Ice Clip"},
"canSpecialBeamAttack",
{"ammo": {"type": "PowerBomb", "count": 1}},
"canTrickyWalljump",
"canTrickyWallJump",
"h_preciseIceClip",
{"disableEquipment": "Ice"}
],
Expand Down
14 changes: 7 additions & 7 deletions region/brinstar/pink/Dachora Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@
},
"requires": [
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]}
],
Expand Down Expand Up @@ -796,7 +796,7 @@
{"shinespark": {"frames": 85, "excessFrames": 3}}
]},
{"and": [
"canFastWalljumpClimb",
"canFastWallJumpClimb",
"canMidairShinespark",
{"or": [
{"and": [
Expand Down Expand Up @@ -870,7 +870,7 @@
"name": "Spark from Fast Wall Jumps",
"requires": [
"HiJump",
"canFastWalljumpClimb",
"canFastWallJumpClimb",
"canShinechargeMovementComplex",
"h_shinechargeMaxRunway",
{"shinespark": {"frames": 67, "excessFrames": 3}}
Expand All @@ -884,7 +884,7 @@
"name": "Tankless Bootless Shinespark",
"requires": [
{"notable": "Tankless Bootless Shinespark"},
"canFastWalljumpClimb",
"canFastWallJumpClimb",
"canShinechargeMovementComplex",
"h_shinechargeMaxRunway",
{"shinespark": {"frames": 73, "excessFrames": 3}}
Expand All @@ -901,7 +901,7 @@
"requires": [
{"haveBlueSuit": {}},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
{"and": [
"canLongIBJ",
Expand All @@ -919,7 +919,7 @@
"requires": [
{"useFlashSuit": {}},
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump",
{"and": [
"canLongIBJ",
Expand Down Expand Up @@ -968,7 +968,7 @@
},
"requires": [
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]}
],
Expand Down
2 changes: 1 addition & 1 deletion region/brinstar/pink/Mission Impossible Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -937,7 +937,7 @@
{"notable": "Mission Impossible"},
"canQuickDrop",
"HiJump",
"canPreciseWalljump",
"canPreciseWallJump",
{"obstaclesCleared": ["A", "B"]}
],
"flashSuitChecked": true,
Expand Down
2 changes: 1 addition & 1 deletion region/brinstar/pink/Spore Spawn Super Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
},
"requires": [
{"or": [
"canConsecutiveWalljump",
"canConsecutiveWallJump",
"SpaceJump"
]}
],
Expand Down
8 changes: 4 additions & 4 deletions region/brinstar/pink/Waterway Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
{"and": [
"canSuitlessMaridia",
{"or": [
"canPreciseWalljump",
"canPreciseWallJump",
"canBombJumpWaterEscape",
{"and": [
"h_useSpringBall",
Expand Down Expand Up @@ -624,7 +624,7 @@
"name": "Precise Wall Jump",
"requires": [
"canSuitlessMaridia",
"canPreciseWalljump"
"canPreciseWallJump"
],
"flashSuitChecked": true,
"blueSuitChecked": true
Expand Down Expand Up @@ -690,7 +690,7 @@
"Gravity",
{"and": [
{"or": [
"canPreciseWalljump",
"canPreciseWallJump",
"SpaceJump",
{"and": [
"Ice",
Expand Down Expand Up @@ -970,7 +970,7 @@
"requires": [
{"or": [
"SpaceJump",
"canPreciseWalljump",
"canPreciseWallJump",
"canTrickySpringBallJump",
{"and": [
"h_useSpringBall",
Expand Down
Loading
Loading