Skip to content

Commit 2cc5222

Browse files
committed
Add enemy kill/damage for the escape pirates, and reset the room after gaining blue suit.
1 parent 9c23837 commit 2cc5222

1 file changed

Lines changed: 11 additions & 3 deletions

File tree

region/crateria/central/Climb.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -931,6 +931,13 @@
931931
"requires": [
932932
"Gravity",
933933
"f_ZebesSetAblaze",
934+
{"or": [
935+
{"enemyDamage": {"enemy": "Custom Climb Pirate", "type": "contact", "hits": 1}},
936+
{"enemyKill": {
937+
"enemies": [ ["Custom Climb Pirate", "Custom Climb Pirate"]],
938+
"explicitWeapons": ["Charge+Plasma", "Super", "PowerBomb"]
939+
}}
940+
]},
934941
"h_CrystalFlash",
935942
{"acidFrames": 320},
936943
{"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
@@ -943,7 +950,8 @@
943950
{"autoReserveTrigger": {"maxReserveEnergy": 50}}
944951
]},
945952
"canRModeSparkInterrupt",
946-
{"acidFrames": 80}
953+
{"acidFrames": 80},
954+
{"resetRoom": {"nodes": [2, 5]}}
947955
],
948956
"clearsObstacles": ["A", "B"],
949957
"unlocksDoors": [
@@ -954,14 +962,14 @@
954962
"blueSuitChecked": true,
955963
"note": [
956964
"With Zebes set ablaze, Climb only spawns two pirates that drop nothing, and the bomb",
957-
"wall is automatically cleared. The rising lava is now acid instead, so Gravity Suit works normally.",
965+
"wall is automatically cleared. The rising lava is now acid instead, so Speed Booster works normally with Gravity Suit.",
958966
"Jump up the platforms to get high enough above the rising acid to",
959967
"safely Crystal Flash, then dive back into the acid against either bottom door. Wait in the acid",
960968
"until your energy is low enough and shinecharge. Windup right before energy runs out to interrupt",
961969
"then *immediately* leave to limit acid damage."
962970
],
963971
"devNote": [
964-
"FIXME: Needs enemyKill requirements for the escape pirates."
972+
"FIXME: Needs to support Hyper Beam kill also."
965973
]
966974
},
967975
{

0 commit comments

Comments
 (0)