summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/005-4/bossfight.txt19
1 files changed, 14 insertions, 5 deletions
diff --git a/world/map/npc/005-4/bossfight.txt b/world/map/npc/005-4/bossfight.txt
index 2f0d97d5..506cdeae 100644
--- a/world/map/npc/005-4/bossfight.txt
+++ b/world/map/npc/005-4/bossfight.txt
@@ -30,9 +30,18 @@ L_Start_Level_1:
goto L_Exit; // This one is triggered on talking to the switch.
L_Enjoy:
- mes "*As you get ready to touch the switch, a spark flys from you to it and causes the switch to flip off then back on quickly*";
- // Random colors for everyone!
- areatimer "005-4.gat", 19, 19, 54, 37, 10, "Switch#elecave::onChaos";
+ mes "*As you get ready to touch the switch, a spark of the opposite color flys to you. But oddly it doesn't hurt at all.*";
+
+ if (@ELE_CAVE_COLOR == 1) goto L_Set_Blue;
+ if (@ELE_CAVE_COLOR == 2) goto L_Set_Red;
+
+L_Set_Red:
+ set @ELE_CAVE_COLOR, 1;
+ goto L_Exit;
+L_Set_Blue:
+ set @ELE_CAVE_COLOR, 2;
+ goto L_Exit;
+
L_Exit:
close;
@@ -168,14 +177,14 @@ L_Heal:
onBlueDeath:
// Blue players have to kill blue sparks
if (@ELE_CAVE_COLOR == 2) end;
- message strcharinfo(0), "The dieing spark reacts explosively with you. You should only kill sparks with the same color as you.";
+ message strcharinfo(0), "The dying spark reacts explosively with you. You should only kill sparks with the same color as you.";
heal MaxHp / -2, 0;
end;
onRedDeath:
// Red players have to kill red sparks
if (@ELE_CAVE_COLOR == 1) end;
- message strcharinfo(0), "The dieing spark reacts explosively with you. You should only kill sparks with teh same color as you.";
+ message strcharinfo(0), "The dying spark reacts explosively with you. You should only kill sparks with the same color as you.";
heal MaxHp / -2, 0;
end;