* Dur, I'm bored. Added place-holders for Mercenary skills.

- These skills are NOT usable. They're semi-filled in. Don't even try.

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

2 files changed, 42 insertions, 0 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 9dc7490f4..1ec704b3f 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -44,6 +44,9 @@
 
 =======================
 2008/04/05
+	* Rev. 12515 Dur, I'm bored. Added place-holders for Mercenary skills. [L0ne_W0lf]
+	- These skills are NOT usable. They're semi-filled in. Don't even try.
+2008/04/05
 	* TK_HIGHJUMP/TK_JUMPKICK requirements changed from move_enable to none. [Kevin]
 2008/04/03
 	* Rev. 12470 Implemented 11.3 monster skills update. [L0ne_W0lf]
diff --git a/db/skill_db.txt b/db/skill_db.txt
index b63f14fad..700708e40 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -656,6 +656,45 @@
 8015,0,0,0,0,0x1,0,5,0,no,0,0,0,none,0,          HVAN_INSTRUCT,Instruct
 8016,4,6,4,-1,0xD2,4,3,1,no,0,0,0,misc,0,        HVAN_EXPLOSION,Bio Explosion
 
+// Mercenary Skill Place holders
+//8201,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MS_BASH,Bash
+//8202,0,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MS_MAGNUM,Magnum_Break
+//8203,0,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MS_BOWLINGBASH,Bowling_Bash
+//8204,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	MS_PARRYING,Parry
+//8205,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MS_REFLECTSHIELD,Shield_Reflect
+//8206,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	MS_BERSERK,Frenzy
+//8207,-9,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MA_DOUBLE,Double_Strafe
+//8208,-9,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MA_SHOWER,Arrow_Shower
+//8209,0,0,0,0,0x1,0,5,0,no,0,0,0,misc,0,	MA_SKIDTRAP,Skid_Trap
+//8210,0,0,0,0,0x40,0,5,0,no,0,0,0,misc,0,	MA_LANDMINE,Land_Mine
+//8211,0,0,0,0,0x3,0,5,0,no,0,0,0,misc,0,	MA_SANDMAN,Sandman
+//8212,0,0,0,0,0x42,0,5,0,no,0,0,0,weapon,0,	MA_FREEZINGTRAP,Freezing_Trap
+//8213,0,0,0,0,0x1,0,1,0,no,0,0,0,misc,0,	MA_REMOVETRAP,Remove_Trap
+//8214,0,0,0,0,0x2,0,1,0,no,0,0,0,weapon,0,	MA_CHARGEARROW,Arrow_Repel
+//8215,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
+//8216,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	ML_PIERCE,Pierce
+//8217,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	ML_BRANDISH,Brandish_Spear
+//8218,5,0,0,0,0x20,0,5,0,no,0,0,0,weapon,0,	ML_SPIRALPIERCE,Spiral_Pierce
+//8219,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	ML_DEFENDER,Defending_Aura
+//8220,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	ML_AUTOGUARD,Guard
+//8221,0,0,0,0,0x1,0,10,0,no,0,0,0,none,0,	ML_DEVOTION,Sacrifice
+//8222,0,0,0,0,0x3,0,5,0,no,0,0,0,magic,0,	MER_MAGNIFICAT,Magnificat
+//8223,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	MER_QUICKEN,Two-Hand_Quicken
+//8224,0,0,0,0,0x3,0,1,0,no,0,0,0,magic,0,	MER_SIGHT,Sight
+//8225,0,0,0,0,0x1,0,5,0,no,0,0,0,weapon,0,	MER_CRASH,Crash
+//8226,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_REGAIN,Regain
+//8227,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_TENDER,Tender
+//8228,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_BENEDICTION,Benediction
+//8229,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_RECUPERATE,Recuperate
+//8230,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_MENTALCURE,Mental_Cure
+//8231,0,0,0,0,0,0,1,0,no,0,0,0,magic,0,	MER_COMPRESS,Compress
+//8232,0,0,0,0,0,0,10,0,no,0,0,0,none,0,	MER_PROVOKE,Provoke
+//8233,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	MER_AUTOBERSERK,Berserk
+//8234,0,0,0,0,0x1,0,10,0,no,0,0,0,magic,0,	MER_DECAGI,Decrease_AGI
+//8235,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		MER_SCAPEGOAT,Scapegoat
+//8236,0,0,0,0,0x1,0,10,0,no,0,0,0,magic,0,	MER_LEXDIVINA,Lex_Divina
+//8237,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_ESTIMATION,Sense
+
 10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_APPROVAL,Official Guild Approval
 10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_KAFRACONTRACT,Kafra Contract
 10002,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_GUARDRESEARCH,Guardian Research