Merge branch 'tonoriguards' into 'master'

change guards to tonori guards

See merge request ml/serverdata!75

2 files changed, 20 insertions, 18 deletions

diff --git a/db/constants.conf b/db/constants.conf
index 5b246aaa8..185f72428 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1964,6 +1964,8 @@ constants_db: {
 	NPC_LEGACY_CHEST:       416
 	NPC_BEEKEEPER:          461
 	NPC_EURNI:              462
+	NPC_TONORI_GUARD_MALE:  463
+	NPC_TONORI_GUARD_FEMALE: 464
 
 	NPC_MONSTERKING:        500
 	NPC_AIRSHIP:            501
diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt
index 3f8278c5b..76db334fc 100644
--- a/npc/003-1/lieutenantdausen.txt
+++ b/npc/003-1/lieutenantdausen.txt
@@ -608,7 +608,7 @@ function	script	GuardHandler	{
     return;
 }
 
-003-1,98,100,0	script	Guard Philip	NPC_GUARD1,{
+003-1,98,100,0	script	Guard Philip	NPC_TONORI_GUARD_MALE,{
     GuardHandler(0);
 
     end;
@@ -645,7 +645,7 @@ OnInit:
 
     setarray $@GuardBits, 1, (1 << 1), (1 << 2), (1 << 3), (1 << 4), (1 << 5), (1 << 6), (1 << 7), (1 << 8), (1 << 9), (1 << 10), (1 << 11), (1 << 12), (1 << 13), (1 << 14), (1 << 15), (1 << 16), (1 << 17);
 }
-003-1,98,121,0	script	Guard Defou	NPC_GUARD1,{
+003-1,98,121,0	script	Guard Defou	NPC_TONORI_GUARD_MALE,{
     GuardHandler(1);
     end;
 OnInit:
@@ -653,7 +653,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,102,121,0	script	Guard Avou	NPC_GUARD1,{
+003-1,102,121,0	script	Guard Avou	NPC_TONORI_GUARD_MALE,{
     GuardHandler(2);
     end;
 OnInit:
@@ -661,7 +661,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,58,158,0	script	Guard Benji	NPC_GUARD1,{
+003-1,58,158,0	script	Guard Benji	NPC_TONORI_GUARD_MALE,{
     GuardHandler(3);
     end;
 OnInit:
@@ -669,7 +669,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,62,158,0	script	Guard Valou	NPC_GUARD1,{
+003-1,62,158,0	script	Guard Valou	NPC_TONORI_GUARD_MALE,{
     GuardHandler(4);
     end;
 OnInit:
@@ -677,7 +677,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,71,138,0	script	Guard Nutelo	NPC_GUARD1,{
+003-1,71,138,0	script	Guard Nutelo	NPC_TONORI_GUARD_MALE,{
     GuardHandler(5);
     end;
 OnInit:
@@ -685,7 +685,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,58,128,0	script	Guard Moustacha	NPC_GUARD1,{
+003-1,58,128,0	script	Guard Moustacha	NPC_TONORI_GUARD_MALE,{
     GuardHandler(6);
     end;
 OnInit:
@@ -693,7 +693,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,58,100,0	script	Guard Popaul	NPC_GUARD1,{
+003-1,58,100,0	script	Guard Popaul	NPC_TONORI_GUARD_MALE,{
     GuardHandler(7);
     end;
 
@@ -722,7 +722,7 @@ OnInit:
     .distance = 5;
     .sex = G_MALE;
 }
-003-1,51,73,0	script	Guard Yen	NPC_GUARD1,{
+003-1,51,73,0	script	Guard Yen	NPC_TONORI_GUARD_MALE,{
     GuardHandler(8);
     end;
 OnInit:
@@ -730,7 +730,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-2,41,37,0	script	Guard Yuna	NPC_GUARD2,{
+003-2,41,37,0	script	Guard Yuna	NPC_TONORI_GUARD_FEMALE,{
     if (getq(TulimsharQuest_WaterForGuard) == 1)
     {
         CheckGuard(9);
@@ -743,7 +743,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,54,52,0	script	Guard Maxim	NPC_GUARD1,{
+003-1,54,52,0	script	Guard Maxim	NPC_TONORI_GUARD_MALE,{
     GuardHandler(10);
     end;
 
@@ -778,7 +778,7 @@ OnInit:
     .sex = G_MALE;
 
 }
-003-1,50,36,0	script	Guard Totor	NPC_GUARD1,{
+003-1,50,36,0	script	Guard Totor	NPC_TONORI_GUARD_MALE,{
     GuardHandler(11);
     end;
 
@@ -803,7 +803,7 @@ OnInit:
     .distance = 5;
     .sex = G_MALE;
 }
-003-1,53,36,0	script	Guard Roukin	NPC_GUARD1,{
+003-1,53,36,0	script	Guard Roukin	NPC_TONORI_GUARD_MALE,{
     GuardHandler(12);
     end;
 
@@ -843,7 +843,7 @@ OnInit:
     .distance = 5;
     .sex = G_MALE;
 }
-003-1,35,34,0	script	Guard Falko	NPC_GUARD1,{
+003-1,35,34,0	script	Guard Falko	NPC_TONORI_GUARD_MALE,{
     GuardHandler(13);
     end;
 
@@ -862,7 +862,7 @@ OnInit:
     .distance = 5;
     .sex = G_MALE;
 }
-003-3,39,37,0	script	Guard Malindax	NPC_GUARD1,{
+003-3,39,37,0	script	Guard Malindax	NPC_TONORI_GUARD_MALE,{
     GuardHandler(14);
     end;
 OnInit:
@@ -870,7 +870,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,111,101,0	script	Guard Froma	NPC_GUARD1,{
+003-1,111,101,0	script	Guard Froma	NPC_TONORI_GUARD_MALE,{
     GuardHandler(15);
     end;
 OnInit:
@@ -878,7 +878,7 @@ OnInit:
     .distance = 3;
     end;
 }
-003-1,102,80,0	script	Guard Tetric	NPC_GUARD1,{
+003-1,102,80,0	script	Guard Tetric	NPC_TONORI_GUARD_MALE,{
     GuardHandler(16);
     end;
 
@@ -930,7 +930,7 @@ OnInit:
     .distance = 5;
     .sex = G_MALE;
 }
-003-1,107,80,0	script	Guard Biscop	NPC_GUARD1,{
+003-1,107,80,0	script	Guard Biscop	NPC_TONORI_GUARD_MALE,{
     if (getq(TulimsharQuest_WaterForGuard) == 1)
     {
         CheckGuard(17);