Skip to content

Commit 3e30fad

Browse files
osse101osse101
authored
Merge pull request #2198 from kjbranch/g-pb-item
Add canPowerBombItemOverloadPLMs
2 parents 1849e94 + 5ab34d1 commit 3e30fad

13 files changed

Lines changed: 184 additions & 15 deletions

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,6 +1347,7 @@
13471347
"link": [5, 2],
13481348
"name": "G-Mode Morph Power Bomb the Ceiling Block Item",
13491349
"requires": [
1350+
"canPowerBombItemOverloadPLMs",
13501351
"canEnterGMode",
13511352
"h_artificialMorphPowerBomb",
13521353
"h_artificialMorphMovement",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@
10171017
}
10181018
},
10191019
"requires": [
1020+
"canPowerBombItemOverloadPLMs",
10201021
{"itemNotCollectedAtNode": 5},
10211022
{"or": [
10221023
"Morph",
@@ -1132,6 +1133,7 @@
11321133
}
11331134
},
11341135
"requires": [
1136+
"canPowerBombItemOverloadPLMs",
11351137
{"itemNotCollectedAtNode": 5},
11361138
"canRiskPermanentLossOfAccess",
11371139
{"or": [
@@ -1478,6 +1480,7 @@
14781480
}
14791481
},
14801482
"requires": [
1483+
"canPowerBombItemOverloadPLMs",
14811484
{"itemNotCollectedAtNode": 5},
14821485
{"or": [
14831486
"Morph",
@@ -1717,6 +1720,7 @@
17171720
}
17181721
},
17191722
"requires": [
1723+
"canPowerBombItemOverloadPLMs",
17201724
{"itemNotCollectedAtNode": 5},
17211725
"canRiskPermanentLossOfAccess",
17221726
"h_artificialMorphMovement",

‎region/brinstar/green/Green Brinstar Main Shaft.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4525,6 +4525,7 @@
45254525
{"or": [
45264526
"h_artificialMorphIBJ",
45274527
{"and": [
4528+
"canPowerBombItemOverloadPLMs",
45284529
"h_artificialMorphSpringBall",
45294530
"h_artificialMorphPowerBomb"
45304531
]}

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 135 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
[1, 0, 0, 0, 0],
325325
[1, 0, 0, 0, 0]
326326
],
327-
"note": "Represents being on the second platform coming out of the right wall above the door to the Pink Hopper Room. This is below the floating platform by the Grapple blocks."
327+
"note": "Represents being on the second platform coming out of the right wall above the door to the Pink Brinstar Wave Gate Room. This is below the floating platform by the Grapple blocks."
328328
},
329329
{
330330
"id": 16,
@@ -471,6 +471,7 @@
471471
{"id": 4},
472472
{"id": 10},
473473
{"id": 13},
474+
{"id": 14},
474475
{"id": 15},
475476
{"id": 16},
476477
{"id": 17}
@@ -504,6 +505,7 @@
504505
{"id": 8},
505506
{"id": 12},
506507
{"id": 13},
508+
{"id": 14},
507509
{"id": 15},
508510
{"id": 16},
509511
{"id": 17}
@@ -1176,6 +1178,69 @@
11761178
"name": "Base",
11771179
"requires": []
11781180
},
1181+
{
1182+
"link": [3, 13],
1183+
"name": "G-mode Morph Power Bomb Item, Remote Acquire",
1184+
"entranceCondition": {
1185+
"comeInWithGMode": {
1186+
"mode": "direct",
1187+
"morphed": true
1188+
}
1189+
},
1190+
"requires": [
1191+
"canPowerBombItemOverloadPLMs",
1192+
"h_artificialMorphSpringBall",
1193+
{"or": [
1194+
"canInsaneJump",
1195+
"h_artificialMorphPowerBomb",
1196+
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
1197+
]},
1198+
"h_artificialMorphPowerBomb"
1199+
],
1200+
"clearsObstacles": ["B"],
1201+
"collectsItems": [10],
1202+
"flashSuitChecked": true,
1203+
"note": [
1204+
"As long as the Sidehoppers haven't been lured to the right, fall into the pit and use a Power Bomb to kill them or dodge them.",
1205+
"Place a Power Bomb one tile below the Morph tunnel to the left to overload PLMs using the item. Exit G-mode, grab the item and return."
1206+
],
1207+
"devNote": [
1208+
"This does not include canRiskPermanentLossOfAccess because the only use of the strat is to collect the item. This is also why C is no cleared.",
1209+
"Only this door and the one just below the hopper pit on the right will benefit from this, and only without Morph or Bombs, otherwise PLMs could be overloaded simpler ways."
1210+
]
1211+
},
1212+
{
1213+
"link": [3, 14],
1214+
"name": "G-mode Morph Power Bomb Item, Loss of Acess",
1215+
"entranceCondition": {
1216+
"comeInWithGMode": {
1217+
"mode": "direct",
1218+
"morphed": true
1219+
}
1220+
},
1221+
"requires": [
1222+
"canPowerBombItemOverloadPLMs",
1223+
{"itemNotCollectedAtNode": 10},
1224+
"canRiskPermanentLossOfAccess",
1225+
"h_artificialMorphSpringBall",
1226+
{"or": [
1227+
"canInsaneJump",
1228+
"h_artificialMorphPowerBomb",
1229+
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
1230+
]},
1231+
"h_artificialMorphPowerBomb"
1232+
],
1233+
"clearsObstacles": ["B", "C"],
1234+
"flashSuitChecked": true,
1235+
"note": [
1236+
"As long as the Sidehoppers haven't been lured to the right, fall into the pit and use a Power Bomb to kill them or dodge them.",
1237+
"Place a Power Bomb one tile below the Morph tunnel to the left to overload PLMs using the item."
1238+
],
1239+
"devNote": [
1240+
"Techincally, obstacles B and C are not cleared until exiting G-mode, but those obstacles are not used by G-mode strats.",
1241+
"Only this door and the one just below the hopper pit on the right will benefit from this, and only without Morph or Bombs, otherwise PLMs could be overloaded simpler ways."
1242+
]
1243+
},
11791244
{
11801245
"id": 28,
11811246
"link": [3, 15],
@@ -1517,6 +1582,7 @@
15171582
}
15181583
},
15191584
"requires": [
1585+
"canPowerBombItemOverloadPLMs",
15201586
{"itemNotCollectedAtNode": 10},
15211587
"canRiskPermanentLossOfAccess",
15221588
"canArtificialMorph",
@@ -1602,6 +1668,7 @@
16021668
}
16031669
},
16041670
"requires": [
1671+
"canPowerBombItemOverloadPLMs",
16051672
{"itemNotCollectedAtNode": 10},
16061673
"canRiskPermanentLossOfAccess",
16071674
"canArtificialMorph",
@@ -1947,6 +2014,69 @@
19472014
"name": "Base",
19482015
"requires": []
19492016
},
2017+
{
2018+
"link": [6, 13],
2019+
"name": "G-mode Morph Power Bomb Item, Remote Acquire",
2020+
"entranceCondition": {
2021+
"comeInWithGMode": {
2022+
"mode": "direct",
2023+
"morphed": true
2024+
}
2025+
},
2026+
"requires": [
2027+
"canPowerBombItemOverloadPLMs",
2028+
"h_artificialMorphSpringBall",
2029+
{"or": [
2030+
"canInsaneJump",
2031+
"h_artificialMorphPowerBomb",
2032+
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
2033+
]},
2034+
"h_artificialMorphPowerBomb"
2035+
],
2036+
"clearsObstacles": ["B"],
2037+
"collectsItems": [10],
2038+
"flashSuitChecked": true,
2039+
"note": [
2040+
"As long as the Sidehoppers haven't been lured to the right, fall into the pit and use a Power Bomb to kill them or dodge them.",
2041+
"Place a Power Bomb one tile below the Morph tunnel to the left to overload PLMs using the item. Exit G-mode, grab the item and return."
2042+
],
2043+
"devNote": [
2044+
"This does not include canRiskPermanentLossOfAccess because the only use of the strat is to collect the item. This is also why C is no cleared.",
2045+
"Only this door and the one just above the hopper pit on the left will benefit from this, and only without Morph or Bombs, otherwise PLMs could be overloaded simpler ways."
2046+
]
2047+
},
2048+
{
2049+
"link": [6, 14],
2050+
"name": "G-mode Morph Power Bomb Item, Loss of Acess",
2051+
"entranceCondition": {
2052+
"comeInWithGMode": {
2053+
"mode": "direct",
2054+
"morphed": true
2055+
}
2056+
},
2057+
"requires": [
2058+
"canPowerBombItemOverloadPLMs",
2059+
{"itemNotCollectedAtNode": 10},
2060+
"canRiskPermanentLossOfAccess",
2061+
"h_artificialMorphSpringBall",
2062+
{"or": [
2063+
"canInsaneJump",
2064+
"h_artificialMorphPowerBomb",
2065+
{"enemyDamage": {"enemy": "Sm. Sidehopper", "type": "contact", "hits": 1}}
2066+
]},
2067+
"h_artificialMorphPowerBomb"
2068+
],
2069+
"clearsObstacles": ["B", "C"],
2070+
"flashSuitChecked": true,
2071+
"note": [
2072+
"As long as the Sidehoppers haven't been lured to the right, fall into the pit and use a Power Bomb to kill them or dodge them.",
2073+
"Place a Power Bomb one tile below the Morph tunnel to the left to overload PLMs using the item."
2074+
],
2075+
"devNote": [
2076+
"Techincally, obstacles B and C are not cleared until exiting G-mode, but those obstacles are not used by G-mode strats.",
2077+
"Only this door and the one just above the hopper pit on the left will benefit from this, and only without Morph or Bombs, otherwise PLMs could be overloaded simpler ways."
2078+
]
2079+
},
19502080
{
19512081
"id": 60,
19522082
"link": [6, 15],
@@ -3239,7 +3369,7 @@
32393369
"flashSuitChecked": true,
32403370
"note": [
32413371
"Raise a Zeb to be just below the crumble blocks and blindly freeze it to set up an ice clip to reach the Power Bomb room exit door.",
3242-
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Hopper room door.",
3372+
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Wave Gate Room door.",
32433373
"While crouched, a spazer or wave beam shot will shoot through the floor in front of Samus.",
32443374
"The bug must be frozen at a height between where Samus is crouched and where she is standing.",
32453375
"Once frozen, somehow track how long until the freeze effect expires, and when the bug will reach the crumble blocks.",
@@ -3266,7 +3396,7 @@
32663396
"flashSuitChecked": true,
32673397
"note": [
32683398
"Raise a Zeb to be just below the crumble blocks and blindly freeze it to set up an ice clip to reach the Power Bomb room exit door.",
3269-
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Hopper room door.",
3399+
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Wave Gate Room door.",
32703400
"While crouched, a spazer or wave beam shot will shoot through the floor in front of Samus.",
32713401
"Shoot then immediately jump so that the bug can be frozen at a pixel perfect height, which is higher than where it would typically be frozen (when not needing to preserve a flash suit).",
32723402
"Once frozen, wait for the bug to thaw, then blindly follow it to the left without letting it go off camera, which would cause it to despawn.",
@@ -4171,7 +4301,7 @@
41714301
"name": "Zeb Ice Clip",
41724302
"note": [
41734303
"Raise a Zeb to be just below the crumble blocks and blindly freeze it to set up an ice clip to reach the Power Bomb room exit door.",
4174-
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Hopper room door.",
4304+
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Wave Gate Room door.",
41754305
"While crouched, a spazer or wave beam shot will shoot through the floor in front of Samus.",
41764306
"The bug must be frozen at a height between where Samus is crouched and where she is standing.",
41774307
"Once frozen, somehow track how long until the freeze effect expires, and when the bug will reach the crumble blocks.",
@@ -4184,7 +4314,7 @@
41844314
"name": "Blind Zeb Ice Clip (Preserve Flash Suit)",
41854315
"note": [
41864316
"Raise a Zeb to be just below the crumble blocks and blindly freeze it to set up an ice clip to reach the Power Bomb room exit door.",
4187-
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Hopper room door.",
4317+
"Get a bug from the pipe to spawn facing left and freeze it while moving to the ledge below the Wave Gate Room door.",
41884318
"While crouched, a spazer or wave beam shot will shoot through the floor in front of Samus.",
41894319
"Shoot then immediately jump so that the bug can be frozen at a pixel perfect height, which is higher than where it would typically be frozen (when not needing to preserve a flash suit).",
41904320
"Once frozen, wait for the bug to thaw, then blindly follow it to the left without letting it go off camera, which would cause it to despawn.",

‎region/brinstar/pink/Mission Impossible Room.json‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@
727727
}
728728
},
729729
"requires": [
730+
"canPowerBombItemOverloadPLMs",
730731
{"itemNotCollectedAtNode": 3},
731732
"h_artificialMorphPowerBomb",
732733
"h_artificialMorphPowerBomb",
@@ -743,10 +744,14 @@
743744
]}
744745
],
745746
"flashSuitChecked": true,
746-
"note": "Place two Power Bombs, precisely on the third tile in the morph tunnel to overload PLMs (watch the right side of the screen).",
747+
"note": [
748+
"Place two Power Bombs, precisely on the fourth tile in the morph tunnel to overload PLMs.",
749+
"Samus should be barely visible in the tunnel, if not, use the right edge of the screen to track her moved distance."
750+
],
747751
"devNote": [
748752
"Because of the gates, it costs 2 Power Bombs to get into the tunnel and 2 to get out the other side.",
749-
"There is no canRiskPermanentLossOfAccess, because there is no reason to go here except to get the item and leave."
753+
"There is no canRiskPermanentLossOfAccess, because there is no reason to go here except to get the item and leave.",
754+
"This is only useful if Samus has Morph, or the item is Morph."
750755
]
751756
},
752757
{

‎region/brinstar/red/X-Ray Scope Room.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@
202202
}
203203
},
204204
"requires": [
205+
"canPowerBombItemOverloadPLMs",
205206
"h_artificialMorphPowerBomb",
206207
"h_additionalBomb",
207208
{"or": [

‎region/crateria/central/Climb Supers Room.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,7 @@
599599
}
600600
},
601601
"requires": [
602+
"canPowerBombItemOverloadPLMs",
602603
{"itemNotCollectedAtNode": 3},
603604
"canRiskPermanentLossOfAccess",
604605
"h_artificialMorphPowerBomb",
@@ -1266,6 +1267,7 @@
12661267
}
12671268
},
12681269
"requires": [
1270+
"canPowerBombItemOverloadPLMs",
12691271
{"notable": "G-Mode Up with Power Bombs"},
12701272
{"itemNotCollectedAtNode": 3},
12711273
"canConsecutiveWalljump",

‎region/crateria/east/West Ocean.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,6 +3129,7 @@
31293129
"link": [17, 1],
31303130
"name": "G-mode Overload PLMs by Power Bombing Morph Maze Item",
31313131
"requires": [
3132+
"canPowerBombItemOverloadPLMs",
31323133
{"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"},
31333134
"canEnterGMode",
31343135
"h_usePowerBomb",
@@ -3155,6 +3156,7 @@
31553156
"link": [17, 16],
31563157
"name": "G-mode Overload PLMs by Power Bombing Morph Maze Item, Permanent Softlock Risk",
31573158
"requires": [
3159+
"canPowerBombItemOverloadPLMs",
31583160
{"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"},
31593161
"canEnterGMode",
31603162
{"itemNotCollectedAtNode": 10},

‎region/lowernorfair/east/The Jail.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@
107107
},
108108
"requires": [
109109
"h_heatedGMode",
110+
"canPowerBombItemOverloadPLMs",
110111
{"ammo": {"type": "PowerBomb", "count": 18}},
111112
{"heatFrames": 240}
112113
],
@@ -167,6 +168,7 @@
167168
},
168169
"requires": [
169170
"h_heatedGMode",
171+
"canPowerBombItemOverloadPLMs",
170172
{"itemNotCollectedAtNode": 3},
171173
"canRiskPermanentLossOfAccess",
172174
{"ammo": {"type": "PowerBomb", "count": 17}},
@@ -290,6 +292,7 @@
290292
},
291293
"requires": [
292294
"h_heatedGMode",
295+
"canPowerBombItemOverloadPLMs",
293296
{"itemNotCollectedAtNode": 3},
294297
"canRiskPermanentLossOfAccess",
295298
{"ammo": {"type": "PowerBomb", "count": 9}},

‎region/maridia/inner-pink/Aqueduct.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2530,6 +2530,7 @@
25302530
}
25312531
},
25322532
"requires": [
2533+
"canPowerBombItemOverloadPLMs",
25332534
{"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
25342535
"canRiskPermanentLossOfAccess",
25352536
{"or": [
@@ -3457,7 +3458,7 @@
34573458
"link": [13, 7],
34583459
"name": "G-Mode Overload PLMs - Power Bomb the Items (To the Items)",
34593460
"requires": [
3460-
"canEnterGMode",
3461+
"canPowerBombItemOverloadPLMs",
34613462
{"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
34623463
{"or": [
34633464
{"itemNotCollectedAtNode": 7},
@@ -3492,7 +3493,7 @@
34923493
"link": [13, 7],
34933494
"name": "G-Mode Morph Overload PLMs - Power Bomb the Items (To the Items)",
34943495
"requires": [
3495-
"canEnterGMode",
3496+
"canPowerBombItemOverloadPLMs",
34963497
{"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
34973498
{"or": [
34983499
{"itemNotCollectedAtNode": 7},
@@ -3527,7 +3528,7 @@
35273528
"link": [13, 7],
35283529
"name": "G-Mode Overload PLMs - Power Bomb the Items, Bootless UWJ",
35293530
"requires": [
3530-
"canEnterGMode",
3531+
"canPowerBombItemOverloadPLMs",
35313532
{"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
35323533
{"or": [
35333534
{"itemNotCollectedAtNode": 7},
@@ -3552,7 +3553,7 @@
35523553
"link": [13, 7],
35533554
"name": "G-Mode Morph Overload PLMs - Power Bomb the Items, Bootless UWJ",
35543555
"requires": [
3555-
"canEnterGMode",
3556+
"canPowerBombItemOverloadPLMs",
35563557
{"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
35573558
{"or": [
35583559
{"itemNotCollectedAtNode": 7},

0 commit comments

Comments
 (0)