Boss Powerups/Event spells:

1) Removed a lot of debug messages that shouldnt be visible in normal gameplay.
2) On Tormenta impersonation end timer would also cancel HP bonus.

9 files changed, 4 insertions, 56 deletions

diff --git a/world/map/npc/magic/event-boss-powerup-disarm.txt b/world/map/npc/magic/event-boss-powerup-disarm.txt
index b1fb1a42..03ce3a02 100644
--- a/world/map/npc/magic/event-boss-powerup-disarm.txt
+++ b/world/map/npc/magic/event-boss-powerup-disarm.txt
@@ -3,20 +3,14 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-disarm] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-disarm] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-disarm] : after mapflags check";
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_MEDIUM_EXPLOSION, strcharinfo(0);
     set @dist, 12;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-disarm] : after foreach";
-    message strcharinfo(0), "[boss-disarm] : <- OnCast";
     end;
 
 OnHit:
@@ -34,7 +28,7 @@ OnUnequip:
     end;
 
 L_Fail_town:
-    message strcharinfo(0), "[boss-disarm] : can't mass-poison in towns!";
+    message strcharinfo(0), "[boss-disarm] : can't use boss tricks in towns!";
     end;
 
 OnInit:
diff --git a/world/map/npc/magic/event-boss-powerup-grenades.txt b/world/map/npc/magic/event-boss-powerup-grenades.txt
index 9cd3acc6..b07bb87e 100644
--- a/world/map/npc/magic/event-boss-powerup-grenades.txt
+++ b/world/map/npc/magic/event-boss-powerup-grenades.txt
@@ -3,20 +3,14 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-grenades] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-grenades] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-grenades] : after mapflags check";
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_MEDIUM_EXPLOSION, strcharinfo(0);
     set @dist, 5;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-grenades] : after foreach";
-    message strcharinfo(0), "[boss-grenades] : <- OnCast";
     end;
 
 OnHit:
diff --git a/world/map/npc/magic/event-boss-powerup-headshot.txt b/world/map/npc/magic/event-boss-powerup-headshot.txt
index 5c05d477..1e4152d8 100644
--- a/world/map/npc/magic/event-boss-powerup-headshot.txt
+++ b/world/map/npc/magic/event-boss-powerup-headshot.txt
@@ -3,12 +3,8 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-headshot] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-headshot] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-headshot] : after mapflags check";
-//  TBD who can use this.
     set @target_id, getcharid(3, @args$);
     if (@target_id < 1 || !(isloggedin(@target_id)) || get(INVISIBLE, @target_id) == 1) goto L_Fail_target;
     if (distance(BL_ID, @target_id) > 9) goto L_Too_far;
diff --git a/world/map/npc/magic/event-boss-powerup-lifedrain.txt b/world/map/npc/magic/event-boss-powerup-lifedrain.txt
index ce4c9e33..dff74def 100644
--- a/world/map/npc/magic/event-boss-powerup-lifedrain.txt
+++ b/world/map/npc/magic/event-boss-powerup-lifedrain.txt
@@ -3,22 +3,14 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-lifedrain] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-lifedrain] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-lifedrain] : after mapflags check";
-    message strcharinfo(0), "[boss-lifedrain] : HP="+get(Hp, BL_ID);
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_PENTAGRAM_BURST, strcharinfo(0);
     set @dist, 12;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-lifedrain] : after foreach";
-    message strcharinfo(0), "[boss-lifedrain] : HP="+get(Hp, BL_ID);
-    message strcharinfo(0), "[boss-lifedrain] : <- OnCast";
     end;
 
 OnHit:
diff --git a/world/map/npc/magic/event-boss-powerup-manadrain.txt b/world/map/npc/magic/event-boss-powerup-manadrain.txt
index 69dae18a..d8ee8436 100644
--- a/world/map/npc/magic/event-boss-powerup-manadrain.txt
+++ b/world/map/npc/magic/event-boss-powerup-manadrain.txt
@@ -3,22 +3,14 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-manadrain] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-manadrain] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-manadrain] : after mapflags check";
-    message strcharinfo(0), "[boss-manadrain] : HP="+get(Hp, BL_ID);
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_BLUE_MAGIC_CAST, strcharinfo(0);
     set @dist, 16;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-manadrain] : after foreach";
-    message strcharinfo(0), "[boss-manadrain] : HP="+get(Hp, BL_ID);
-    message strcharinfo(0), "[boss-manadrain] : <- OnCast";
     end;
 
 OnHit:
diff --git a/world/map/npc/magic/event-boss-powerup-poison.txt b/world/map/npc/magic/event-boss-powerup-poison.txt
index c5f343ab..777930c1 100644
--- a/world/map/npc/magic/event-boss-powerup-poison.txt
+++ b/world/map/npc/magic/event-boss-powerup-poison.txt
@@ -3,20 +3,14 @@
     end;
 
 OnCast:
-    message strcharinfo(0), "[boss-masspoison] : -> OnCast";
     if (call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-masspoison] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-masspoison] : after mapflags check";
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_MAGIC_SNAKE_CAST, strcharinfo(0);
     set @dist, 12;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-masspoison] : after foreach";
-    message strcharinfo(0), "[boss-masspoison] : <- OnCast";
     end;
 
 OnHit:
diff --git a/world/map/npc/magic/event-boss-powerup-tormenta.txt b/world/map/npc/magic/event-boss-powerup-tormenta.txt
index 1ecf4bf0..52e6f42f 100644
--- a/world/map/npc/magic/event-boss-powerup-tormenta.txt
+++ b/world/map/npc/magic/event-boss-powerup-tormenta.txt
@@ -3,22 +3,18 @@
     end;
 
 OnCast:
-    //  TBD who can use this.
-    message strcharinfo(0), "[boss-tormenta] : -> OnCast";
     if(call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-tormenta] : after boss powerup check";
     bonus bMaxHP, 20000;
     set Hp, (Hp+20000), BL_ID;
     set Class, 1137, BL_ID;
     warp getmap(), POS_X, POS_Y;                // Refresh witch appearance
     addtimer 1500, strnpcinfo(0)+"::OnFix";
     message strcharinfo(0), "[boss-tormenta] : Tormenta impersonation started!";
-    message strcharinfo(0), "[boss-tormenta] : <- OnCast";
     end;
 
 OnFix:
     set @fix_count, @fix_count + 1;
-    if (@fix_count > 1000) goto L_done;           // Timed out.
+    if (@fix_count > 1000) goto L_done;         // Timed out.
     if (get(Class, BL_ID) != 1137) goto L_done; // Caster attempted charclass?
     set Class, 1142, BL_ID;
     set Class, 1137, BL_ID;
@@ -28,6 +24,8 @@ L_done:
     message strcharinfo(0, BL_ID), "[boss-tormenta] : Tormenta impersonation ended!";
     set @fix_count, 0;
     set Class, 0, BL_ID;
+    bonus bMaxHP, 0;
+    set Hp, 100, BL_ID;
     end;
 
 OnInit:
diff --git a/world/map/npc/magic/event-boss-powerup-totheabyss.txt b/world/map/npc/magic/event-boss-powerup-totheabyss.txt
index d356dbea..c1ab574a 100644
--- a/world/map/npc/magic/event-boss-powerup-totheabyss.txt
+++ b/world/map/npc/magic/event-boss-powerup-totheabyss.txt
@@ -6,20 +6,14 @@
 // Hurts everyone near boss, throws FX and teleports 'em to abyss!
 
 OnCast:
-    message strcharinfo(0), "[boss-totheabyss] : -> OnCast";
     if (call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-to-the-abyss] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-to-the-abyss] : after mapflags check";
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_BLUE_MAGIC_CAST, strcharinfo(0);
     set @dist, 25;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-to-the-abyss] : after foreach";
-    message strcharinfo(0), "[boss-to-the-abyss] : <- OnCast";
     end;
 
 OnHit:
diff --git a/world/map/npc/magic/event-boss-powerup-tothecrypt.txt b/world/map/npc/magic/event-boss-powerup-tothecrypt.txt
index 3da6a2b9..af35a3f0 100644
--- a/world/map/npc/magic/event-boss-powerup-tothecrypt.txt
+++ b/world/map/npc/magic/event-boss-powerup-tothecrypt.txt
@@ -6,20 +6,14 @@
 // Hurts everyone near boss, throws FX and teleports 'em to crypt!
 
 OnCast:
-    message strcharinfo(0), "[boss-tothecrypt] : -> OnCast";
     if (call("boss_powerup_checks")) end;
-    message strcharinfo(0), "[boss-to-the-crypt] : after boss powerup check";
     if (getmapflag(getmap(), MF_TOWN)) goto L_Fail_town;
-    message strcharinfo(0), "[boss-to-the-crypt] : after mapflags check";
-//  TBD who can use this.
     set @_M_BLOCK, 1; // block casting, until the timer clears it
     addtimer 10000, "Magic Timer::OnClear"; // set the new debuff
     sc_start SC_COOLDOWN, 10000, 0, BL_ID;
     misceffect FX_BLUE_MAGIC_CAST, strcharinfo(0);
     set @dist, 25;
     foreach 0, getmap(), (POS_X - @dist), (POS_Y - @dist), (POS_X + @dist), (POS_Y + @dist), strnpcinfo(0) + "::OnHit";
-    message strcharinfo(0), "[boss-to-the-crypt] : after foreach";
-    message strcharinfo(0), "[boss-to-the-crypt] : <- OnCast";
     end;
 
 OnHit: