Several bugfixes, allow Hurnscald Siege to happen

3 files changed, 39 insertions, 39 deletions

diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 097b229b0..49444b9ed 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -593,35 +593,35 @@ OnInit:
 012-1,0,0,0	script	#HurnscaldSiege	NPC_HIDDEN,{
     end;
 OnBlackScorpionDeath:
-    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpionDeath");
+    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpionDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 90+($@SIEGE_HURNS*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnBlackScorpion2Death:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, BlackScorpion), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 850+($@SIEGE_HURNS*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnGreenSlimeDeath:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, GreenSlime), GreenSlime, 1, "#HurnscaldSiege::OnGreenSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, GreenSlime), GreenSlime, 1, "#HurnscaldSiege::OnGreenSlimeDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 200+($@SIEGE_HURNS*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnCandiedSlimeDeath:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, CandiedSlime), CandiedSlime, 1, "#HurnscaldSiege::OnCandiedSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, CandiedSlime), CandiedSlime, 1, "#HurnscaldSiege::OnCandiedSlimeDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 150+($@SIEGE_HURNS*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
     end;
 
 OnManaGhostDeath:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), ManaGhost, 1, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), ManaGhost, 1, "#HurnscaldSiege::OnManaGhostDeath");
     getmapxy(.@m$,.@x,.@y,3);
     if (rand(10000) <= 900+($@SIEGE_HURNS*100))
         makeitem StrangeCoin, 1, .@m$, .@x, .@y;
@@ -642,21 +642,21 @@ OnColonelDeath:
 
 OnMKSiege:
     addmapmask "012-1", MASK_MATTACK;
-    addmapmask "012-3", MASK_MATTACK;
+    addmapmask "014-3", MASK_MATTACK;
     changemusic "012-1", any("mythica.ogg", "eric_matyas_ghouls.ogg", "misuse.ogg", "Arabesque.ogg");
     disablenpc("Mana Stone");
-    $@SIEGE_TULIM=($@MK_AGGRO/45); // Each 45 aggro raises difficulty in 1
+    $@SIEGE_HURNS=($@MK_AGGRO/45); // Each 45 aggro raises difficulty in 1
     pvpon("012-1");
-    pvpon("012-3");
+    pvpon("014-3");
     announce(("##1WARNING! WARNING! Siege starting at Hurnscald!!"), bc_all);
-    areamonster("012-3", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, BlackScorpion), BlackScorpion, 10, "#HurnscaldSiege::OnBlackScorpionDeath");
+    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X, "014-3")-20, getmapinfo(MAPINFO_SIZE_Y, "014-3")-20, strmobinfo(1, BlackScorpion), BlackScorpion, 10, "#HurnscaldSiege::OnBlackScorpionDeath");
     initnpctimer;
     end;
 
 // Timers
 OnTimer5000:
-    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpionDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X, "014-3")-20, getmapinfo(MAPINFO_SIZE_Y, "014-3")-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpionDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpion2Death");
     mapannounce("012-1", "##2Message to all Hurnscald NPCs: Take shelter!", bc_map);
     disablenpc "Gwendolyn";
     disablenpc "Milly";
@@ -673,8 +673,8 @@ OnTimer5000:
     end;
 
 OnTimer15000:
-    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpionDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("014-3", 20, 20, getmapinfo(MAPINFO_SIZE_X, "014-3")-20, getmapinfo(MAPINFO_SIZE_Y, "014-3")-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpionDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, "Black Scorpion", BlackScorpion, 5+$@SIEGE_HURNS, "#HurnscaldSiege::OnBlackScorpion2Death");
     disablenpc "Shoppa Kep";
     disablenpc "Richard";
 
@@ -690,56 +690,56 @@ OnTimer15000:
     end;
 
 OnTimer60000:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 3, "#HurnscaldSiege::OnBlackScorpion2Death");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, GreenSlime), 1085, 10+$@SIEGE_HURNS, "#HurnscaldSiege::OnGreenSlimeDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, CandiedSlime), 1089, 1+$@SIEGE_HURNS, "#HurnscaldSiege::OnCandiedSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Black Scorpion"), BlackScorpion, 3, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, GreenSlime), 1085, 10+$@SIEGE_HURNS, "#HurnscaldSiege::OnGreenSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, CandiedSlime), 1089, 1+$@SIEGE_HURNS, "#HurnscaldSiege::OnCandiedSlimeDeath");
     end;
 
 OnTimer120000:
     if ($@SIEGE_HURNS >= 5) {
         mapannounce("012-1", "##1The Monster Colonel arrived!", bc_map);
-        areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Monster Colonel"), 1036, 1, "#HurnscaldSiege::OnColonelDeath");
+        areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Monster Colonel"), 1036, 1, "#HurnscaldSiege::OnColonelDeath");
     }
     else if ($@SIEGE_HURNS >= 1) {
         mapannounce("012-1", "##1The Monster Lieutenant arrived!", bc_map);
-        areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Monster Lieutenant"), 1077, 1, "#HurnscaldSiege::OnLieutenantDeath");
+        areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Monster Lieutenant"), 1077, 1, "#HurnscaldSiege::OnLieutenantDeath");
     }
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 15);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, GreenSlime), 1085, 10, "#HurnscaldSiege::OnGreenSlimeDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 15);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, GreenSlime), 1085, 10, "#HurnscaldSiege::OnGreenSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
     end;
 
 OnTimer180000:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 25);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, CandiedSlime), 1089, 10, "#HurnscaldSiege::OnCandiedSlimeDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 25);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, CandiedSlime), 1089, 10, "#HurnscaldSiege::OnCandiedSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
     end;
 
 OnTimer240000:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 25);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 25);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Black Scorpion"), BlackScorpion, 1, "#HurnscaldSiege::OnBlackScorpion2Death");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), 1068, 2, "#HurnscaldSiege::OnManaGhostDeath");
     end;
 
 OnTimer300000:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 5);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, CandiedSlime), 1089, 1, "#HurnscaldSiege::OnCandiedSlimeDeath");
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), 1068, 1, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 5);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, CandiedSlime), 1089, 1, "#HurnscaldSiege::OnCandiedSlimeDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), 1068, 1, "#HurnscaldSiege::OnManaGhostDeath");
     end;
 
 OnTimer360000:
 OnTimer420000:
 OnTimer480000:
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_HURNS);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, ("Red Slime"), 1092, 1+$@SIEGE_HURNS);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_HURNS);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, ("Red Slime"), 1092, 1+$@SIEGE_HURNS);
     end;
 
 OnTimer540000:
     mapannounce("012-1", "##1The Monster Army is getting tired of resistance!", bc_map);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_HURNS);
-    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_X)-20, strmobinfo(1, ManaGhost), 1068, 1, "#HurnscaldSiege::OnManaGhostDeath");
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, SlimeBlast), 1090, 5+$@SIEGE_HURNS);
+    areamonster("012-1", 20, 20, getmapinfo(MAPINFO_SIZE_X)-20, getmapinfo(MAPINFO_SIZE_Y)-20, strmobinfo(1, ManaGhost), 1068, 1, "#HurnscaldSiege::OnManaGhostDeath");
     end;
 
 OnTimer600000:
diff --git a/npc/commands/wgm.txt b/npc/commands/wgm.txt
index e19f86b22..3c3c5376c 100644
--- a/npc/commands/wgm.txt
+++ b/npc/commands/wgm.txt
@@ -28,7 +28,7 @@ OnCallFunc:
         percentheal -100, -100;
         end;
     }
-    .@request$ = strcharinfo(0)+": ";
+    .@request$ = "";
 	.@request$ += implode(.@atcmd_parameters$, " ");
     callfunc .@request$;
     end;
@@ -39,7 +39,7 @@ OnDoEvent:
         percentheal -100, -100;
         end;
     }
-    .@request$ = strcharinfo(0)+": ";
+    .@request$ = "";
 	.@request$ += implode(.@atcmd_parameters$, " ");
     doevent .@request$;
     end;
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 83a422a79..f47562a2c 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -66,7 +66,7 @@ OnTimer90000:
     // Select a random map. Never shows up at Candor and cities, nor indoors. Not all maps either.
     setarray .@m$,  "boss", "boss", "001-1", "001-3", "001-4", "001-5", "001-6", "001-7", "001-10",
                     "003-1", "003-1-3", "004-1", "004-2", "007-1", "010-1", "010-1-1", "010-2", "011-1",
-                    "014-1", "014-2", "014-3", "014-4", "014-5", "015-1", "015-2", "015-3", "015-5",
+                    "012-1", "014-1", "014-2", "014-3", "014-4", "014-5", "015-1", "015-2", "015-3", "015-5",
                     "018-1-1", "018-2", "018-3", "018-4", "018-4-1",
                     "019-1", "019-2", "019-4", "021-1", "022-1", "023-1";
     .mp$=any_of(.@m$);