diff options
-rw-r--r-- | db/mercenary_db.txt | 1 | ||||
-rw-r--r-- | npc/test/npc1.txt | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt index 7fd624922..f7ff96f67 100644 --- a/db/mercenary_db.txt +++ b/db/mercenary_db.txt @@ -8,4 +8,5 @@ //ID,Sprite_Name ,Name ,LV,HP,SP,RG,ATK1,ATK2,DEF,MDF,STR,AGI,VIT,INT,DEX,LUK,Rg2,Rg3,Scale,Rc,Ele,Spd,aDelay,aMotion,dMotion 1192,Merc_AndreiSakar,Andrei Sakar,100,688,133,1,413,413,36,26,4,67,10,26,100,70,10,12,1,11,45,150,114,114,200 +1205,Merc_Testing,Testing Mercenar,100,688,133,1,413,413,36,26,4,67,10,26,100,70,10,12,1,11,45,150,114,114,200 diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt index c92ae0659..ebeceb090 100644 --- a/npc/test/npc1.txt +++ b/npc/test/npc1.txt @@ -602,7 +602,7 @@ L_Start: case 13: while(1) { - switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "Andrei Sakar", "back")) + switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "Andrei Sakar", "1205 for test", "back")) { case 1: mercenary_create 1191, 10000; @@ -617,6 +617,9 @@ L_Start: mercenary_create 1192, 300000; break; case 5: + mercenary_create 1205, 300000; + break; + case 5: goto L_Start; break; } |