summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/mercenary_db.txt36
-rw-r--r--db/pre-re/item_cardalbum.txt2
-rw-r--r--db/pre-re/skill_require_db.txt2
-rw-r--r--db/re/item_cardalbum.txt32
-rw-r--r--db/re/skill_require_db.txt2
-rw-r--r--npc/pre-re/scripts_warps.conf26
6 files changed, 66 insertions, 34 deletions
diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 8bfd89759..22bdd69dd 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -25,23 +25,23 @@
6024,MER_ARCHER08,Hiyori,90,5039,469,10,482,241,24,18,19,65,27,27,103,49,10,0,0,7,20,150,450,432,300
6025,MER_ARCHER09,Kero,95,5572,499,10,500,250,25,20,20,71,27,28,110,51,10,0,0,7,20,150,450,432,300
6026,MER_ARCHER10,Sukye,99,7381,642,10,816,308,49,49,21,83,27,28,123,52,10,0,0,7,20,150,450,432,300
-6027,MER_LANCER01,David,22,2071,100,2,168,84,30,1,27,1,4,1,30,2,10,0,0,7,20,150,700,432,300
-6028,MER_LANCER02,Ellen,34,2523,131,2,208,104,33,1,37,1,4,1,37,4,10,0,0,7,20,150,700,432,300
-6029,MER_LANCER03,Luise,41,3397,161,2,248,124,36,5,45,1,22,1,40,6,10,0,0,7,20,150,700,432,300
-6030,MER_LANCER04,Frank,55,4580,191,2,300,150,39,5,55,2,35,1,50,8,10,0,0,7,20,150,575,432,300
-6031,MER_LANCER05,Ryan,60,5899,221,2,350,160,42,10,65,2,39,1,60,10,10,0,0,7,20,150,575,432,300
+6027,MER_LANCER01,Rodin,22,2071,100,2,168,84,30,1,27,1,4,1,30,2,10,0,0,7,20,150,700,432,300
+6028,MER_LANCER02,Lancer,34,2523,131,2,208,104,33,1,37,1,4,1,37,4,10,0,0,7,20,150,700,432,300
+6029,MER_LANCER03,Nathan,41,3397,161,2,248,124,36,5,45,1,22,1,40,6,10,0,0,7,20,150,700,432,300
+6030,MER_LANCER04,Roan,55,4580,191,2,300,150,39,5,55,2,35,1,50,8,10,0,0,7,20,150,575,432,300
+6031,MER_LANCER05,Orizaro,60,5899,221,2,350,160,42,10,65,2,39,1,60,10,10,0,0,7,20,150,575,432,300
6032,MER_LANCER06,Thyla,72,7874,252,2,370,185,46,10,75,3,15,77,61,12,10,0,0,7,20,150,575,432,300
-6033,MER_LANCER07,Jens,81,10260,330,2,380,190,50,15,85,3,63,20,61,14,10,0,0,7,20,150,450,432,300
-6034,MER_LANCER08,Thierry,90,13167,366,2,400,200,55,20,95,20,74,20,63,16,10,0,0,7,20,150,450,432,300
-6035,MER_LANCER09,Steven,95,14648,398,2,440,220,60,25,100,25,77,25,63,18,10,0,0,7,20,150,450,432,300
-6036,MER_LANCER10,Wayne,99,18000,413,2,700,250,70,30,120,30,90,30,70,30,10,0,0,7,20,150,450,432,300
-6037,MER_SWORDMAN01,Rodin,20,502,70,2,174,87,26,0,21,27,5,1,30,3,10,0,0,7,20,150,700,432,300
-6038,MER_SWORDMAN02,Lancer,30,979,99,2,258,129,31,0,26,38,6,1,35,3,10,0,0,7,20,150,700,432,300
-6039,MER_SWORDMAN03,Nathan,40,1555,134,2,326,163,36,3,31,45,7,6,40,6,10,0,0,7,20,150,700,432,300
-6040,MER_SWORDMAN04,Roan,50,2397,162,2,382,191,39,5,37,59,8,6,40,6,10,0,0,7,20,150,575,432,300
-6041,MER_SWORDMAN05,Orizaro,60,3387,195,2,406,203,42,7,48,68,9,6,45,9,10,0,0,7,20,150,575,432,300
+6033,MER_LANCER07,Ben,81,10260,330,2,380,190,50,15,85,3,63,20,61,14,10,0,0,7,20,150,450,432,300
+6034,MER_LANCER08,Pinaka,90,13167,366,2,400,200,55,20,95,20,74,20,63,16,10,0,0,7,20,150,450,432,300
+6035,MER_LANCER09,Kuhlmann,95,14648,398,2,440,220,60,25,100,25,77,25,63,18,10,0,0,7,20,150,450,432,300
+6036,MER_LANCER10,Roux,99,18000,413,2,700,250,70,30,120,30,90,30,70,30,10,0,0,7,20,150,450,432,300
+6037,MER_SWORDMAN01,David,20,502,70,2,174,87,26,0,21,27,5,1,30,3,10,0,0,7,20,150,700,432,300
+6038,MER_SWORDMAN02,Ellen,30,979,99,2,258,129,31,0,26,38,6,1,35,3,10,0,0,7,20,150,700,432,300
+6039,MER_SWORDMAN03,Luise,40,1555,134,2,326,163,36,3,31,45,7,6,40,6,10,0,0,7,20,150,700,432,300
+6040,MER_SWORDMAN04,Frank,50,2397,162,2,382,191,39,5,37,59,8,6,40,6,10,0,0,7,20,150,575,432,300
+6041,MER_SWORDMAN05,Ryan,60,3387,195,2,406,203,42,7,48,68,9,6,45,9,10,0,0,7,20,150,575,432,300
6042,MER_SWORDMAN06,Paolo,70,4495,241,2,436,218,45,12,53,79,10,12,50,9,10,0,0,7,20,150,575,432,300
-6043,MER_SWORDMAN07,Ben,80,5889,279,2,468,234,47,15,59,88,11,12,55,12,10,0,0,7,20,150,450,432,300
-6044,MER_SWORDMAN08,Pinaka,90,7520,325,2,500,250,49,18,70,95,12,18,60,15,10,0,0,7,20,150,450,432,300
-6045,MER_SWORDMAN09,Kuhlmann,95,9052,348,2,524,262,51,22,80,95,18,18,60,15,10,0,0,7,20,150,450,432,300
-6046,MER_SWORDMAN10,Roux,99,12355,451,2,760,280,64,30,99,105,30,30,60,30,10,0,0,7,20,150,450,432,300
+6043,MER_SWORDMAN07,Jens,80,5889,279,2,468,234,47,15,59,88,11,12,55,12,10,0,0,7,20,150,450,432,300
+6044,MER_SWORDMAN08,Thierry,90,7520,325,2,500,250,49,18,70,95,12,18,60,15,10,0,0,7,20,150,450,432,300
+6045,MER_SWORDMAN09,Steven,95,9052,348,2,524,262,51,22,80,95,18,18,60,15,10,0,0,7,20,150,450,432,300
+6046,MER_SWORDMAN10,Wayne,99,12355,451,2,760,280,64,30,99,105,30,30,60,30,10,0,0,7,20,150,450,432,300
diff --git a/db/pre-re/item_cardalbum.txt b/db/pre-re/item_cardalbum.txt
index d4186a3c7..da1ea48de 100644
--- a/db/pre-re/item_cardalbum.txt
+++ b/db/pre-re/item_cardalbum.txt
@@ -396,4 +396,4 @@
44,4384,1 // Hydro Card
44,4395,3 // Thanatos Maero Card
44,4396,3 // Thanatos Odium Card
-44,4397,3 // Thanatos Despero Card \ No newline at end of file
+44,4397,3 // Thanatos Despero Card
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index aa4c307ce..67114373d 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -356,7 +356,7 @@
460,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_HUNTER
461,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_SOULLINKER
462,0,0,120:110:100:90:80:70:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAIZEL#Kaizel#
-463,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAAHI#Kahai#
+463,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAAHI#Kaahi#
464,0,0,20:30:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAUPE#Kauf#
465,0,0,70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAITE#Kaite#
467,0,0,18:20:22:24:26:28:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_STIN#Estin#
diff --git a/db/re/item_cardalbum.txt b/db/re/item_cardalbum.txt
index 7994c951f..d22e040f9 100644
--- a/db/re/item_cardalbum.txt
+++ b/db/re/item_cardalbum.txt
@@ -412,3 +412,35 @@
3,4531,2 // Red Eruma Card
3,4532,1 // Wild Rider Card
3,4533,2 // Octopus Card
+// Magic Card Album
+44,4047,1 // Ghostring Card
+44,4054,1 // Angeling Card
+44,4163,1 // Gryphon Card
+44,4169,1 // Dark Illusion Card
+44,4174,1 // Deviling Card
+44,4179,10 // Dragon Fly Card
+44,4183,10 // Vagabond Wolf Card
+44,4197,10 // Mastering Card
+44,4198,1 // Maya Purple Card
+44,4203,10 // Mutant Dragonoid Card
+44,4207,1 // Mysteltainn Card
+44,4211,1 // Vocal card
+44,4237,5 // Owl Duke Card
+44,4238,5 // Owl Baron Card
+44,4241,1 // Arc Angeling Card
+44,4250,1 // Executioner Card
+44,4254,1 // Tirfing Card
+44,4266,10 // Eclipse Card
+44,4284,10 // Chepet Card
+44,4285,10 // Choco Card
+44,4290,5 // Cat O' Nine Tails Card
+44,4291,10 // Kobold Leader Card
+44,4300,10 // Chimera Card
+44,4306,10 // Toad Card
+44,4320,1 // Bloody Knight Card
+44,4336,1 // Ungoliant Card
+44,4354,1 // Gemini-S58 Card
+44,4384,1 // Hydro Card
+44,4395,3 // Thanatos Maero Card
+44,4396,3 // Thanatos Odium Card
+44,4397,3 // Thanatos Despero Card
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index b3a8f4054..70e598af2 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -356,7 +356,7 @@
460,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_HUNTER
461,0,0,460:360:260:160:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_SOULLINKER
462,0,0,120:110:100:90:80:70:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAIZEL#Kaizel#
-463,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAAHI#Kahai#
+463,0,0,30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAAHI#Kaahi#
464,0,0,20:30:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAUPE#Kauf#
465,0,0,70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_KAITE#Kaite#
467,0,0,18:20:22:24:26:28:30,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //SL_STIN#Estin#
diff --git a/npc/pre-re/scripts_warps.conf b/npc/pre-re/scripts_warps.conf
index 4ffe5bbb9..0222b2849 100644
--- a/npc/pre-re/scripts_warps.conf
+++ b/npc/pre-re/scripts_warps.conf
@@ -105,19 +105,19 @@ npc: npc/pre-re/warps/pvp/pvp.txt
// --------------------------------------------------------------
// --------------------------- Cities ---------------------------
-npc: npc/re/warps/cities/brasilis.txt
-npc: npc/re/warps/cities/dewata.txt
-npc: npc/re/warps/cities/dicastes.txt
-npc: npc/re/warps/cities/eclage.txt
-npc: npc/re/warps/cities/malangdo.txt
-npc: npc/re/warps/cities/malaya.txt
+//npc: npc/re/warps/cities/brasilis.txt
+//npc: npc/re/warps/cities/dewata.txt
+//npc: npc/re/warps/cities/dicastes.txt
+//npc: npc/re/warps/cities/eclage.txt
+//npc: npc/re/warps/cities/malangdo.txt
+//npc: npc/re/warps/cities/malaya.txt
// -------------------------- Dungeons --------------------------
-npc: npc/re/warps/dungeons/bra_dun.txt
-npc: npc/re/warps/dungeons/dic_dun.txt
-npc: npc/re/warps/dungeons/ecl_dun.txt
+//npc: npc/re/warps/dungeons/bra_dun.txt
+//npc: npc/re/warps/dungeons/dic_dun.txt
+//npc: npc/re/warps/dungeons/ecl_dun.txt
// --------------------------- Fields ---------------------------
-npc: npc/re/warps/fields/bif_fild.txt
-npc: npc/re/warps/fields/bra_fild.txt
-npc: npc/re/warps/fields/dic_fild.txt
-npc: npc/re/warps/fields/man_fild.txt
+//npc: npc/re/warps/fields/bif_fild.txt
+//npc: npc/re/warps/fields/bra_fild.txt
+//npc: npc/re/warps/fields/dic_fild.txt
+//npc: npc/re/warps/fields/man_fild.txt
// --------------------------------------------------------------