summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-29 12:45:18 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-07-29 12:45:18 +0000
commit369157fd2e7e885eab19f5ab34fbee02d836e13e (patch)
tree8edd6403d15836c3e3c6e9bf2e42174c74f2c76f /db
parentec12f70e64fdd12235f74d9708332be0ff8c2683 (diff)
downloadhercules-369157fd2e7e885eab19f5ab34fbee02d836e13e.tar.gz
hercules-369157fd2e7e885eab19f5ab34fbee02d836e13e.tar.bz2
hercules-369157fd2e7e885eab19f5ab34fbee02d836e13e.tar.xz
hercules-369157fd2e7e885eab19f5ab34fbee02d836e13e.zip
- Fixed some 13.1 items.
- Added "Doddler based" 13.1 monsters. - Cleanup on packet_db.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13980 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/item_db.txt52
-rw-r--r--db/item_trade.txt41
-rw-r--r--db/mob_db.txt30
-rw-r--r--db/mob_skill_db.txt130
-rw-r--r--db/packet_db.txt26
-rw-r--r--db/skill_db.txt1
6 files changed, 225 insertions, 55 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index d19ea954a..a3e46b8b1 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -737,7 +737,7 @@
1480,Gae_Bolg_,Gae Bolg,4,20,,2000,160,,3,2,0x00004082,7,2,34,4,60,1,5,{ bonus bIgnoreDefRace,RC_Dragon; bonus2 bAddRace,RC_Boss,10; },{},{}
1481,Zephyrus_,Zephyrus,4,20,,2000,170,,3,3,0x00004082,7,2,34,4,48,1,5,{ bonus bAtkEle,Ele_Wind; bonus2 bAddEff,Eff_Silence,200; bonus3 bAutoSpell,"MG_THUNDERSTORM",3,100; },{},{}
1482,Assaulter's_Lance,Assaulter Lance,4,,,0,160,,3,0,0x00004082,7,2,34,3,80,1,5,{ bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,25; bonus bIgnoreDefRace,RC_DemiHuman; bonus bUnbreakableWeapon,0; },{},{}
-1483,Ivory_Lance,Ivory Lance,4,,,1000,160,,3,0,0x00004082,7,2,34,3,50,1,5,{ bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,100; bonus3 bAutoSpell,"LK_JOINTBEAT",1,100; skill 58,5; },{},{}
+1483,Ivory_Lance,Ivory Lance,4,20,,1000,160,,3,1,0x00004082,2,2,34,3,50,1,5,{ bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,100; bonus3 bAutoSpell,"LK_JOINTBEAT",1,100; skill "KN_SPEARSTAB",5; },{},{}
1484,Cardo,Cardo,4,20,,5600,150,,1,1,0x00000080,2,2,34,4,70,1,5,{ bonus bAspdRate,-10; bonus bDef,getrefine(); },{},{}
1485,Battle_Fork,Battle Fork,4,20,,700,112,,1,4,0x00004082,2,2,34,2,50,1,5,{},{},{}
1486,Krieger_Twohand_Spear1,Glorious Lance,4,0,,0,220,,3,0,0x00004082,7,2,34,4,80,1,5,{ bonus2 bAddRace,RC_DemiHuman,70; bonus2 bIgnoreDefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) { bonus bAspd,5; if(BaseJob == Job_Knight) bonus4 bAutoSpellOnSkill,"KN_PIERCE","NPC_CRITICALWOUND",2,100; else if(BaseJob == Job_Crusader) bonus3 bAutoSpell,"PA_PRESSURE",1,50; } },{},{}
@@ -785,7 +785,7 @@
1541,Nemesis,Nemesis,4,20,,900,120,,1,0,0x00008110,7,2,2,4,60,1,8,{ bonus bAtkEle,Ele_Holy; bonus2 bAddRace,RC_Undead,10; bonus2 bAddRace,RC_Demon,10; bonus3 bAutoSpell,"AL_CRUCIS",1+getrefine(),100; autobonus "{ bonus bBaseAtk,50; }",10,20000; },{},{}
1542,Valorous_Battlefield_Morning_Star,Valorous Battlefield Morning Star,4,0,,0,105,,1,0,0x0004C5B3,7,2,2,3,80,1,8,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
1543,Brave_Battlefield_Morning_Star,Brave Battlefield Morning Star,4,0,,0,105,,1,0,0x0004C5B3,7,2,2,3,80,1,8,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus2 bAddEff,Eff_Stun,5000; }",5,6000; },{},{}
-1544,Lunakaligo,Lunakaligo,4,20,,700,110,,1,3,0x00008110,2,2,002,3,50,1,8,{ if(readparam(bStr) >= 77){ bonus bAspdRate,4; bonus2 bAddEff,Eff_Stun,1500; } },{},{}
+1544,Lunakaligo,Lunakaligo,4,20,,700,110,,1,3,0x00008110,2,2,2,3,50,1,8,{ if(readparam(bStr) >= 77){ bonus bAspdRate,4; bonus2 bAddEff,Eff_Stun,1500; } bonus3 bAddMonsterDropItemGroup,IG_Food,2,500; bonus3 bAddMonsterDropItemGroup,IG_Food,3,500; bonus3 bAddMonsterDropItemGroup,IG_Food,5,500; },{},{}
1545,Novice_Mace,Novice Mace,4,1,,0,57,,1,0,0x0004C5B3,7,2,2,1,2,0,8,{},{},{}
1546,Krieger_Onehand_Mace1,Glorious Morning Star,4,0,,0,130,,1,0,0x0004C5B3,7,2,2,4,80,1,8,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) { bonus2 bIgnoreDefRate,RC_DemiHuman,5; bonus bAspd,5; } if(getrefine() > 8) { bonus2 bAddEff,Eff_Stun,2000; bonus bAspd,5; } },{},{}
// Books
@@ -855,7 +855,7 @@
1634,Strong_Recovery_Wand,Strong Recovery Wand,4,0,,0,70,,1,0,0x00818314,7,2,2,3,80,1,10,{ bonus bMatkRate,15; bonus bHealPower,14; bonus2 bSPRegenRate,5,10000; bonus bUnbreakableWeapon,0; },{},{}
1635,Speedy_Recovery_Wand,Speedy Recovery Wand,4,0,,0,70,,1,0,0x00818314,7,2,2,3,80,1,10,{ bonus bInt,3; bonus bDex,2; bonus bMatkRate,15; bonus bDelayRate,-15; bonus2 bSPRegenRate,5,10000; bonus bUnbreakableWeapon,0; },{},{}
1636,Dark_Thorn_Staff,Thorn Staff of Darkness,4,20,,700,60,,1,0,0x00018314,2,2,34,4,75,1,10,{ bonus bInt,3; bonus bDex,3; bonus bMatkRate,20; bonus bIgnoreMdefRate,getrefine(); bonus bDelayRate,-(getrefine()); },{},{}
-1637,Eraser,Eraser,4,20,,500,80,,1,0,0x00018314,2,2,002,4,70,1,10,{ bonus bMatkRate,20; bonus bInt,3; bonus bDex,2; bonus bSPrecovRate,8; },{},{}
+1637,Eraser,Eraser,4,20,,500,80,,1,0,0x00018314,2,2,2,4,70,1,10,{ bonus bMatkRate,20; bonus bInt,3; bonus bDex,2; bonus bSPrecovRate,8; },{},{}
1638,Healing_Staff_,Recovery Staff,4,20,,400,10,,1,0,0x00008110,7,2,2,3,55,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bHealPower,(getrefine()*3/2); },{},{}
1639,Novice_Rod,Novice_Rod,4,1,,0,15,,1,0,0x00818315,7,2,2,1,1,0,10,{ bonus bMatkRate,16; },{},{}
1640,Krieger_Onehand_Staff1,Glorious Arc Wand,4,0,,0,70,,1,0,0x00018314,7,2,2,4,80,1,10,{ bonus bMatkRate,15 + getrefine(); bonus2 bMagicAddRace,RC_DemiHuman,15; bonus2 bIgnoreMdefRate,RC_DemiHuman,25; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreMdefRate,RC_DemiHuman,5; if(getrefine() > 8) { bonus bMatkRate,5; bonus bCastrate,-5; bonus bDelayRate,-5; } },{},{}
@@ -899,7 +899,7 @@
1737,Ixion_Wing,Ixion Wings,4,20,,300,135,,5,1,0x00000800,2,2,34,4,70,1,11,{ autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000; bonus2 bAddSkillBlow,"AC_CHARGEARROW",3; },{},{}
1738,Valorous_Battle_CrossBow,Valorous Battle CrossBow,4,0,,0,100,,5,0,0x000A0848,7,2,34,3,80,1,11,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
1739,Brave_Battle_CrossBow,Brave Battle CrossBow,4,0,,0,100,,5,0,0x000A0848,7,2,34,3,80,1,11,{ bonus bDex,2; bonus bInt,10; bonus2 bAddRace,RC_DemiHuman,55; bonus bUnbreakableWeapon,0; },{},{}
-1740,Nepentis_Bow,Nepentis Bow,4,20,,1000,105,,5,2,0x00000800,2,2,34,4,60,1,11,{bonus4 bAutoSpellOnSkill,"AC_DOUBLE","AC_CHARGEARROW",1,50;},{},{}
+1740,Nepentis_Bow,Nepentis Bow,4,20,,1000,105,,5,2,0x00000800,2,2,34,4,60,1,11,{ bonus4 bAutoSpellOnSkill,"AC_DOUBLE","AC_CHARGEARROW",1,50; },{},{}
1741,Cursed_Lyre,Cursed Lyre,4,20,,1250,125,,5,1,0x00080808,2,2,34,4,80,1,11,{ bonus bLuk,-2; bonus2 bAddEff,Eff_Curse,400; },{},{}
1742,Novice_Composite_Bow,Novice Composite Bow,4,1,,0,49,,5,0,0x000A0848,7,2,34,1,4,0,11,{},{},{}
1743,Krieger_Bow1,Glorious Hunter Bow,4,0,,0,100,,5,0,0x001A0848,7,2,34,4,80,1,11,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bCritAtkRate,getrefine() * 2; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) bonus2 bSkillAtk,"AC_DOUBLE",20; },{},{}
@@ -952,7 +952,7 @@
1822,Combo_Battle_Glove,Barrage Fist,4,20,,500,30,,1,4,0x00008100,7,2,2,3,60,1,12,{ bonus2 bSkillAtk,"MO_TRIPLEATTACK",15; bonus2 bSkillAtk,"MO_CHAINCOMBO",15; bonus2 bSkillAtk,"MO_COMBOFINISH",20; },{},{}
1823,Valorous_Battle_Fist,Valorous Battle Fist,4,0,,0,30,,1,0,0x00008100,7,2,2,3,80,1,12,{ bonus bStr,2; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus4 bAutoSpell,"CH_SOULCOLLECT",1,5,0; bonus bUnbreakableWeapon,0; },{},{}
1824,Brave_Battle_Fist,Brave Battle Fist,4,0,,0,30,,1,0,0x00008100,7,2,2,3,80,1,12,{ bonus bStr,2; bonus bInt,1; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bCastrate,271,-25; autobonus "{ bonus2 bCastrate,271,-100; }",5,6000; bonus bUnbreakableWeapon,0; },{},{}
-1825,Soul_Of_Hels_Leon,Horn of Hilthrion,4,20,,600,95,,1,3,0x00008000,2,2,002,3,60,1,12,{ bonus3 bAutoSpell,"NPC_CRITICALWOUNDS",1,100; bonus4 bAutoSpellOnSkill,"CH_PALMSTRIKE","MO_INVESTIGATE",1,50; bonus3 bAutoSpell,"MO_CALLSPIRITS",5,200;},{},{}
+1825,Soul_Of_Hels_Leon,Horn of Hilthrion,4,20,,600,95,,1,3,0x00008000,2,2,2,3,60,1,12,{ bonus3 bAutoSpell,"NPC_CRITICALWOUNDS",1,100; bonus4 bAutoSpellOnSkill,"CH_PALMSTRIKE","MO_INVESTIGATE",1,50; bonus3 bAutoSpell,"MO_CALLSPIRITS",5,200;},{},{}
1826,Krieger_Knuckle1,Glorious Claw,4,0,,0,30,,1,0,0x00008100,7,2,2,4,80,1,12,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) { bonus3 bAutoSpell,"MO_INVESTIGATE",1,50; bonus3 bAutoSpell,"AL_DECAGI",1,50; } },{},{}
1827,Krieger_Knuckle2,Glorious Fist,4,0,,0,30,,1,0,0x00008100,7,2,2,4,80,1,12,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) autobonus3 "{ bonus2 bCastrate,271,-100; bonus2 bCastrate,401,-100; }",500,6000,"MO_EXPLOSIONSPIRITS"; },{},{}
// Instruments
@@ -981,7 +981,7 @@
1923,Valorous_Battlefield_Guitar,Valorous Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
1924,Brave_Battlefield_Guitar,Brave Battlefield Guitar,4,0,,0,50,,1,0,0x00080000,7,1,2,3,80,1,13,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,"CG_ARROWVULCAN",20; bonus bUnbreakableWeapon,0; },{},{}
1925,Chello,Cello,4,20,,700,110,,1,3,0x00080000,2,1,002,3,70,1,13,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"BA_MUSICALSTRIKE",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
-1926,Harp_Of_Nepentis,Harp of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,1,002,4,60,1,13,{ bonus bInt,2; bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,300; if(getrefine() >= 9) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,500; }; },{},{}
+1926,Harp_Of_Nepentis,Harp of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,1,2,4,60,1,13,{ bonus bInt,2; bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,300; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,"BA_MUSICALSTRIKE",Eff_Stun,500; } },{},{}
1927,Krieger_Instrument1,Glorious Guitar,4,0,,0,50,,1,0,0x00180000,7,1,2,4,80,1,13,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"CG_ARROWVULCAN","CG_TAROTCARD",5,100; },{},{}
// Whips
1950,Rope,Rope,4,2500,,400,45,,2,3,0x00080000,7,0,2,1,3,1,14,{},{},{}
@@ -1013,8 +1013,8 @@
1976,Queen's_Whip_,Queen's Whip,4,20,,1100,150,,2,2,0x00080000,7,0,2,4,65,1,14,{ bonus2 bSkillAtk,"CG_ARROWVULCAN",10; bonus2 bSkillAtk,"DC_THROWARROW",10; },{},{}
1977,Valorous_Battle_Lariat,Valorous Battle Lariat,4,0,,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; },{},{}
1978,Brave_Battle_Lariat,Brave Battle Lariat,4,0,,0,50,,2,0,0x00080000,7,0,2,3,80,1,14,{ bonus bDex,2; bonus2 bAddRace,RC_DemiHuman,95; bonus2 bSkillAtk,"CG_ARROWVULCAN",20; bonus bUnbreakableWeapon,0; },{},{}
-1979,Stem_Of_Nepentis,Stem of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,0,002,4,60,1,14,{ bonus bInt,2; bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,300; if(getrefine() >= 9) {bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,500;}; },{},{}
-1980,Rope_Of_Unbalance,Rope of Unbalance,4,20,,700,110,,1,3,0x00080000,2,0,002,3,70,1,14,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"DC_THROWARROW",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
+1979,Stem_Of_Nepentis,Stem of Nepentis,4,20,,1000,120,,1,2,0x00080000,2,0,2,4,60,1,14,{ bonus bInt,2; bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,300; if( getrefine() >= 9 ) { bonus3 bAddEffOnSkill,"DC_THROWARROW",Eff_Freeze,500; } },{},{}
+1980,Rope_Of_Unbalance,Rope of Unbalance,4,20,,700,110,,1,3,0x00080000,2,0,2,3,70,1,14,{ bonus bAgi,2; bonus bDex,3; bonus2 bAddSkillBlow,"DC_THROWARROW",2; bonus2 bAddSkillBlow,"CG_ARROWVULCAN",3; },{},{}
1981,Krieger_Whip1,Glorious Lariat,4,0,,0,50,,2,0,0x00180000,7,0,2,4,80,1,14,{ bonus2 bAddRace,RC_DemiHuman,95; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"CG_ARROWVULCAN","CG_TAROTCARD",5,100; },{},{}
// Additional 2-Handed Staffs
2000,Destruction_Rod,Staff of Destruction,4,20,,2500,130,,1,1,0x00000200,2,2,34,4,80,1,10,{ bonus bMatkRate,25+getrefine()/2; bonus bInt,3; bonus bAgi,10; bonus bUseSPrate,(getrefine()*2); bonus3 bAutoSpellWhenHit,"WZ_JUPITEL",5,(getrefine()*20); bonus2 bCastrate,366,-50; },{},{}
@@ -1054,9 +1054,9 @@
2130,Cross_Shield,Cross Shield,5,20,,2000,,6,,1,0x00004000,7,2,32,,80,1,1,{ bonus bStr,1; bonus2 bSkillAtk,"PA_SHIELDCHAIN",30; bonus2 bSkillAtk,"CR_SHIELDBOOMERANG",30; bonus bUseSPrate,10; },{},{}
2131,Magic_Study_Vol1,Magic Bible Vol1,5,20,,1000,,2,,1,0x00010204,2,2,32,,70,1,1,{ bonus bMDef,3; bonus bInt,2; bonus2 bAddEffWhenHit,Eff_Stun,1000; },{},{}
2132,Shell_Of_Resistance,Shell Of Resistance,5,0,,0,,9,,0,0xFFFFFFFF,2,2,32,,0,0,1,{ bonus2 bSubRace,RC_NonBoss,20; bonus2 bSubRace,RC_Boss,20; bonus bShortWeaponDamageReturn,1; },{},{}
-2133,Tournament_Shield,Tournament Shield,5,20,,1000,,5,,1,0x00004082,2,2,032,,50,1,3,{ bonus bAtkRate,1; if (BaseClass==Job_Lord_Knight) { bonus bAspdRate,-5; }; if ((isequipped(1420)) || (isequipped(1421)) || (isequipped(1422))) { bonus bAtkRate,4; bonus bDef,2;} },{},{}
-2134,Naga_Scale_Shield,Shield of Naga,5,20,,500,,3,,1,0x00CFFF80,2,2,032,,70,1,3,{ bonus bMdef,3; },{},{}
-2135,Shadow_Guard,Shadow Guard,5,20,,800,,4,,1,0x00020000,2,2,032,,70,1,3,{ if (isequipped(2426)) { bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20 }",5,10000; }; },{},{}
+2133,Tournament_Shield,Tournament Shield,5,20,,1000,,5,,1,0x00004082,2,2,32,,50,1,3,{ bonus bAtkRate,1; if( BaseClass == Job_Lord_Knight ) bonus bAspdRate,-5; if( isequipped(1420) || isequipped(1421) || isequipped(1422) ) { bonus bAtkRate,4; bonus bDef,2; } },{},{}
+2134,Naga_Scale_Shield,Shield of Naga,5,20,,500,,3,,1,0x00CFFF80,2,2,32,,70,1,3,{ bonus bMdef,3; },{},{}
+2135,Shadow_Guard,Shadow Guard,5,20,,800,,4,,1,0x00020000,2,2,32,,70,1,3,{ if( isequipped(2426) ) { bonus2 bAddEff,Eff_Blind,500; autobonus "{ bonus bFlee,20; }",5,10000; } },{},{}
//2136#..._Buckler#
//2137#Balkiriah_Shield#
2199,Ahura_Mazda,Ahura Mazdah,5,1,,10,,100,,0,0xFFFFFFFF,7,2,32,,1,1,0,{ bonus bAllStats,50; bonus bMdef,99; bonus bShortWeaponDamageReturn,100; bonus2 bSubRace,RC_DemiHuman,95; skill "CR_FULLPROTECTION",5; },{},{}
@@ -1248,11 +1248,11 @@
2383,Brynhild,Brynhild,5,0,,400,,,,0,0xFFFFFFFF,7,2,16,,94,0,0,{ bonus bMdef,10; bonus bMaxHP,20*BaseLevel; bonus bMaxSP,5*BaseLevel; bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatkRate,10; bonus bUnbreakableArmor,0; bonus bNoKnockback,0; },{},{}
2384,Spiritual_Tunic,Spiritual Tunic,5,20,,0,,10,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus2 bSubEle,Ele_Neutral,20; bonus2 bSubEle,Ele_Water,20; bonus bMaxHP,800; bonus2 bResEff,Eff_Freeze,10000; },{},{}
2385,Recuperative_Armor,Recuperative Armor,5,20,,0,,12,,0,0xFFFFFFFF,7,2,16,,0,0,0,{ bonus bNoRegen,1; bonus bNoRegen,2; bonus bHPGainValue,60; bonus bSPGainValue,6; },{},{ heal 0,-100; }
-2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x00CFDF80,2,2,16,,70,1,0,{ if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bDef,3; else if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Job_Acolyte) bonus bMDef,5; },{},{}
-2387,Sprint_Mail,Sprint Mail,5,20,,1000,,1,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; },{},{}
-2388,Gandora,Gandora,5,20,,300,,4,,1,0x00021040,2,2,16,,70,1,0,{ bonus bAgi,1; bonus bFlee,5; bonus bAspdRate,2; },{},{}
-2389,Naga_Scale_Armor,Naga Scale Armor,5,20,,1000,,5,,1,0x00CFDF80,2,2,16,,0,1,0,{ bonus bMDef,2; autobonus2 "{ bonus bBaseAtk,10; }",10,10000; },{},{}
-2390,Refined_Tights,Refined Tights,5,20,,400,,6,,1,0x00080808,2,2,16,,75,1,0,{ bonus bMDef,2; bonus bFlee2,3; },{},{}
+2386,Chameleon_Armor,Chameleon Armor,5,20,,1700,,5,,0,0x000FDF80,2,2,16,,70,1,0,{ bonus bMaxHP,(BaseLevel*20); bonus bMaxSP,(BaseLevel*5); if( BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte ) bonus bMdef,5; else if( BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief ) bonus bDef,3; },{},{}
+2387,Sprint_Mail,Sprint Mail,5,20,,1000,,3,,1,0x000FDF80,2,2,16,,70,1,0,{ bonus bVit,1; bonus bHPrecovRate,5; bonus2 bAddItemHealRate,IG_Recovery,3; bonus2 bSkillHeal,"AL_HEAL",3; if( isequipped(2440) && isequipped(2744) ) { bonus bMaxHPrate,7; bonus bMaxSPrate,7; bonus bCastrate,-3; bonus bDelayrate,-15; } },{},{}
+2388,Gandora,Gandora,5,20,,300,,4,,1,0x00001000,2,2,16,,70,1,0,{ bonus bAgi,1; bonus bFlee,5; bonus bAspdRate,2; },{},{}
+2389,Naga_Scale_Armor,Naga Scale Armor,5,20,,1000,,5,,1,0x00CFDF80,2,2,16,,70,1,0,{ bonus bMdef,2; autobonus "{ bonus bBaseAtk,20; }",10,10000; },{},{}
+2390,Refined_Tights,Refined Tights,5,20,,400,,6,,1,0x00080808,2,2,16,,75,1,0,{ bonus bMdef,2; bonus bFlee2,3; },{},{}
2391,Life_Link,Life Link,5,20,,3500,,9,,1,0x00004082,2,2,16,,82,1,0,{ bonus bVit,2; bonus bMdef,5; bonus bHPrecovRate,50; },{},{}
//2392,Old_Green_Pantie,Old Green Pantie
2393,Novice_Adventure_Suit,Novice Adventure Suit,5,1,,0,,8,,1,0x00000001,7,2,16,,0,0,0,{},{},{}
@@ -1300,7 +1300,7 @@
2437,Combat_Boots,Battle Boots,5,0,,0,,3,,1,0x01000000,7,2,64,,80,1,0,{ bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1; },{},{}
2438,Cat's_Paw,Cat's Paw,5,20,,300,,0,,0,0xFFFFFFFF,7,2,64,,80,1,0,{ bonus bFlee,5; bonus bAgi,1; },{},{}
2439,Refresh_Shoes,Refresh Shoes,5,20,,0,,9,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMaxHPRate,17; bonus bMaxSPRate,8; bonus2 bHPRegenRate,20,10000; bonus2 bSPRegenRate,3,10000; },{},{}
-2440,Sprint_Shoes,Sprint Shoes,5,20,,300,,2,,0,0x00CFDF80,2,2,64,,0,1,0,{ bonus bAGI,1; bonus bSPrecovRate,5; if (isequipped(2387)) { bonus bMaxHPRate,7; bonus bMaxSPRate,7; bonus bCastRate,-3; bonus bDelayRate,-15; }; },{},{}
+2440,Sprint_Shoes,Sprint Shoes,5,20,,300,,2,,1,0x000FDF80,2,2,64,,70,1,0,{ bonus bAgi,1; bonus bSPrecovRate,5; },{},{}
2441,Beach_Sandals,Beach Sandals,5,20,,200,,0,,0,0xFFFFFFFF,7,2,64,,0,1,0,{ bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10; if (isequipped(2546)) bonus bFlee,5; },{},{}
//2442#Red_Stocking_Boots#
2443,Fish_Shoes,Fisher's Boots,5,0,,200,,0,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{}
@@ -1353,7 +1353,7 @@
2542,Naght_Seiger_Manteau,Flame Manteau of Naght Sieger,5,20,,70,,4,,1,0xFFFFFFFE,2,2,4,,70,1,0,{ bonus bMaxHPRate,5; bonus bMdef,2; bonus bMatkRate,1; bonus2 bAddEle,Ele_Fire,2; },{},{}
2543,Sylph_Manteau,Sylph Manteau,5,20,,0,,9,,0,0xFFFFFFFF,7,2,4,,0,0,0,{ bonus bFlee,13; bonus2 bSubEle,Ele_Neutral,13; bonus bFlee2,1; },{},{}
2544,Tendril_Lion's_Skin,Leather of Tendrilion,5,20,,300,,3,,1,0x00CFDF80,2,2,4,,0,1,0,{ bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; bonus2 bSubRace,RC_Plant,5; bonus2 bSubRace,RC_Brute,5; },{},{}
-2545,Mushika,Mushika,5,20,,500,,2,,1,0x00008100,2,2,4,,70,1,0,{ bonus3 bAutoSpell,"AL_HEAL",1+9*(getskilllv("AL_HEAL")==10),20; },{},{}
+2545,Mushika,Mushika,5,20,,500,,2,,1,0x00008100,2,2,4,,70,1,0,{ bonus bMdef,3; bonus3 bAutoSpell,"AL_HEAL",getskilllv("AL_HEAL") ? getskilllv("AL_HEAL") : 1,20; },{},{}
2546,Beach_Manteau,Beach Manteau,5,20,,600,,0,,1,0xFFFFFFFF,7,2,4,,0,1,0,{ bonus bStr,1; bonus bInt,1; bonus2 bSubEle,Ele_Fire,10; },{},{}
//2547#Cheap_Undershirt#
//2548#Muffler#
@@ -1501,13 +1501,13 @@
2740,Commemorative_Coin__,Rusty Commemorative Coin,5,0,,0,,1,,0,0xFFFFFFFF,7,2,136,,80,0,0,{ bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
2741,All_In_One_Ring,All In One Ring,5,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ skill "AL_HEAL",1; skill "AL_TELEPORT",1; bonus bNoCastCancel,0; bonus bAllStats,1; bonus bCastRate,10; },{},{}
//2742#Lucky_Clip#
-2743,Angelic_Ring,Angelic Ring,5,0,,100,,0,,0,0xFDF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; },{},{}
+2743,Angelic_Ring,Angelic Ring,5,0,,100,,0,,0,0xFDF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,2000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,2000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,2000,"PR_SANCTUARY"; },{},{}
2744,Sprint_Ring,Sprint Ring,5,0,,100,,0,,0,0xFDF80,2,2,136,,70,0,0,{ bonus bCastrate,-10; bonus bDelayRate,-5; },{},{}
2745,Pinguicura's_Corsage,Pinguicura's Corsage,5,0,,200,,0,,1,0xFDF80,2,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{}
-2746,Cold_Heart,Cold Heart,5,0,,100,,1,,0,0x1000,2,2,136,,80,0,0,{ bonus bAgi,3; if(isequipped(2620)){ bonus bAspd,getrefine(); } },{},{}
-2747,Black_Cat,Black Cat,5,0,,100,,1,,0,0x20000,2,2,136,,80,0,0,{ bonus bDef,3; if(isequipped(2620)){ bonus bHit,getrefine(); bonus bCastrate,-getrefine(); } },{},{}
-2748,Cursed_Star,Cursed Star,5,0,,200,,0,,0,0x80808,2,2,136,,84,0,0,{ bonus bMdef,3; bonus bDex,2; bonus bLuk,-1; bonus2 bHPLossRate,50,10000; bonus2 bAddEff,Eff_Curse,200; if(isequipped(1741)){ bonus bAtk,25; bonus2 bAddEff,Eff_Curse,200; } },{},{ heal -300,0; }
-2749,Linen_Glove,Linen Glove,5,0,,120,,1,,1,0xFDF80,2,2,136,,90,0,0,{ bonus bMdef,2; bonus bAgi,2; bonus bDex,1; if(isequipped(2390)){ bonus bFlee2,5; } },{},{}
+2746,Cold_Heart,Cold Heart,5,0,,100,,1,,0,0x1000,2,2,136,,80,0,0,{ bonus bAgi,3; if( isequipped(2620) ) { bonus bAspd,getrefine(); bonus2 bAddSize,1,8; } },{},{}
+2747,Black_Cat,Black Cat,5,0,,100,,1,,0,0x20000,2,2,136,,80,0,0,{ bonus bDex,3; if( isequipped(2620) ) { bonus2 bAddSize,2,8; bonus bHit,getequiprefinerycnt(EQI_HAND_R); bonus bCastrate,-getequiprefinerycnt(EQI_HAND_R); } },{},{}
+2748,Cursed_Star,Cursed Star,5,0,,200,,0,,0,0x80808,2,2,136,,84,0,0,{ bonus bMdef,3; bonus bDex,2; bonus bLuk,-1; bonus2 bHPLossRate,50,10000; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; if( isequipped(1741) ) { bonus bAtk,25; bonus3 bAddEff,Eff_Curse,200,ATF_WEAPON|ATF_LONG|ATF_TARGET; } },{},{ heal -300,0; }
+2749,Linen_Glove,Linen Glove,5,0,,120,,1,,1,0xFDF80,2,2,136,,90,0,0,{ bonus bMdef,2; bonus bAgi,2; bonus bDex,1; if( isequipped(2390) ) bonus bFlee2,5; },{},{}
//2750#...#
2751,Academy_of_Badge,Academy of Badge,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ if(BaseLevel < 80) { bonus bMaxHP,400; bonus bMaxSP,200; } },{},{}
2753,Beholder_Ring,Beholder Ring,5,0,,100,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bExpAddRace,RC_Formless,15; },{},{}
@@ -4018,8 +4018,8 @@
13035,Sandstorm,Sandstorm,4,20,,600,50,,1,4,0x00001000,2,2,2,2,70,1,1,{},{},{}
13036,Brave_Assassin's_Damascus,Brave Assassin's Damascus,4,0,,0,120,,1,0,0x028F5EEF,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
13037,Valorous_Assassin's_Damascus,Valorous Assassin's Damascus,4,0,,0,120,,1,0,0x029E7CEB,7,2,2,3,80,1,1,{ bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; autobonus "{ bonus bDefRatioAtkRace,RC_NonBoss; }",50,6000; if (Class == Job_Ninja || Class == Job_Rogue || Class == Job_Stalker) bonus bMatkRate,15; },{},{}
-13038,Trackers_Dagger,Dagger of Hunter,4,20,,700,120,,1,3,0x00020000,2,2,002,3,70,1,1,{ bonus bStr,1; bonus bAgi,2; bonus bDex,1; bonus4 bAutoSpellOnSkill,"RG_BACKSTAP","SM_BASH",10,10; bonus2 bSkillAtk,"RG_BACKSTAP",20; },{},{}
-13039,Ivory_Knife,Ivory Knife,4,20,,700,130,,1,2,0x000F5EEE,2,2,002,3,50,1,1,{ bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,300; bonus3 bAutoSpell,"NPC_CRITICALWOUNDS",1,30;},{},{}
+13038,Trackers_Dagger,Dagger of Hunter,4,20,,700,120,,1,3,0x00020000,2,2,2,3,70,1,1,{ bonus bStr,1; bonus bAgi,2; bonus bDex,1; bonus4 bAutoSpellOnSkill,"RG_BACKSTAP","SM_BASH",10,10; bonus2 bSkillAtk,"RG_BACKSTAP",20; },{},{}
+13039,Ivory_Knife,Ivory Knife,4,20,,700,130,,1,2,0x000F5EEE,2,2,2,3,50,1,1,{ bonus bAgi,2; bonus bAspdRate,3; bonus2 bAddEff,Eff_Bleeding,300; bonus3 bAutoSpell,"NPC_CRITICALWOUNDS",1,30;},{},{}
13040,Novice_Cutter,Novice Cutter,4,1,,0,50,,1,0,0xFE9F7EEF,7,2,2,1,1,0,1,{},{},{}
13041,Novice_Main_Gauche,Novice Main Gauche,4,1,,0,65,,1,0,0xFE9F7EEF,7,2,2,1,1,0,1,{},{},{}
13042,Glorious_Damascus,Glorious Damascus,4,0,,0,120,,1,0,0x021F5EEF,7,2,2,4,80,1,1,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus3 bAutoSpell,"PR_LEXDIVINA",1,50; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"RG_BACKSTAP","NPC_WIDEBLEEDING",2,100; },{},{}
@@ -4106,7 +4106,7 @@
13411,Brave_Gladiator_Blade,Brave Gladiator Blade,4,0,,0,115,,1,0,0x000654E3,7,2,2,3,80,1,2,{ bonus bStr,1; bonus bDex,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; },{},{}
13412,Naght_Seiger_Twin_Edge,Twin Edge of Naght Sieger,4,0,,1500,150,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Water; skill "MG_FROSTDIVER",5; },{},{}
13413,Naght_Seiger_Twin_Edge_,Twin Edge of Naght Sieger,4,0,,1500,160,,1,3,0x000654E2,2,2,2,4,75,1,2,{ bonus bAtkEle,Ele_Fire; skill "WZ_METEOR",3; },{},{}
-13414,Elemental_Sword,Elemental Sword,4,20,,1200,105,,1,3,0x000654E2,2,2,002,3,70,1,2,{ bonus bStr,2; bonus bInt,4; bonus bDex,1; bonus bMatkRate,5; bonus2 bAddEle,Ele_Neutral,10; bonus3 bAutoSpell,"MG_FIREBOLT",1,10; bonus3 bAutoSpell,"MG_COLDBOLT",1,10; bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",1,10; },{},{}
+13414,Elemental_Sword,Elemental Sword,4,20,,1200,105,,1,3,0x000654E2,2,2,2,3,70,1,2,{ bonus bStr,2; bonus bInt,4; bonus bDex,1; bonus bMatkRate,5; bonus2 bAddEle,Ele_Neutral,10; bonus3 bAutoSpell,"MG_FIREBOLT",1,10; bonus3 bAutoSpell,"MG_COLDBOLT",1,10; bonus3 bAutoSpell,"MG_LIGHTNINGBOLT",1,10; },{},{}
13415,Novice_Falchion,Novice Falchion,4,1,,0,59,,1,0,0x000654E3,7,2,2,1,1,0,2,{},{},{}
13416,Glorious_Flamberge,Glorious Flamberge,4,0,,0,130,,1,0,0x000654E3,7,2,2,4,80,1,2,{ bonus2 bAddRace,RC_DemiHuman,75; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus3 bAutoSpell,"PR_LEXDIVINA",1,50; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 6) bonus bAspd,10; if(getrefine() > 8) bonus4 bAutoSpellOnSkill,"MS_BASH","NPC_CRITICALWOUND",2,100; },{},{}
13417,Glorious_Rapier,Glorious Rapier,4,0,,0,130,,1,0,0x000654E3,7,2,2,4,80,1,2,{ bonus bInt,getrefine() + 1; bonus bMatkRate,10; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus bUseSPrate,-10; if(getrefine() > 8) bonus bInt,5; },{},{}
diff --git a/db/item_trade.txt b/db/item_trade.txt
index 6bb11b8d9..9597e6031 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -77,6 +77,47 @@
12272,123,100
12273,123,100
+// Kreiger Von Midgard Rewards
+
+1187,123,100
+1281,123,100
+1282,123,100
+1310,123,100
+1382,123,100
+1426,123,100
+1486,123,100
+1546,123,100
+1576,123,100
+1577,123,100
+1640,123,100
+1641,123,100
+1743,123,100
+1826,123,100
+1827,123,100
+1927,123,100
+1981,123,100
+2002,123,100
+13042,123,100
+13110,123,100
+13176,123,100
+13177,123,100
+13178,123,100
+13179,123,100
+13307,123,100
+13416,123,100
+13417,123,100
+13418,123,100
+2394,123,100
+2444,123,100
+2549,123,100
+2772,123,100
+2445,123,100
+2446,123,100
+2395,123,100
+2396,123,100
+2773,123,100
+2774,123,100
+
// Wedding Related items
2634,127,100 // Bridegroom_Ring
2635,127,100 // Bride_Ring
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 70e2d28c2..ad0400288 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -1030,18 +1030,18 @@
1983,I_ZENORC,Zenorc,Zenorc,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
1984,I_ORC_LORD,Orc Lord,Orc Lord,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
// Another World (13.1)
-1985,DANDELION,Dandelion,Dandelion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1986,TATACHO,Tatacho,Tatacho,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1987,CENTIPEDE,Centipede,Centipede,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1988,NEPENTHES,Nepenthes,Nepenthes,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1989,HILLSRION,Hills Lion,Hills Lion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1990,HARDROCK_MOMMOTH,Hardrock Mammoth,Hardrock Mammoth,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1991,TENDRILRION,Tendril Lion,Tendril Lion,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1992,CORNUS,Cornus,Cornus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1993,NAGA,Naga,Naga,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-1995,PINGUICULA,Pinguicula,Pinguicula,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//1996,BACSOJIN_T
-//1997,G_TATACHO
-//1998,G_HILLSRION
-//1999,CENTIPEDE_LARVA
+// 1985,DANDELION,Dandelion,Dandelion,88,28890,0,8650,3879,2,780,1560,30,35,10,85,4,88,60,30,10,12,1,7,80,12949,150,900,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1986,TATACHO,Tatacho,Tatacho,106,39311,0,23700,13825,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,7,22,0x81,250,2304,840,360,0,0,0,0,0,0,0,0,6020,4000,579,3000,516,3000,6021,3000,1544,20,1925,10,0,0,0,0,0,0,0,0
+1987,CENTIPEDE,Centipede,Centipede,110,45662,0,27397,15982,1,15000,16000,40,25,112,43,30,5,131,12,10,12,1,4,45,0x3795,165,1792,792,336,0,0,0,0,0,0,0,0,955,9000,1042,5335,912,5000,943,2500,1741,10,2746,2,2747,2,0,0,0,0,0,0
+1988,NEPENTHES,Nepenthes,Nepenthes,75,10350,0,4140,2587,4,415,565,25,10,75,20,30,5,65,5,10,12,1,3,45,0x84,1000,1768,768,576,0,0,0,0,0,0,0,0,905,9000,6041,3000,993,50,5399,1,1979,1,1926,1,1740,1,0,0,0,0,0,0
+1989,HILLSRION,Hills Lion,Hills Lion,105,34600,0,20760,12110,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7054,4850,6032,3000,6020,2000,7063,120,1825,20,1268,10,2440,10,0,0,0,0,0,0
+1990,HARDROCK_MOMMOTH,Hardrock Mammoth,Hardrock Mammoth,115,4137000,0,827400,413700,1,30000,36000,50,60,115,35,1,30,150,15,10,12,2,2,62,0x37B5,250,432,840,216,1998456,10000,603,5500,0,0,0,0,985,9000,6022,9000,1483,500,13039,400,2133,200,5398,100,2257,20,0,0,0,0,0,0
+1991,TENDRILRION,Tendril Lion,Tendril Lion,113,3657330,0,734166,365733,1,20000,24000,33,30,113,60,1,45,147,13,10,12,2,2,42,0x37B5,130,212,384,360,1899380,10000,603,5500,0,0,0,0,6033,9000,7197,5335,7008,4850,6020,4000,1637,100,1186,100,2544,100,0,0,0,0,0,0
+1992,CORNUS,Cornus,Cornus,108,39391,0,30854,4427,1,12000,13000,35,80,110,45,80,200,105,10,10,12,1,2,46,0x81,100,704,504,432,0,0,0,0,0,0,0,0,944,6000,6023,4000,7063,3000,2257,2,2387,10,1420,1,2743,1,0,0,0,0,0,0
+1993,NAGA,Naga,Naga,111,46708,0,30360,16348,1,8000,8800,38,15,113,42,30,108,122,13,10,12,1,2,42,0x3095,150,824,780,420,0,0,0,0,0,0,0,0,926,5000,936,3500,954,2000,1408,20,1485,10,2134,10,2389,10,0,0,0,0,0,0
+1994,LUCIOLA_VESPA,Luciola Vespa,Luciola Vespa,104,25103,0,13040,11410,1,9000,9900,29,5,104,56,30,20,116,4,10,12,1,4,24,0x3795,150,920,720,200,0,0,0,0,0,0,0,0,939,9000,955,9000,943,3000,518,300,526,200,992,160,2744,2,0,0,0,0,0,0
+1995,PINGUICULA,Pinguicula,Pinguicula,80,13680,0,5472,3420,1,1868,6124,25,5,102,23,30,10,86,2,10,12,0,3,62,0x85,180,1720,1320,360,0,0,0,0,0,0,0,0,7100,5000,7188,3000,7198,2000,712,1000,2270,10,1980,10,2745,1,0,0,0,0,0,0
+// 1996,BACSOJIN_T,Bacsojin,Bacsojin,85,253221,0,0,0,3,1868,6124,20,55,52,65,44,112,152,35,10,12,2,7,64,0x39A5,130,576,960,480,0,0,0,0,0,0,0,0,501,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1997,G_TATACHO,Tatacho,Tatacho,106,39311,0,0,0,1,10000,11000,20,17,106,40,30,25,115,6,10,12,1,7,22,0x37B5,250,2304,840,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1998,G_HILLSRION,Hills Lion,Hills Lion,105,34600,0,0,0,1,5000,5500,28,15,105,60,30,15,115,5,10,12,0,2,22,0x37B5,150,824,432,360,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+1999,CENTIPEDE_LARVA,Centipede Larva,Centipede Larva,80,12000,0,3600,4800,1,948,1145,20,20,80,33,15,3,75,10,10,12,0,4,45,0x3795,300,1792,792,336,0,0,0,0,0,0,0,0,955,9000,1042,5335,912,5000,943,2500,732,50,2406,9,0,0,0,0,0,0,0,0
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 3e2321aa9..4ff009cf0 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -5079,3 +5079,133 @@
1961,Thorn of Purification@SA_DISPELL,attack,289,5,500,2000,30000,yes,target,always,0,,,,,,
1961,Thorn of Purification@NPC_DEFENDER,idle,205,5,10000,0,180000,no,self,always,0,,,,,,29
1961,Thorn of Purification@NPC_DEFENDER,attack,205,5,10000,0,180000,no,self,always,0,,,,,,29
+
+1986,Tatacho@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1986,Tatacho@BS_HAMMERFALL,chase,110,5,2000,0,5000,yes,target,always,,,,,,,
+1986,Tatacho@BS_HAMMERFALL,attack,110,5,2000,0,5000,yes,target,always,,,,,,,
+1986,Tatacho@NPC_STUNATTACK,attack,179,5,1000,0,5000,yes,target,always,0,,,,,,
+1986,Tatacho@HW_GANBANTEIN,attack,483,5,10000,500,7000,no,target,always,0,,,,,,
+1987,Centipede@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1987,Centipede@AS_VENOMDUST,idle,140,1,2000,0,10000,yes,randomtarget,always,0,,,,,,29
+1987,Centipede@AS_VENOMDUST,attack,140,1,2000,0,10000,yes,target,always,0,,,,,,29
+1987,Centipede@NPC_POISON,attack,176,5,500,800,5000,no,target,always,0,,,,,,
+1987,Centipede@NPC_POISONATTACK,attack,188,10,1000,0,5000,yes,target,always,0,,,,,,
+1987,Centipede@NPC_COMBOATTACK,angry,171,5,500,700,5000,no,target,always,0,,,,,,
+1987,Centipede@WZ_QUAGMIRE,attack,92,5,500,700,5000,no,target,always,0,,,,,,11
+1987,Centipede@WZ_QUAGMIRE,chase,92,5,500,700,5000,no,target,always,0,,,,,,11
+1987,Centipede@HW_GANBANTEIN,attack,483,5,10000,500,7000,no,target,always,0,,,,,,
+1987,Centipede@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,
+1987,Centipede@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,36,0x3795,,,,
+1988,Nepenthes@NPC_GROUNDATTACK,angry,185,10,500,500,5000,no,target,always,0,,,,,,
+1988,Nepenthes@NPC_GROUNDATTACK,attack,185,8,500,500,5000,yes,target,always,0,,,,,,
+1988,Nepenthes@NPC_ENERGYDRAIN,attack,200,1,1000,0,5000,yes,target,always,0,,,,,,
+1988,Nepenthes@NPC_ENERGYDRAIN,angry,200,1,500,0,5000,yes,target,always,0,,,,,,
+1988,Nepenthes@NPC_STUNATTACK,attack,179,5,1000,0,5000,yes,target,always,0,,,,,,
+1988,Nepenthes@NPC_POISONATTACK,attack,188,10,1000,0,5000,yes,target,always,0,,,,,,
+1989,Hill Lion@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1989,Hill Lion@SM_PROVOKE,chase,6,10,1000,600,5000,no,target,always,0,,,,,,4
+1989,Hill Lion@NPC_CRITICALWOUND,attack,673,5,3000,0,5000,yes,target,always,0,,,,,,
+1989,Hill Lion@NPC_CRITICALSLASH,attack,170,1,3000,0,5000,yes,target,always,0,,,,,,
+1989,Hill Lion@NPC_COMBOATTACK,angry,171,5,500,700,5000,no,target,always,0,,,,,,
+1990,Hardrock Mammoth@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1990,Hardrock Mammoth@NPC_STONESKIN,idle,675,5,10000,0,30000,yes,self,always,0,,,,,,6
+1990,Hardrock Mammoth@NPC_STONESKIN,chase,675,5,10000,0,30000,yes,self,always,0,,,,,,6
+1990,Hardrock Mammoth@NPC_STONESKIN,attack,675,5,10000,0,30000,yes,self,always,0,,,,,,6
+1990,Hardrock Mammoth@NPC_SUMMONSLAVE,attack,196,3,10000,2000,5000,no,self,slavele,4,1997,1997,1997,,,
+1990,Hardrock Mammoth@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,,,,,,,
+1990,Hardrock Mammoth@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,,,,,,,
+// 1990,Hardrock Mammoth@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,
+// 1990,Hardrock Mammoth@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,36,0x37B5,,,,
+1990,Hardrock Mammoth@WZ_WATERBALL,chase,86,10,2000,2000,10000,no,target,always,0,,,,,,
+1990,Hardrock Mammoth@WZ_WATERBALL,attack,86,10,2000,2000,10000,no,target,always,0,,,,,,
+1990,Hardrock Mammoth@LK_SPIRALPIERCE,attack,397,5,2000,500,5000,yes,target,always,0,,,,,,
+1990,Hardrock Mammoth@KN_TWOHANDQUICKEN,attack,60,20,10000,0,120000,yes,self,myhpltmaxrate,30,,,,,,36
+1990,Hardrock Mammoth@NPC_WIDESTUN,chase,678,5,10000,1300,180000,no,self,always,0,,,,,,36
+1990,Hardrock Mammoth@NPC_WIDESTUN,attack,678,5,10000,1300,180000,no,self,always,0,,,,,,36
+1990,Hardrock Mammoth@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,4
+1990,Hardrock Mammoth@NPC_CRITICALWOUND,attack,673,5,10,0,5000,yes,target,always,0,,,,,,
+1990,Hardrock Mammoth@WZ_EARTHSPIKE,chase,90,5,3000,0,10000,yes,target,always,0,,,,,,
+1990,Hardrock Mammoth@WZ_EARTHSPIKE,attack,90,5,3000,0,10000,yes,target,always,0,,,,,,
+1990,Hardrock Mammoth@NPC_DRAGONFEAR,attack,659,5,10000,0,10000,yes,self,always,,,,,,,
+1990,Hardrock Mammoth@NPC_DRAGONFEAR,chase,659,5,10000,0,10000,yes,self,always,,,,,,,
+1990,Hardrock Mammoth@NPC_EARTHQUAKE,chase,653,10,10000,2000,20000,no,self,myhpltmaxrate,75,,,,,,
+1990,Hardrock Mammoth@NPC_EARTHQUAKE,attack,653,10,10000,2000,20000,no,self,myhpltmaxrate,50,,,,,,
+1990,Hardrock Mammoth@HW_GANBANTEIN,attack,483,5,10000,500,7000,no,target,always,0,,,,,,
+1990,Hardrock Mammoth@NPC_ALLHEAL,idle,687,1,3000,10000,30000,yes,self,myhpltmaxrate,50,,,,,,
+1990,Hardrock Mammoth@NPC_ALLHEAL,walk,687,1,3000,10000,30000,yes,self,myhpltmaxrate,50,,,,,,
+1991,Tendril Lion@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1991,Tendril Lion@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,4
+// 1991,Tendril Lion@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x81,,,,
+// 1991,Tendril Lion@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,36,0x37B5,,,,
+1991,Tendril Lion@NPC_CRITICALWOUND,attack,673,5,10,0,5000,yes,target,always,0,,,,,,
+1991,Tendril Lion@MO_BODYRELOCATION,chase,264,1,2000,500,5000,no,target,always,0,,,,,,29
+1991,Tendril Lion@NPC_WIDESLEEP,chase,668,5,10000,700,35000,no,self,always,0,,,,,,
+1991,Tendril Lion@NPC_WIDESLEEP,attack,668,5,10000,700,35000,no,self,myhpltmaxrate,80,,,,,,
+1991,Tendril Lion@NPC_WIDEBLEEDING,attack,665,2,10000,500,100000,no,self,myhpltmaxrate,30,,,,,,
+1991,Tendril Lion@SM_MAGNUM,attack,7,20,3000,0,2000,no,self,always,0,,,,,,
+1991,Tendril Lion@WZ_EARTHSPIKE,attack,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1991,Tendril Lion@WZ_EARTHSPIKE,chase,90,6,2500,200,5000,no,target,always,0,,,,,,,
+1991,Tendril Lion@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,
+1991,Tendril Lion@NPC_COMBOATTACK,angry,171,5,500,700,5000,no,target,always,0,,,,,,
+1991,Tendril Lion@HW_GANBANTEIN,attack,483,5,10000,500,7000,no,target,always,0,,,,,,
+1991,Tendril Lion@AS_SONICBLOW,attack,136,10,500,800,5000,no,target,always,0,,,,,,3
+1991,Tendril Lion@NPC_DRAGONFEAR,attack,659,5,10000,0,10000,yes,self,always,,,,,,,
+1991,Tendril Lion@NPC_DRAGONFEAR,chase,659,5,10000,0,10000,yes,self,always,,,,,,,
+1991,Tendril Lion@NPC_GROUNDATTACK,attack,185,5,2000,0,5000,no,target,always,0,,,,,,
+1991,Tendril Lion@PF_SPIDERWEB,idle,405,1,3000,0,10000,yes,target,always,0,,,,,,
+1991,Tendril Lion@PF_SPIDERWEB,attack,405,1,2000,0,10000,yes,target,always,0,,,,,,
+1991,Tendril Lion@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,
+1991,Tendril Lion@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
+1991,Tendril Lion@NPC_SUMMONSLAVE,attack,196,5,10000,700,30000,no,self,slavele,3,1998,,,,,
+1991,Tendril Lion@NPC_SUMMONSLAVE,idle,196,5,10000,700,30000,no,self,slavele,3,1998,,,,,
+1991,Tendril Lion@NPC_SUMMONSLAVE,chase,196,5,10000,700,30000,no,self,slavele,3,1998,,,,,
+1991,Tendril Lion@NPC_ALLHEAL,idle,687,1,3000,10000,30000,yes,self,myhpltmaxrate,50,,,,,,
+1991,Tendril Lion@NPC_ALLHEAL,walk,687,1,3000,10000,30000,yes,self,myhpltmaxrate,50,,,,,,
+1992,Cornus@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1992,Cornus@CR_REFLECTSHIELD,attack,252,6,10000,0,300000,yes,self,always,0,,,,,,32
+1992,Cornus@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,4
+1992,Cornus@NPC_CRITICALWOUND,attack,673,4,10,0,5000,yes,target,always,0,,,,,,
+1992,Cornus@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,
+1992,Cornus@NPC_COMBOATTACK,angry,171,4,500,700,5000,no,target,always,0,,,,,,
+1992,Cornus@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,32
+1992,Cornus@NPC_ALLHEAL,idle,687,1,3000,5000,30000,yes,self,always,0,,,,,,
+1992,Cornus@NPC_ALLHEAL,walk,687,1,3000,5000,30000,yes,self,always,0,,,,,,
+1993,Naga@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1993,Naga@KN_SPEARBOOMERANG,chase,59,5,500,0,5000,yes,target,always,0,,,,,,29
+1993,Naga@KN_PIERCE,attack,56,10,500,700,5000,no,target,always,0,,,,,,6
+1993,Naga@KN_BRANDISHSPEAR,attack,57,20,2000,500,5000,no,target,always,0,,,,,,29
+1993,Naga@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,4
+1993,Naga@WZ_WATERBALL,chase,86,4,3000,600,5000,yes,target,always,0,,,,,,,
+1993,Naga@WZ_WATERBALL,attack,86,4,3000,600,5000,yes,target,always,0,,,,,,,
+1994,Luciola Vespa@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1994,Luciola Vespa@NPC_PIERCINGATT,attack,158,10,500,0,5000,yes,target,always,0,,,,,,
+1994,Luciola Vespa@NPC_POISONATTACK,attack,188,10,1000,0,5000,yes,target,always,0,,,,,,
+1994,Luciola Vespa@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,32
+1994,Luciola Vespa@NPC_COMBOATTACK,angry,171,4,500,700,5000,no,target,always,0,,,,,,
+1995,Pinguicula@AL_HEAL,chase,28,8,10000,500,5000,no,friend,friendhpltmaxrate,80,,,,,,18
+1995,Pinguicula@AL_HEAL,attack,28,8,10000,500,5000,no,friend,friendhpltmaxrate,80,,,,,,18
+1995,Pinguicula@AL_HEAL,chase,28,8,10000,500,5000,no,self,myhpltmaxrate,60,,,,,,18
+1995,Pinguicula@AL_HEAL,attack,28,8,10000,500,5000,no,self,myhpltmaxrate,60,,,,,,18
+1995,Pinguicula@AL_HEAL,idle,28,8,3000,0,1500,yes,friend,friendhpltmaxrate,99,,,,,,3
+1995,Pinguicula@AL_HEAL,idle,28,8,3000,0,1500,yes,self,myhpltmaxrate,99,,,,,,3
+1995,Pinguicula@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,9
+1995,Pinguicula@NPC_GROUNDATTACK,attack,185,5,2000,0,5000,no,target,always,0,,,,,,
+1995,Pinguicula@NPC_STUNATTACK,attack,179,5,500,1500,5000,no,target,always,0,,,,,,6
+1995,Pinguicula@NPC_SLEEPATTACK,attack,182,5,500,0,5000,yes,target,always,0,,,,,,9
+1997,Tatacho@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1997,Tatacho@BS_HAMMERFALL,chase,110,5,2000,0,5000,yes,target,always,,,,,,,
+1997,Tatacho@BS_HAMMERFALL,attack,110,5,2000,0,5000,yes,target,always,,,,,,,
+1997,Tatacho@NPC_STUNATTACK,attack,179,5,1000,0,5000,yes,target,always,0,,,,,,
+1997,Tatacho@HW_GANBANTEIN,attack,483,5,10000,500,7000,no,target,always,0,,,,,,
+1998,Hill Lion@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
+1998,Hill Lion@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,4
+1998,Hill Lion@NPC_CRITICALWOUND,attack,673,5,10,0,5000,yes,target,always,0,,,,,,
+1998,Hill Lion@NPC_CRITICALSLASH,attack,170,1,1000,0,5000,yes,target,always,0,,,,,,
+1998,Hill Lion@NPC_COMBOATTACK,angry,171,5,500,700,5000,no,target,always,0,,,,,,
+1999,Centipede Larva@AS_VENOMDUST,idle,140,1,2000,0,10000,yes,randomtarget,always,0,,,,,,29
+1999,Centipede Larva@AS_VENOMDUST,attack,140,1,2000,0,10000,yes,target,always,0,,,,,,29
+1999,Centipede Larva@NPC_POISON,attack,176,5,500,800,5000,no,target,always,0,,,,,,
+1999,Centipede Larva@NPC_POISONATTACK,attack,188,10,1000,0,5000,yes,target,always,0,,,,,,
+1999,Centipede Larva@NPC_COMBOATTACK,angry,171,5,500,700,5000,no,target,always,0,,,,,,
+
+
diff --git a/db/packet_db.txt b/db/packet_db.txt
index 540d92c23..560768b88 100644
--- a/db/packet_db.txt
+++ b/db/packet_db.txt
@@ -1208,17 +1208,6 @@ packet_ver: 23
0x0437,7,actionrequest,2:6
0x0438,10,useskilltoid,2:4:6
0x0439,8,useitem,2:4
-0x043d,8
-0x043e,-1
-0x043f,25
-0x0440,10
-0x0441,4
-0x0442,-1
-0x0443,8
-0x0444,-1
-0x0445,10
-0x0446,14
-0x0448,-1
//2008-11-13aSakexe
0x043d,8
@@ -1231,16 +1220,27 @@ packet_ver: 23
0x0441,4
//2008-12-10aSakexe
-0x0442,8
+0x0442,-1
0x0443,8
//2009-01-14aSakexe
-0x043f,19
+0x043f,25
0x0444,-1
0x0445,10
//2009-02-18aSakexe
0x0446,14
+//2009-02-25aSakexe
+0x0448,-1
+
+//2009-03-30aSakexe
+0x0449,4
+
+//2009-04-08aSakexe
+0x02a6,-1
+0x02a7,-1
+0x044a,6
+
//Add new packets here
//packet_ver: 24
diff --git a/db/skill_db.txt b/db/skill_db.txt
index 900c4513a..648550827 100644
--- a/db/skill_db.txt
+++ b/db/skill_db.txt
@@ -1,5 +1,4 @@
//id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description
-//id,range,hit,inf,element,nk,splash,max,list_num,castcancel,cast_defence_rate,inf2,maxcount,skill_type,blow_count,name,description
// 01 ID
// 02 range (combo skills do not check for range when used,
// if range is < 5, the skill is considered melee-range)