summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2018-12-15 13:09:38 -0200
committerJesusaves <cpntb1@ymail.com>2018-12-15 13:09:38 -0200
commit1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe (patch)
treeb06ba45cb2f32c625d60b4cab4fe3cf57304e581
parent1fc15127923dd14005a2b7013555155dfcca90f6 (diff)
downloadserverdata-1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe.tar.gz
serverdata-1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe.tar.bz2
serverdata-1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe.tar.xz
serverdata-1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe.zip
Update test npc. Minor polishing
-rw-r--r--db/mercenary_db.txt6
-rw-r--r--npc/019-4-1/golbarez.txt2
-rw-r--r--npc/test/npc1.txt11
3 files changed, 11 insertions, 8 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index a6150d5f0..3d3f6b42a 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -5,7 +5,7 @@
// Mercenaries IDs begin at 3000
3000,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
-//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
-//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
-3001,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
+
+//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
+3001,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
diff --git a/npc/019-4-1/golbarez.txt b/npc/019-4-1/golbarez.txt
index 326c1e550..91265be06 100644
--- a/npc/019-4-1/golbarez.txt
+++ b/npc/019-4-1/golbarez.txt
@@ -22,7 +22,7 @@ L_OutOfSeason:
L_Main:
if (getq(SQuest_Christmas) != gettime(GETTIME_YEAR)) {
mesn;
- mesq l("Please talk with this workshop Chief before talking to me.");
+ mesq l("Please talk with this workshop's Chief before talking to me.");
close;
}
.@q=getq3(SQuest_Christmas);
diff --git a/npc/test/npc1.txt b/npc/test/npc1.txt
index 2969a09c4..db23a1e63 100644
--- a/npc/test/npc1.txt
+++ b/npc/test/npc1.txt
@@ -602,18 +602,21 @@ L_Start:
case 13:
while(1)
{
- switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "back"))
+ switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "Andrei Sakar", "back"))
{
case 1:
- mercenary_create 1191, 10000;
+ mercenary_create Merc, 10000;
break;
case 2:
- mercenary_create 1191, 60000;
+ mercenary_create Merc, 60000;
break;
case 3:
- mercenary_create 1191, 600000;
+ mercenary_create Merc, 600000;
break;
case 4:
+ mercenary_create Merc_AndreiSakar, 300000;
+ break;
+ case 5:
goto L_Start;
break;
}