- Added svn:eol-style native for some conf/css/html/pl/sql/txt files.

- Added svn:executable property for several batch/shell scripts.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13972 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 157 insertions, 157 deletions

diff --git a/db/mercenary_db.txt b/db/mercenary_db.txt
index 572228229..23bd4970d 100644
--- a/db/mercenary_db.txt
+++ b/db/mercenary_db.txt
@@ -1,39 +1,39 @@
-//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

-// Monster Mercenaries

-1191,MIMIC,Mimic,51,6120,100,2,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288

-1506,DISGUISE,Disguise,55,7543,100,2,279,546,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384

-1275,ALICE,Alice,62,10000,100,2,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,2304,480

-1965,M_WILD_ROSE,Wild Rose,38,2980,130,2,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,100,964,864,288

-1966,M_DOPPELGANGER,Doppelganger,72,249000,200,2,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,100,480,480,288

-1967,M_YGNIZEM,Egnigem Cenia,58,11200,320,2,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,145,576,432,288

-// Normal Mercenaries

-6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300

-6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300

-6019,MER_ARCHER03,Nami,40,732,93,10,260,130,15,9,3,21,12,4,52,17,10,0,0,7,20,150,700,432,300

-6020,MER_ARCHER04,Elfin,50,1092,116,10,310,155,18,11,5,33,17,6,60,23,10,0,0,7,20,150,575,432,300

-6021,MER_ARCHER05,Clara,60,2212,280,10,360,180,20,13,5,41,17,12,75,30,10,0,0,7,20,150,575,432,300

-6022,MER_ARCHER06,Dali,70,3098,353,10,424,212,21,15,11,46,24,22,83,37,10,0,0,7,20,150,575,432,300

-6023,MER_ARCHER07,Karaya,80,4051,415,10,468,234,22,16,14,55,27,26,91,44,10,0,0,7,20,150,450,432,300

-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

-6032,MER_LANCER06,Paolo,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

-6042,MER_SWORDMAN06,Thyla,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

+//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
+// Monster Mercenaries
+1191,MIMIC,Mimic,51,6120,100,2,150,900,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288
+1506,DISGUISE,Disguise,55,7543,100,2,279,546,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384
+1275,ALICE,Alice,62,10000,100,2,550,700,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,2304,480
+1965,M_WILD_ROSE,Wild Rose,38,2980,130,2,315,360,0,15,65,85,15,35,65,80,10,12,0,2,24,100,964,864,288
+1966,M_DOPPELGANGER,Doppelganger,72,249000,200,2,1340,1590,60,35,88,90,30,35,125,65,10,12,1,6,67,100,480,480,288
+1967,M_YGNIZEM,Egnigem Cenia,58,11200,320,2,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,145,576,432,288
+// Normal Mercenaries
+6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
+6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300
+6019,MER_ARCHER03,Nami,40,732,93,10,260,130,15,9,3,21,12,4,52,17,10,0,0,7,20,150,700,432,300
+6020,MER_ARCHER04,Elfin,50,1092,116,10,310,155,18,11,5,33,17,6,60,23,10,0,0,7,20,150,575,432,300
+6021,MER_ARCHER05,Clara,60,2212,280,10,360,180,20,13,5,41,17,12,75,30,10,0,0,7,20,150,575,432,300
+6022,MER_ARCHER06,Dali,70,3098,353,10,424,212,21,15,11,46,24,22,83,37,10,0,0,7,20,150,575,432,300
+6023,MER_ARCHER07,Karaya,80,4051,415,10,468,234,22,16,14,55,27,26,91,44,10,0,0,7,20,150,450,432,300
+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
+6032,MER_LANCER06,Paolo,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
+6042,MER_SWORDMAN06,Thyla,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
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index f0134c184..e1b8a20c1 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -1,118 +1,118 @@
-//MercenryID,SkillID,SkillLevel

-// Archer Mercenaries Level 1-10.

-// MER_ARCHER01

-6017,8207,2	//MA_DOUBLE

-6017,8233,1	//MER_AUTOBERSERK

-// MER_ARCHER02

-6018,8208,2	//MA_SHOWER

-6018,8224,1	//MER_SIGHT

-// MER_ARCHER03

-6019,8214,1	//MA_CHARGEARROW

-6019,8223,1	//MER_QUICKEN

-// MER_ARCHER04

-6020,8237,1	//MER_ESTIMATION

-6020,8222,1	//MER_MAGNIFICAT

-6020,8227,1	//MER_TENDER

-// MER_ARCHER05

-6021,8207,5	//MA_DOUBLE

-6021,8232,1	//MER_PROVOKE

-6021,8213,1	//MA_REMOVETRAP

-// MER_ARCHER06

-6022,8207,7	//MA_DOUBLE

-6022,8209,3	//MA_SKIDTRAP

-6022,8234,1	//MER_DECAGI

-// MER_ARCHER07

-6023,8208,10	//MA_SHOWER

-6023,8230,1	//MER_MENTALCURE

-6023,8212,2	//MA_FREEZINGTRAP

-// MER_ARCHER08

-6024,8223,2	//MER_QUICKEN

-6024,8232,3	//MER_PROVOKE

-6024,8211,3	//MA_SANDMAN

-// MER_ARCHER09

-6025,8207,10	//MA_DOUBLE

-6025,8214,1	//MA_CHARGEARROW

-6025,8210,5	//MA_LANDMINE

-// MER_ARCHER10

-6026,8214,1	//MA_CHARGEARROW

-6026,8215,5	//MA_SHARPSHOOTING

-6026,8223,5	//MER_QUICKEN

-6026,8233,1	//MER_AUTOBERSERK

-// Lancer Mercenaries Level 1-10.

-// MER_LANCER01

-6027,8216,1	//ML_PIERCE

-6027,8226,1	//MER_REGAIN

-// MER_LANCER02

-6028,8217,2	//ML_BRANDISH

-6028,8236,1	//MER_LEXDIVINA

-// MER_LANCER03

-6029,8216,2	//ML_PIERCE

-6029,8221,1	//ML_DEVOTION

-6029,8229,1	//MER_RECUPERATE

-// MER_LANCER04

-6030,8219,1	//ML_DEFENDER

-6030,8225,4	//MER_CRASH

-// MER_LANCER05

-6031,8216,5	//ML_PIERCE

-6031,8220,3	//ML_AUTOGUARD

-// MER_LANCER06

-6032,8223,2	//MER_QUICKEN

-6032,8217,5	//ML_BRANDISH

-// MER_LANCER07

-6033,8221,1	//ML_DEVOTION

-6033,8233,1	//MER_AUTOBERSERK

-// MER_LANCER08

-6034,8235,1	//MER_SCAPEGOAT

-6034,8216,10	//ML_PIERCE

-6034,8232,5	//MER_PROVOKE

-// MER_LANCER09

-6035,8217,10	//ML_BRANDISH

-6035,8220,7	//ML_AUTOGUARD

-6035,8219,3	//ML_DEFENDER

-// MER_LANCER10

-6036,8223,5	//MER_QUICKEN

-6036,8220,10	//ML_AUTOGUARD

-6036,8221,3	//ML_DEVOTION

-6036,8218,5	//ML_SPIRALPIERCE

-// Swordman Mercenaries Level 1-10.

-// MER_SWORDMAN01

-6037,8201,1	//MS_BASH

-6037,8234,1	//MER_DECAGI

-// MER_SWORDMAN02

-6038,8232,5	//MER_PROVOKE

-6038,8202,3	//MS_MAGNUM

-// MER_SWORDMAN03

-6039,8223,1	//MER_QUICKEN

-6039,8228,1	//MER_BENEDICTION

-// MER_SWORDMAN04

-6040,8225,1	//MER_CRASH

-6040,8202,5	//MS_MAGNUM

-// MER_SWORDMAN05

-6041,8201,5	//MS_BASH

-6041,8225,4	//MER_CRASH

-6041,8228,1	//MER_BENEDICTION

-// MER_SWORDMAN06

-6042,8223,5	//MER_QUICKEN

-6042,8237,1	//MER_ESTIMATION

-6042,8234,3	//MER_DECAGI

-// MER_SWORDMAN07

-6043,8201,10	//MS_BASH

-6043,8233,1	//MER_AUTOBERSERK

-6043,8235,1	//MER_SCAPEGOAT

-// MER_SWORDMAN08

-6044,8223,10	//MER_QUICKEN

-6044,8203,5	//MS_BOWLINGABASH

-6044,8231,1	//MER_COMPRESS

-6044,8204,4	//MS_PARRYING

-// MER_SWORDMAN09

-6045,8203,8	//MS_BOWLINGABASH

-6045,8225,3	//MER_CRASH

-6045,8205,5	//MS_REFLECTSHIELD

-// MER_SWORDMAN10

-6046,8223,10	//MER_QUICKEN

-6046,8203,10	//MS_BOWLINGABASH

-6046,8201,10	//MS_BASH

-6046,8206,1	//MS_BERSERK

-// Monster Mercenaries

-// Wild Rose

-1965,8201,5	//MS_BASH

+//MercenryID,SkillID,SkillLevel
+// Archer Mercenaries Level 1-10.
+// MER_ARCHER01
+6017,8207,2	//MA_DOUBLE
+6017,8233,1	//MER_AUTOBERSERK
+// MER_ARCHER02
+6018,8208,2	//MA_SHOWER
+6018,8224,1	//MER_SIGHT
+// MER_ARCHER03
+6019,8214,1	//MA_CHARGEARROW
+6019,8223,1	//MER_QUICKEN
+// MER_ARCHER04
+6020,8237,1	//MER_ESTIMATION
+6020,8222,1	//MER_MAGNIFICAT
+6020,8227,1	//MER_TENDER
+// MER_ARCHER05
+6021,8207,5	//MA_DOUBLE
+6021,8232,1	//MER_PROVOKE
+6021,8213,1	//MA_REMOVETRAP
+// MER_ARCHER06
+6022,8207,7	//MA_DOUBLE
+6022,8209,3	//MA_SKIDTRAP
+6022,8234,1	//MER_DECAGI
+// MER_ARCHER07
+6023,8208,10	//MA_SHOWER
+6023,8230,1	//MER_MENTALCURE
+6023,8212,2	//MA_FREEZINGTRAP
+// MER_ARCHER08
+6024,8223,2	//MER_QUICKEN
+6024,8232,3	//MER_PROVOKE
+6024,8211,3	//MA_SANDMAN
+// MER_ARCHER09
+6025,8207,10	//MA_DOUBLE
+6025,8214,1	//MA_CHARGEARROW
+6025,8210,5	//MA_LANDMINE
+// MER_ARCHER10
+6026,8214,1	//MA_CHARGEARROW
+6026,8215,5	//MA_SHARPSHOOTING
+6026,8223,5	//MER_QUICKEN
+6026,8233,1	//MER_AUTOBERSERK
+// Lancer Mercenaries Level 1-10.
+// MER_LANCER01
+6027,8216,1	//ML_PIERCE
+6027,8226,1	//MER_REGAIN
+// MER_LANCER02
+6028,8217,2	//ML_BRANDISH
+6028,8236,1	//MER_LEXDIVINA
+// MER_LANCER03
+6029,8216,2	//ML_PIERCE
+6029,8221,1	//ML_DEVOTION
+6029,8229,1	//MER_RECUPERATE
+// MER_LANCER04
+6030,8219,1	//ML_DEFENDER
+6030,8225,4	//MER_CRASH
+// MER_LANCER05
+6031,8216,5	//ML_PIERCE
+6031,8220,3	//ML_AUTOGUARD
+// MER_LANCER06
+6032,8223,2	//MER_QUICKEN
+6032,8217,5	//ML_BRANDISH
+// MER_LANCER07
+6033,8221,1	//ML_DEVOTION
+6033,8233,1	//MER_AUTOBERSERK
+// MER_LANCER08
+6034,8235,1	//MER_SCAPEGOAT
+6034,8216,10	//ML_PIERCE
+6034,8232,5	//MER_PROVOKE
+// MER_LANCER09
+6035,8217,10	//ML_BRANDISH
+6035,8220,7	//ML_AUTOGUARD
+6035,8219,3	//ML_DEFENDER
+// MER_LANCER10
+6036,8223,5	//MER_QUICKEN
+6036,8220,10	//ML_AUTOGUARD
+6036,8221,3	//ML_DEVOTION
+6036,8218,5	//ML_SPIRALPIERCE
+// Swordman Mercenaries Level 1-10.
+// MER_SWORDMAN01
+6037,8201,1	//MS_BASH
+6037,8234,1	//MER_DECAGI
+// MER_SWORDMAN02
+6038,8232,5	//MER_PROVOKE
+6038,8202,3	//MS_MAGNUM
+// MER_SWORDMAN03
+6039,8223,1	//MER_QUICKEN
+6039,8228,1	//MER_BENEDICTION
+// MER_SWORDMAN04
+6040,8225,1	//MER_CRASH
+6040,8202,5	//MS_MAGNUM
+// MER_SWORDMAN05
+6041,8201,5	//MS_BASH
+6041,8225,4	//MER_CRASH
+6041,8228,1	//MER_BENEDICTION
+// MER_SWORDMAN06
+6042,8223,5	//MER_QUICKEN
+6042,8237,1	//MER_ESTIMATION
+6042,8234,3	//MER_DECAGI
+// MER_SWORDMAN07
+6043,8201,10	//MS_BASH
+6043,8233,1	//MER_AUTOBERSERK
+6043,8235,1	//MER_SCAPEGOAT
+// MER_SWORDMAN08
+6044,8223,10	//MER_QUICKEN
+6044,8203,5	//MS_BOWLINGABASH
+6044,8231,1	//MER_COMPRESS
+6044,8204,4	//MS_PARRYING
+// MER_SWORDMAN09
+6045,8203,8	//MS_BOWLINGABASH
+6045,8225,3	//MER_CRASH
+6045,8205,5	//MS_REFLECTSHIELD
+// MER_SWORDMAN10
+6046,8223,10	//MER_QUICKEN
+6046,8203,10	//MS_BOWLINGABASH
+6046,8201,10	//MS_BASH
+6046,8206,1	//MS_BERSERK
+// Monster Mercenaries
+// Wild Rose
+1965,8201,5	//MS_BASH