Skip to content

Commit b49ada3

Browse files
blkerbyblkerby
authored
Merge pull request #2041 from kjbranch/helper_rename_g_morph
Remove "can" from artificial morph helpers
2 parents 360c5e0 + 5ef0970 commit b49ada3

118 files changed

Lines changed: 1280 additions & 1280 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎helpers.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,28 +1158,28 @@
11581158
"description": "Helpers used in G-Mode Artificial Morph Strats.",
11591159
"helpers": [
11601160
{
1161-
"name": "h_canArtificialMorphSpringBall",
1161+
"name": "h_artificialMorphSpringBall",
11621162
"requires": [
11631163
"SpringBall"
11641164
]
11651165
},
11661166
{
1167-
"name": "h_canArtificialMorphSpringFling",
1167+
"name": "h_artificialMorphSpringFling",
11681168
"requires": [
11691169
{"tech": "canSpringFling"},
11701170
"SpringBall"
11711171
]
11721172
},
11731173
{
1174-
"name": "h_canArtificialMorphDoubleSpringBallJump",
1174+
"name": "h_artificialMorphDoubleSpringBallJump",
11751175
"requires": [
11761176
{"tech": "canDoubleSpringBallJumpMidAir"},
11771177
"HiJump",
11781178
"SpringBall"
11791179
]
11801180
},
11811181
{
1182-
"name": "h_canArtificialMorphBombThings",
1182+
"name": "h_artificialMorphBombThings",
11831183
"requires": [
11841184
{"or": [
11851185
"Bombs",
@@ -1188,83 +1188,83 @@
11881188
]
11891189
},
11901190
{
1191-
"name": "h_canArtificialMorphBombs",
1191+
"name": "h_artificialMorphBombs",
11921192
"requires": [
11931193
"Bombs"
11941194
]
11951195
},
11961196
{
1197-
"name": "h_canArtificialMorphPowerBomb",
1197+
"name": "h_artificialMorphPowerBomb",
11981198
"requires": [
11991199
{"ammo": { "type": "PowerBomb", "count": 1}}
12001200
]
12011201
},
12021202
{
1203-
"name": "h_canArtificialMorphIBJ",
1203+
"name": "h_artificialMorphIBJ",
12041204
"requires": [
12051205
{"tech": "canIBJ"},
12061206
"Bombs"
12071207
]
12081208
},
12091209
{
1210-
"name": "h_canArtificialMorphLongIBJ",
1210+
"name": "h_artificialMorphLongIBJ",
12111211
"requires": [
12121212
{"tech": "canLongIBJ"},
12131213
"Bombs"
12141214
]
12151215
},
12161216
{
1217-
"name": "h_canArtificialMorphJumpIntoIBJ",
1217+
"name": "h_artificialMorphJumpIntoIBJ",
12181218
"requires": [
12191219
{"tech": "canJumpIntoIBJ"},
12201220
"Bombs",
12211221
"SpringBall"
12221222
]
12231223
},
12241224
{
1225-
"name": "h_canArtificialMorphBombAboveIBJ",
1225+
"name": "h_artificialMorphBombAboveIBJ",
12261226
"requires": [
12271227
{"tech": "canBombAboveIBJ"},
12281228
"Bombs"
12291229
]
12301230
},
12311231
{
1232-
"name": "h_canArtificialMorphCeilingBombJump",
1232+
"name": "h_artificialMorphCeilingBombJump",
12331233
"requires": [
12341234
{"tech": "canCeilingBombJump"},
12351235
"Bombs"
12361236
]
12371237
},
12381238
{
1239-
"name": "h_canArtificialMorphLongCeilingBombJump",
1239+
"name": "h_artificialMorphLongCeilingBombJump",
12401240
"requires": [
12411241
{"tech": "canLongCeilingBombJump"},
12421242
"Bombs"
12431243
]
12441244
},
12451245
{
1246-
"name": "h_canArtificialMorphDiagonalBombJump",
1246+
"name": "h_artificialMorphDiagonalBombJump",
12471247
"requires": [
12481248
{"tech": "canDiagonalBombJump"},
12491249
"Bombs"
12501250
]
12511251
},
12521252
{
1253-
"name": "h_canArtificialMorphDoubleBombJump",
1253+
"name": "h_artificialMorphDoubleBombJump",
12541254
"requires": [
12551255
{"tech": "canDoubleBombJump"},
12561256
"Bombs"
12571257
]
12581258
},
12591259
{
1260-
"name": "h_canArtificialMorphStaggeredIBJ",
1260+
"name": "h_artificialMorphStaggeredIBJ",
12611261
"requires": [
12621262
{"tech": "canStaggeredIBJ"},
12631263
"Bombs"
12641264
]
12651265
},
12661266
{
1267-
"name": "h_canArtificialMorphBombHorizontally",
1267+
"name": "h_artificialMorphBombHorizontally",
12681268
"requires": [
12691269
{"tech": "canBombHorizontally"},
12701270
{"or": [
@@ -1274,22 +1274,22 @@
12741274
]
12751275
},
12761276
{
1277-
"name": "h_canArtificialMorphHBJ",
1277+
"name": "h_artificialMorphHBJ",
12781278
"requires": [
12791279
{"tech": "canHBJ"},
12801280
"Bombs"
12811281
]
12821282
},
12831283
{
1284-
"name": "h_canArtificialMorphResetFallSpeed",
1284+
"name": "h_artificialMorphResetFallSpeed",
12851285
"requires": [{"tech": "canResetFallSpeed"}]
12861286
},
12871287
{
1288-
"name": "h_canArtificialMorphSpringFling",
1288+
"name": "h_artificialMorphSpringFling",
12891289
"requires": [{"tech": "canSpringFling"}]
12901290
},
12911291
{
1292-
"name": "h_canArtificialMorphSpringBallBombJump",
1292+
"name": "h_artificialMorphSpringBallBombJump",
12931293
"requires": [
12941294
{"tech": "canSpringBallBombJump"},
12951295
"SpringBall",
@@ -1300,15 +1300,15 @@
13001300
]
13011301
},
13021302
{
1303-
"name": "h_canArtificialMorphUnderwaterBombIntoSpringBallJump",
1303+
"name": "h_artificialMorphUnderwaterBombIntoSpringBallJump",
13041304
"requires": [
13051305
{"tech": "canUnderwaterBombIntoSpringBallJump"},
13061306
"SpringBall",
13071307
"Bombs"
13081308
]
13091309
},
13101310
{
1311-
"name": "h_canArtificialMorphCrystalFlash",
1311+
"name": "h_artificialMorphCrystalFlash",
13121312
"requires": [
13131313
{"tech": "canCrystalFlash"},
13141314
{"ammo": {"type": "PowerBomb", "count": 1}},
@@ -1321,20 +1321,20 @@
13211321
"devNote": "FIXME: Samus may not get a full refill, depending on the number of tanks and environment."
13221322
},
13231323
{
1324-
"name": "h_canArtificialMorphBombIntoCrystalFlashClip",
1324+
"name": "h_artificialMorphBombIntoCrystalFlashClip",
13251325
"requires": [
13261326
{"tech": "canBombIntoCrystalFlashClip"},
13271327
"Bombs",
1328-
"h_canArtificialMorphCrystalFlash",
1328+
"h_artificialMorphCrystalFlash",
13291329
"h_BombIntoCrystalFlashClipLeniency"
13301330
]
13311331
},
13321332
{
1333-
"name": "h_canArtificialMorphMovement",
1333+
"name": "h_artificialMorphMovement",
13341334
"requires": [
13351335
{"or": [
1336-
"h_canArtificialMorphSpringBall",
1337-
"h_canArtificialMorphIBJ",
1336+
"h_artificialMorphSpringBall",
1337+
"h_artificialMorphIBJ",
13381338
"Morph"
13391339
]}
13401340
],

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,8 @@
615615
}
616616
},
617617
"requires": [
618-
"h_canArtificialMorphJumpIntoIBJ",
619-
"h_canArtificialMorphBombHorizontally"
618+
"h_artificialMorphJumpIntoIBJ",
619+
"h_artificialMorphBombHorizontally"
620620
],
621621
"flashSuitChecked": true,
622622
"note": "Starting an IBJ from spring ball with no other items is not very precise, it just takes a bit of an odd timing."

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -682,8 +682,8 @@
682682
"requires": [
683683
"h_ZebesIsAwake",
684684
{"or": [
685-
"h_canArtificialMorphSpringBall",
686-
"h_canArtificialMorphBombThings",
685+
"h_artificialMorphSpringBall",
686+
"h_artificialMorphBombThings",
687687
"canTrickyJump",
688688
{"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
689689
]}
@@ -710,8 +710,8 @@
710710
{"notable": "G-Mode Flashing Lights"},
711711
{"or": [
712712
"h_ZebesNotAwake",
713-
"h_canArtificialMorphSpringBall",
714-
"h_canArtificialMorphBombThings",
713+
"h_artificialMorphSpringBall",
714+
"h_artificialMorphBombThings",
715715
"canTrickyJump",
716716
{"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
717717
]}
@@ -1213,12 +1213,12 @@
12131213
"requires": [
12141214
{"obstaclesCleared": ["D"]},
12151215
"canRiskPermanentLossOfAccess",
1216-
"h_canArtificialMorphMovement",
1217-
"h_canArtificialMorphBombs",
1216+
"h_artificialMorphMovement",
1217+
"h_artificialMorphBombs",
12181218
{"or": [
12191219
"canConsecutiveWalljump",
12201220
"SpaceJump",
1221-
"h_canArtificialMorphLongIBJ"
1221+
"h_artificialMorphLongIBJ"
12221222
]}
12231223
],
12241224
"note": "After overloading the PLMs by touching the item, go through the crumble and bomb blocks to the top door.",
@@ -1233,7 +1233,7 @@
12331233
"name": "G-Mode Morph IBJ",
12341234
"requires": [
12351235
"canEnterGMode",
1236-
"h_canArtificialMorphLongIBJ",
1236+
"h_artificialMorphLongIBJ",
12371237
{"or": [
12381238
"canConsecutiveWalljump",
12391239
"SpaceJump",
@@ -1259,7 +1259,7 @@
12591259
"name": "G-Mode Morph with Power Bomb",
12601260
"requires": [
12611261
"canEnterGMode",
1262-
"h_canArtificialMorphPowerBomb"
1262+
"h_artificialMorphPowerBomb"
12631263
],
12641264
"clearsObstacles": ["B", "C"],
12651265
"flashSuitChecked": true,
@@ -1273,8 +1273,8 @@
12731273
"canEnterGMode",
12741274
{"itemNotCollectedAtNode": 4},
12751275
"canRiskPermanentLossOfAccess",
1276-
"h_canArtificialMorphPowerBomb",
1277-
"h_canArtificialMorphMovement",
1276+
"h_artificialMorphPowerBomb",
1277+
"h_artificialMorphMovement",
12781278
{"or": [
12791279
"canConsecutiveWalljump",
12801280
"SpaceJump"
@@ -1293,7 +1293,7 @@
12931293
"requires": [
12941294
"canEnterGMode",
12951295
{"itemNotCollectedAtNode": 4},
1296-
"h_canArtificialMorphMovement"
1296+
"h_artificialMorphMovement"
12971297
],
12981298
"clearsObstacles": ["D"],
12991299
"collectsItems": [4],

‎region/brinstar/blue/Morph Ball Room.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,8 +1188,8 @@
11881188
}
11891189
},
11901190
"requires": [
1191-
"h_canArtificialMorphPowerBomb",
1192-
"h_canArtificialMorphMovement"
1191+
"h_artificialMorphPowerBomb",
1192+
"h_artificialMorphMovement"
11931193
],
11941194
"clearsObstacles": ["B"],
11951195
"flashSuitChecked": true,
@@ -1318,11 +1318,11 @@
13181318
"requires": [
13191319
"canEnterGMode",
13201320
{"obstaclesCleared": ["D"]},
1321-
"h_canArtificialMorphPowerBomb",
1321+
"h_artificialMorphPowerBomb",
13221322
{"or": [
1323-
"h_canArtificialMorphSpringBall",
1324-
"h_canArtificialMorphPowerBomb",
1325-
"h_canArtificialMorphBombs"
1323+
"h_artificialMorphSpringBall",
1324+
"h_artificialMorphPowerBomb",
1325+
"h_artificialMorphBombs"
13261326
]}
13271327
],
13281328
"clearsObstacles": ["B"],

‎region/brinstar/green/Brinstar Reserve Tank Room.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,9 @@
150150
},
151151
"requires": [
152152
{"or": [
153-
"h_canArtificialMorphSpringBall",
153+
"h_artificialMorphSpringBall",
154154
{"and": [
155-
"h_canArtificialMorphIBJ",
155+
"h_artificialMorphIBJ",
156156
"canOffScreenMovement"
157157
]}
158158
]}

‎region/brinstar/green/Etecoon Energy Tank Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,8 @@
372372
"requires": [
373373
"canOffScreenMovement",
374374
{"or": [
375-
"h_canArtificialMorphBombs",
376-
"h_canArtificialMorphSpringBall",
375+
"h_artificialMorphBombs",
376+
"h_artificialMorphSpringBall",
377377
{"ammo": {"type": "PowerBomb", "count": 6}}
378378
]}
379379
],
@@ -699,8 +699,8 @@
699699
"requires": [
700700
"canOffScreenMovement",
701701
{"or": [
702-
"h_canArtificialMorphBombs",
703-
"h_canArtificialMorphSpringBall",
702+
"h_artificialMorphBombs",
703+
"h_artificialMorphSpringBall",
704704
{"ammo": {"type": "PowerBomb", "count": 6}}
705705
]}
706706
],

0 commit comments

Comments
 (0)