Add testing mercenary and add it mercenary creation to testing npc.

2 files changed, 22 insertions, 1 deletions

diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 88d543e3..460e3ccc 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -3,3 +3,4 @@
 // Structure of Database:
 // ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion
 
+1191,Merc,Merc,51,6120,187,2,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index 45d3b50c..959154da 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -27,7 +27,7 @@ test,10,10,0	script	npc1	NPC_TEST1,3,3,{
     }
 
 L_Start:
-    switch (select("show area", "map", "pc", "change npc direction", "quest test", "cart", "items", "chat", "wall", "craft", "hashtable", "instance"))
+    switch (select("show area", "map", "pc", "change npc direction", "quest test", "cart", "items", "chat", "wall", "craft", "hashtable", "instance", "mercenary"))
     {
         case 1:
             areatest;
@@ -526,6 +526,26 @@ L_Start:
                 }
             }
             break;
+        case 13:
+            while(1)
+            {
+                switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "back"))
+                {
+                    case 1:
+                        mercenary_create 1191, 10000;
+                        break;
+                    case 2:
+                        mercenary_create 1191, 60000;
+                        break;
+                    case 3:
+                        mercenary_create 1191, 600000;
+                        break;
+                    case 4:
+                        goto L_Start;
+                        break;
+                }
+            }
+            break;
     }
 
     close;