Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Main Street: Add Double Spring Ball Jumps #1915

Merged
merged 3 commits into from
Jan 26, 2025
Merged

Main Street: Add Double Spring Ball Jumps #1915

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a34cfb
Main Street: Add Double Spring Ball Jumps
kjbranch Jan 26, 2025
f58ad4b
add missing link
kjbranch Jan 26, 2025
e4fcb19
Add missing canEnterGMode
kjbranch Jan 26, 2025
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
152 changes: 107 additions & 45 deletions region/maridia/outer/Main Street.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@
"from": 13,
"to": [
{"id": 3},
{"id": 4},
{"id": 10},
{"id": 11}
]
Expand Down Expand Up @@ -1191,8 +1192,13 @@
"comesThroughToilet": "no"
},
"requires": [
"h_canArtificialMorphIBJ",
"Gravity"
{"or": [
{"and": [
"Gravity",
"h_canArtificialMorphIBJ"
]},
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"clearsObstacles": ["B"],
"flashSuitChecked": true
Expand All @@ -1208,8 +1214,13 @@
"comesThroughToilet": "any"
},
"requires": [
"h_canArtificialMorphIBJ",
"Gravity"
{"or": [
{"and": [
"Gravity",
"h_canArtificialMorphIBJ"
]},
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"flashSuitChecked": true
},
Expand Down Expand Up @@ -1969,8 +1980,13 @@
}
},
"requires": [
"h_canArtificialMorphIBJ",
"Gravity"
{"or": [
{"and": [
"Gravity",
"h_canArtificialMorphIBJ"
]},
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"clearsObstacles": ["B"],
"flashSuitChecked": true
Expand All @@ -1985,8 +2001,13 @@
}
},
"requires": [
"h_canArtificialMorphIBJ",
"Gravity"
{"or": [
{"and": [
"Gravity",
"h_canArtificialMorphIBJ"
]},
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"flashSuitChecked": true
},
Expand Down Expand Up @@ -3923,6 +3944,7 @@
"link": [12, 10],
"name": "Direct G-Mode PB Overload Speed Blocks (Get Into Position)",
"requires": [
"canEnterGMode",
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
{"obstaclesCleared": ["B"]},
"h_canNavigateUnderwater",
Expand Down Expand Up @@ -3974,6 +3996,7 @@
"link": [12, 11],
"name": "G-Mode Overload Speed Blocks (Bombs)",
"requires": [
"canEnterGMode",
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
"h_canUseMorphBombs",
"h_canNavigateUnderwater",
Expand Down Expand Up @@ -4034,37 +4057,69 @@
{
"link": [13, 3],
"name": "Exit G-Mode",
"requires": [],
"requires": [
"canEnterGMode"
],
"flashSuitChecked": true
},
{
"link": [13, 4],
"name": "G-Mode Morph Full Climb",
"requires": [
"canEnterGMode",
"h_canNavigateUnderwater",
{"or": [
{"and": [
"h_canArtificialMorphIBJ",
"Gravity",
{"or": [
"h_canArtificialMorphDoubleBombJump",
"h_canArtificialMorphStaggeredIBJ",
"canBePatient",
"h_canArtificialMorphPowerBomb"
]}
]},
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"flashSuitChecked": true,
"note": "Climb the room with IBJ or double Spring Ball jump."
},
{
"id": 84,
"link": [13, 10],
"name": "Direct G-Mode Morph PB Overload Speed Blocks (Get Into Position)",
"requires": [
"canEnterGMode",
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
"h_canNavigateUnderwater",
{"obstaclesCleared": ["B"]},
"Gravity",
{"or": [
"h_canArtificialMorphJumpIntoIBJ",
"h_canArtificialMorphDoubleBombJump",
"h_canArtificialMorphStaggeredIBJ",
{"and": [
"h_canArtificialMorphIBJ",
"canBeVeryPatient"
]},
{"and": [
"h_canArtificialMorphIBJ",
"h_canArtificialMorphPowerBomb"
]},
{"and": [
"h_canArtificialMorphSpringBall",
"HiJump"
"Gravity",
{"or": [
"h_canArtificialMorphJumpIntoIBJ",
"h_canArtificialMorphDoubleBombJump",
"h_canArtificialMorphStaggeredIBJ",
{"and": [
"h_canArtificialMorphIBJ",
"canBeVeryPatient"
]},
{"and": [
"h_canArtificialMorphIBJ",
"h_canArtificialMorphPowerBomb"
]},
{"and": [
"h_canArtificialMorphSpringBall",
"HiJump"
]},
{"and": [
"h_canArtificialMorphSpringBall",
"canGravityJump"
]}
]}
]},
{"and": [
"h_canArtificialMorphSpringBall",
"canGravityJump"
]}
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"flashSuitChecked": true,
Expand All @@ -4076,28 +4131,35 @@
"link": [13, 11],
"name": "G-Mode Morph IBJ Overload Speed Blocks",
"requires": [
"canEnterGMode",
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
"h_canArtificialMorphIBJ",
"Gravity",
"h_canNavigateUnderwater",
{"or": [
"h_canArtificialMorphJumpIntoIBJ",
{"and": [
"h_canArtificialMorphSpringBall",
"HiJump"
]},
{"and": [
"h_canArtificialMorphSpringBall",
"canGravityJump"
"h_canArtificialMorphIBJ",
"Gravity",
{"or": [
"h_canArtificialMorphJumpIntoIBJ",
{"and": [
"h_canArtificialMorphSpringBall",
"HiJump"
]},
{"and": [
"h_canArtificialMorphSpringBall",
"canGravityJump"
]},
"h_canArtificialMorphDoubleBombJump",
"h_canArtificialMorphStaggeredIBJ",
"canBeVeryPatient",
"h_canArtificialMorphPowerBomb"
]},
{"or": [
"h_canArtificialMorphSpringBall",
"h_canArtificialMorphCeilingBombJump",
"canBeVeryPatient"
]}
]},
"h_canArtificialMorphDoubleBombJump",
"h_canArtificialMorphStaggeredIBJ",
"canBeVeryPatient",
"h_canArtificialMorphPowerBomb"
]},
{"or": [
"h_canArtificialMorphSpringBall",
"h_canArtificialMorphCeilingBombJump",
"canBeVeryPatient"
"h_canArtificialMorphDoubleSpringBallJump"
]}
],
"flashSuitChecked": true,
Expand Down
Loading