Skip to content

Commit d8dcb8f

Browse files
osse101osse101
authored
Merge pull request #1915 from kjbranch/main-st-double-spring
Main Street: Add Double Spring Ball Jumps
2 parents 084cfaf + e4fcb19 commit d8dcb8f

1 file changed

Lines changed: 107 additions & 45 deletions

File tree

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

Lines changed: 107 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@
430430
"from": 13,
431431
"to": [
432432
{"id": 3},
433+
{"id": 4},
433434
{"id": 10},
434435
{"id": 11}
435436
]
@@ -1191,8 +1192,13 @@
11911192
"comesThroughToilet": "no"
11921193
},
11931194
"requires": [
1194-
"h_canArtificialMorphIBJ",
1195-
"Gravity"
1195+
{"or": [
1196+
{"and": [
1197+
"Gravity",
1198+
"h_canArtificialMorphIBJ"
1199+
]},
1200+
"h_canArtificialMorphDoubleSpringBallJump"
1201+
]}
11961202
],
11971203
"clearsObstacles": ["B"],
11981204
"flashSuitChecked": true
@@ -1208,8 +1214,13 @@
12081214
"comesThroughToilet": "any"
12091215
},
12101216
"requires": [
1211-
"h_canArtificialMorphIBJ",
1212-
"Gravity"
1217+
{"or": [
1218+
{"and": [
1219+
"Gravity",
1220+
"h_canArtificialMorphIBJ"
1221+
]},
1222+
"h_canArtificialMorphDoubleSpringBallJump"
1223+
]}
12131224
],
12141225
"flashSuitChecked": true
12151226
},
@@ -1969,8 +1980,13 @@
19691980
}
19701981
},
19711982
"requires": [
1972-
"h_canArtificialMorphIBJ",
1973-
"Gravity"
1983+
{"or": [
1984+
{"and": [
1985+
"Gravity",
1986+
"h_canArtificialMorphIBJ"
1987+
]},
1988+
"h_canArtificialMorphDoubleSpringBallJump"
1989+
]}
19741990
],
19751991
"clearsObstacles": ["B"],
19761992
"flashSuitChecked": true
@@ -1985,8 +2001,13 @@
19852001
}
19862002
},
19872003
"requires": [
1988-
"h_canArtificialMorphIBJ",
1989-
"Gravity"
2004+
{"or": [
2005+
{"and": [
2006+
"Gravity",
2007+
"h_canArtificialMorphIBJ"
2008+
]},
2009+
"h_canArtificialMorphDoubleSpringBallJump"
2010+
]}
19902011
],
19912012
"flashSuitChecked": true
19922013
},
@@ -3923,6 +3944,7 @@
39233944
"link": [12, 10],
39243945
"name": "Direct G-Mode PB Overload Speed Blocks (Get Into Position)",
39253946
"requires": [
3947+
"canEnterGMode",
39263948
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
39273949
{"obstaclesCleared": ["B"]},
39283950
"h_canNavigateUnderwater",
@@ -3974,6 +3996,7 @@
39743996
"link": [12, 11],
39753997
"name": "G-Mode Overload Speed Blocks (Bombs)",
39763998
"requires": [
3999+
"canEnterGMode",
39774000
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
39784001
"h_canUseMorphBombs",
39794002
"h_canNavigateUnderwater",
@@ -4034,37 +4057,69 @@
40344057
{
40354058
"link": [13, 3],
40364059
"name": "Exit G-Mode",
4037-
"requires": [],
4060+
"requires": [
4061+
"canEnterGMode"
4062+
],
40384063
"flashSuitChecked": true
40394064
},
4065+
{
4066+
"link": [13, 4],
4067+
"name": "G-Mode Morph Full Climb",
4068+
"requires": [
4069+
"canEnterGMode",
4070+
"h_canNavigateUnderwater",
4071+
{"or": [
4072+
{"and": [
4073+
"h_canArtificialMorphIBJ",
4074+
"Gravity",
4075+
{"or": [
4076+
"h_canArtificialMorphDoubleBombJump",
4077+
"h_canArtificialMorphStaggeredIBJ",
4078+
"canBePatient",
4079+
"h_canArtificialMorphPowerBomb"
4080+
]}
4081+
]},
4082+
"h_canArtificialMorphDoubleSpringBallJump"
4083+
]}
4084+
],
4085+
"flashSuitChecked": true,
4086+
"note": "Climb the room with IBJ or double Spring Ball jump."
4087+
},
40404088
{
40414089
"id": 84,
40424090
"link": [13, 10],
40434091
"name": "Direct G-Mode Morph PB Overload Speed Blocks (Get Into Position)",
40444092
"requires": [
4093+
"canEnterGMode",
40454094
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
4095+
"h_canNavigateUnderwater",
40464096
{"obstaclesCleared": ["B"]},
4047-
"Gravity",
40484097
{"or": [
4049-
"h_canArtificialMorphJumpIntoIBJ",
4050-
"h_canArtificialMorphDoubleBombJump",
4051-
"h_canArtificialMorphStaggeredIBJ",
4052-
{"and": [
4053-
"h_canArtificialMorphIBJ",
4054-
"canBeVeryPatient"
4055-
]},
40564098
{"and": [
4057-
"h_canArtificialMorphIBJ",
4058-
"h_canArtificialMorphPowerBomb"
4059-
]},
4060-
{"and": [
4061-
"h_canArtificialMorphSpringBall",
4062-
"HiJump"
4099+
"Gravity",
4100+
{"or": [
4101+
"h_canArtificialMorphJumpIntoIBJ",
4102+
"h_canArtificialMorphDoubleBombJump",
4103+
"h_canArtificialMorphStaggeredIBJ",
4104+
{"and": [
4105+
"h_canArtificialMorphIBJ",
4106+
"canBeVeryPatient"
4107+
]},
4108+
{"and": [
4109+
"h_canArtificialMorphIBJ",
4110+
"h_canArtificialMorphPowerBomb"
4111+
]},
4112+
{"and": [
4113+
"h_canArtificialMorphSpringBall",
4114+
"HiJump"
4115+
]},
4116+
{"and": [
4117+
"h_canArtificialMorphSpringBall",
4118+
"canGravityJump"
4119+
]}
4120+
]}
40634121
]},
4064-
{"and": [
4065-
"h_canArtificialMorphSpringBall",
4066-
"canGravityJump"
4067-
]}
4122+
"h_canArtificialMorphDoubleSpringBallJump"
40684123
]}
40694124
],
40704125
"flashSuitChecked": true,
@@ -4076,28 +4131,35 @@
40764131
"link": [13, 11],
40774132
"name": "G-Mode Morph IBJ Overload Speed Blocks",
40784133
"requires": [
4134+
"canEnterGMode",
40794135
{"notable": "G-Mode Overload Speed Blocks then use Global Crab"},
4080-
"h_canArtificialMorphIBJ",
4081-
"Gravity",
4136+
"h_canNavigateUnderwater",
40824137
{"or": [
4083-
"h_canArtificialMorphJumpIntoIBJ",
40844138
{"and": [
4085-
"h_canArtificialMorphSpringBall",
4086-
"HiJump"
4087-
]},
4088-
{"and": [
4089-
"h_canArtificialMorphSpringBall",
4090-
"canGravityJump"
4139+
"h_canArtificialMorphIBJ",
4140+
"Gravity",
4141+
{"or": [
4142+
"h_canArtificialMorphJumpIntoIBJ",
4143+
{"and": [
4144+
"h_canArtificialMorphSpringBall",
4145+
"HiJump"
4146+
]},
4147+
{"and": [
4148+
"h_canArtificialMorphSpringBall",
4149+
"canGravityJump"
4150+
]},
4151+
"h_canArtificialMorphDoubleBombJump",
4152+
"h_canArtificialMorphStaggeredIBJ",
4153+
"canBeVeryPatient",
4154+
"h_canArtificialMorphPowerBomb"
4155+
]},
4156+
{"or": [
4157+
"h_canArtificialMorphSpringBall",
4158+
"h_canArtificialMorphCeilingBombJump",
4159+
"canBeVeryPatient"
4160+
]}
40914161
]},
4092-
"h_canArtificialMorphDoubleBombJump",
4093-
"h_canArtificialMorphStaggeredIBJ",
4094-
"canBeVeryPatient",
4095-
"h_canArtificialMorphPowerBomb"
4096-
]},
4097-
{"or": [
4098-
"h_canArtificialMorphSpringBall",
4099-
"h_canArtificialMorphCeilingBombJump",
4100-
"canBeVeryPatient"
4162+
"h_canArtificialMorphDoubleSpringBallJump"
41014163
]}
41024164
],
41034165
"flashSuitChecked": true,

0 commit comments

Comments
 (0)