diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-12-15 13:19:51 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-12-15 13:19:51 -0200 |
| commit | a2a73f434e152a4172a4191a3148ff19ad39a51f (patch) | |
| tree | ba5b3ebd830b63b1f7bdde0edb31603903b8a3ad | |
| parent | 1b80eff4b69b7fb62e29bff8f3f896c0011f1cfe (diff) | |
| download | serverdata-a2a73f434e152a4172a4191a3148ff19ad39a51f.tar.gz serverdata-a2a73f434e152a4172a4191a3148ff19ad39a51f.tar.bz2 serverdata-a2a73f434e152a4172a4191a3148ff19ad39a51f.tar.xz serverdata-a2a73f434e152a4172a4191a3148ff19ad39a51f.zip | |
[skip ci] testing
| -rw-r--r-- | db/mercenary_db.txt | 6 | ||||
| -rw-r--r-- | npc/test/npc1.txt | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt index 3d3f6b42a..b742f854e 100644 --- a/db/mercenary_db.txt +++ b/db/mercenary_db.txt @@ -2,10 +2,10 @@ // // 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 -// Mercenaries IDs begin at 3000 +// Mercenaries IDs begin at 1191 for hardcoded reasons? -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 +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 //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 +3192,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/test/npc1.txt b/npc/test/npc1.txt index db23a1e63..c92ae0659 100644 --- a/npc/test/npc1.txt +++ b/npc/test/npc1.txt @@ -605,16 +605,16 @@ L_Start: switch (select("create mercenary for 10 seconds", "create mercenary for 1 min", "create mercenary for 10 min", "Andrei Sakar", "back")) { case 1: - mercenary_create Merc, 10000; + mercenary_create 1191, 10000; break; case 2: - mercenary_create Merc, 60000; + mercenary_create 1191, 60000; break; case 3: - mercenary_create Merc, 600000; + mercenary_create 1191, 600000; break; case 4: - mercenary_create Merc_AndreiSakar, 300000; + mercenary_create 1192, 300000; break; case 5: goto L_Start; |