Move NPCs to use map mask constants

4 files changed, 22 insertions, 22 deletions

diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 5fb801f10..3246d12fd 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -120,8 +120,8 @@ L_MKControl:
     close;
 
 L_MKSmall:
-    addmapmask "003-1", 2;
-    addmapmask "004-1", 2;
+    addmapmask "003-1", MASK_MATTACK;
+    addmapmask "004-1", MASK_MATTACK;
     changemusic "003-1", "mythica.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=0; // factor zero
@@ -133,8 +133,8 @@ L_MKSmall:
     close;
 
 L_MKMedium:
-    addmapmask "003-1", 2;
-    addmapmask "004-1", 2;
+    addmapmask "003-1", MASK_MATTACK;
+    addmapmask "004-1", MASK_MATTACK;
     changemusic "003-1", "eric_matyas_ghouls.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=1; // factor one
@@ -146,8 +146,8 @@ L_MKMedium:
     close;
 
 L_MKHuge:
-    addmapmask "003-1", 2;
-    addmapmask "004-1", 2;
+    addmapmask "003-1", MASK_MATTACK;
+    addmapmask "004-1", MASK_MATTACK;
     changemusic "003-1", "misuse.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_TULIM=5; // factor five
@@ -302,8 +302,8 @@ OnTimer600000:
     end;
 
 OnTimer630000:
-    removemapmask "003-1", 2;
-    removemapmask "004-1", 2;
+    removemapmask "003-1", MASK_MATTACK;
+    removemapmask "004-1", MASK_MATTACK;
     changemusic "003-1", "bartk_adventure.ogg"; // Restore to default
     enablenpc("Mana Stone");
     $@SIEGE_TULIM$=0;
diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt
index 5697de032..100d533ef 100644
--- a/npc/005-1/ayasha.txt
+++ b/npc/005-1/ayasha.txt
@@ -131,7 +131,7 @@ L_MKControl:
     close;
 
 L_MKSmall:
-    addmapmask "005-1", 2;
+    addmapmask "005-1", MASK_MATTACK;
     changemusic "005-1", "mythica.ogg";
     disablenpc("Mana Stone");
     pvpon("005-1");
@@ -223,7 +223,7 @@ OnTimer600000:
     end;
 
 OnTimer630000:
-    removemapmask "005-1", 2;
+    removemapmask "005-1", MASK_MATTACK;
     changemusic "005-1", "bartk_adventure.ogg";
     enablenpc("Mana Stone");
     killmonsterall("005-1", 0);
diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt
index 9598d4d58..52092d2d7 100644
--- a/npc/009-1/guards.txt
+++ b/npc/009-1/guards.txt
@@ -30,7 +30,7 @@ L_MKControl:
     close;
 
 L_MKSmall:
-    addmapmask "009-1", 2;
+    addmapmask "009-1", MASK_MATTACK;
     changemusic "009-1", "mythica.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=0; // factor zero
@@ -42,7 +42,7 @@ L_MKSmall:
     close;
 
 L_MKMedium:
-    addmapmask "009-1", 2;
+    addmapmask "009-1", MASK_MATTACK;
     changemusic "009-1", "eric matyas - ghoulish fun.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=1; // factor one
@@ -54,7 +54,7 @@ L_MKMedium:
     close;
 
 L_MKHuge:
-    addmapmask "009-1", 2;
+    addmapmask "009-1", MASK_MATTACK;
     changemusic "009-1", "misuse.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HALI=5; // factor five
@@ -178,7 +178,7 @@ OnTimer600000:
     end;
 
 OnTimer630000:
-    removemapmask "009-1", 2;
+    removemapmask "009-1", MASK_MATTACK;
     changemusic "009-1", "dragon_and_toast.ogg"; // Restore to default
     enablenpc("Mana Stone");
     $@SIEGE_HALI$=0;
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 556e82150..97e3f531e 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -32,8 +32,8 @@ L_Admus:
     enablenpc "Hurnsguard";
 	donpcevent "Hurnsguard::OnSet";
 	donpcevent "Lieutenant Paul::OnSet";
-    addmapmask "012-1", 2;
-    addmapmask "012-1", 8;
+    addmapmask "012-1", MASK_MATTACK;
+    addmapmask "012-1", MASK_EVILSANCTUM;
     pvpon("012-1");
     disablenpc "#012-1_22_62";
     disablenpc "#012-1_79_17";
@@ -73,7 +73,7 @@ L_MKControl:
     close;
 
 L_MKSmall:
-    addmapmask "012-1", 2;
+    addmapmask "012-1", MASK_MATTACK;
     changemusic "012-1", "mythica.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HURNS=0; // factor zero
@@ -85,7 +85,7 @@ L_MKSmall:
     close;
 
 L_MKMedium:
-    addmapmask "012-1", 2;
+    addmapmask "012-1", MASK_MATTACK;
     changemusic "012-1", "eric_matyas_ghouls.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HURNS=1; // factor one
@@ -97,7 +97,7 @@ L_MKMedium:
     close;
 
 L_MKHuge:
-    addmapmask "012-1", 2;
+    addmapmask "012-1", MASK_MATTACK;
     changemusic "012-1", "misuse.ogg";
     disablenpc("Mana Stone");
     $@SIEGE_HURNS=5; // factor five
@@ -221,7 +221,7 @@ OnTimer600000:
     end;
 
 OnTimer630000:
-    removemapmask "012-1", 2;
+    removemapmask "012-1", MASK_MATTACK;
     changemusic "012-1", "dragon_and_toast.ogg"; // Restore to default
     enablenpc("Mana Stone");
     $@SIEGE_HURNS$=0;
@@ -455,8 +455,8 @@ OnVictory:
     removemapflag("012-1", mf_nosave);
     disablenpc "Hurnsguard";
     pvpoff("012-1");
-    removemapmask "012-1", 2;
-    removemapmask "012-1", 8;
+    removemapmask "012-1", MASK_MATTACK;
+    removemapmask "012-1", MASK_EVILSANCTUM;
     //removemapflag("012-1", mf_nocommand);
     removemapflag("012-1", mf_battleground);
     enablenpc "#012-1_22_62";