Updated sql files to latest

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

3 files changed, 59 insertions, 35 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 7b13507e4..a7ef1168c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/05/24
+	* Updated sql files to latest [Toms]
 2008/05/16
 	* Fixed 64bit timestamps messing up auction/storage (bugreport:1454)
 	* Added sd state to track party creation/invitation (bugreport:1180)
diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql
index d2b46ebe2..c0742dedd 100644
--- a/sql-files/item_db.sql
+++ b/sql-files/item_db.sql
@@ -1040,7 +1040,7 @@ REPLACE INTO `item_db` VALUES (2120,'Improved_Arm_Guard_','Improved Arm Guard',5
 REPLACE INTO `item_db` VALUES (2121,'Memory_Book_','Memory Book',5,NULL,10,1000,NULL,3,NULL,1,0x00810204,7,2,32,NULL,0,1,0,' bonus bInt,1; bonus bMdef,2; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2122,'Platinum_Shield','Platinum Shield',5,NULL,10,1200,NULL,5,NULL,0,0xFFFFFFFE,2,2,32,NULL,68,1,1,' bonus bMdef,5; bonus2 bSubSize,1,15; bonus2 bSubSize,2,15; bonus2 bSubRace,RC_Undead,10; bonus5 bAutoSpellWhenHit,671,2,10,BF_MAGIC,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2123,'Orleans_Server','Orleans\' Plate',5,NULL,10,1000,NULL,5,NULL,1,0xFFFFFFFE,2,2,32,NULL,55,1,1,' bonus bMDef,2; bonus bMagicDamageReturn,5; if (isequipped(2701)) bonus bCastrate,-10; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2124,'Thorny_Buckler','Thorny Shield',5,NULL,10,1000,NULL,5,NULL,1,0xFFFFFFFE,2,2,32,NULL,55,1,1,' bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,20; bonus bShortWeaponDamageReturn,5; } ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2124,'Thorny_Buckler','Thorny Shield',5,NULL,10,1000,NULL,5,NULL,1,0xFFFFFFFE,2,2,32,NULL,55,1,1,' bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,10; bonus bShortWeaponDamageReturn,5; } ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2125,'Strong_Shield','Strong Shield',5,NULL,10,2500,NULL,4,NULL,1,0xFFFFFFFE,2,2,32,NULL,75,1,1,' bonus bNoKnockback,0; bonus bNearAtkDef,-20; bonus bLongAtkDef,-20; bonus bMagicAtkDef,-20; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2126,'Guyak_Shield','Guyak Shield',5,NULL,10,700,NULL,3,NULL,0,0xFFFFFFFE,7,2,32,NULL,75,1,1,' bonus bMDef,3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2127,'Secular_Mission','Secular Mission',5,NULL,10,0,NULL,10,NULL,0,0xFFFFFFFF,7,2,32,1,1,0,1,' bonus2 bSubRace,RC_NonBoss,-25; bonus2 bSubRace,RC_Boss,-25; ',NULL,NULL);
@@ -1279,6 +1279,8 @@ REPLACE INTO `item_db` VALUES (2436,'Military_Boots','Military Boots',5,NULL,NUL
 REPLACE INTO `item_db` VALUES (2437,'Combat_Boots','Combat Boots',5,NULL,NULL,0,NULL,3,NULL,1,0x01000000,7,2,64,NULL,80,1,0,' bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2438,'Cat\'s_Paw','Cat\'s Paw',5,NULL,NULL,300,NULL,0,NULL,0,0xFFFFFFFF,7,2,64,NULL,80,1,0,' bonus bFlee,5; bonus bAgi,1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2439,'Refresh_Shoes','Refresh Shoes',5,NULL,NULL,0,NULL,9,NULL,0,0xFFFFFFFF,7,2,64,NULL,0,0,0,' bonus bMaxHPRate,17; bonus bMaxSPRate,8; bonus2 bHPRegenRate,20,10000; bonus2 bSPRegenRate,3,10000; ',NULL,NULL);
+#  **
+REPLACE INTO `item_db` VALUES (2441,'Beach_Sandals','Beach Sandals',5,NULL,NULL,200,NULL,0,NULL,0,0xFFFFFFFF,7,2,64,NULL,0,1,0,' bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10; if (isequipped(2546)) bonus bFlee,5; ',NULL,NULL);
 #  Garments
 # ===================================================================
 REPLACE INTO `item_db` VALUES (2501,'Hood','Hood',5,1000,NULL,200,NULL,1,NULL,0,0xFFFFFFFF,7,2,4,NULL,0,1,0,NULL,NULL,NULL);
@@ -1289,7 +1291,7 @@ REPLACE INTO `item_db` VALUES (2505,'Manteau','Manteau',5,32000,NULL,600,NULL,4,
 REPLACE INTO `item_db` VALUES (2506,'Manteau_','Manteau',5,32000,NULL,600,NULL,4,NULL,1,0x006654E2,7,2,4,NULL,0,1,0,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (2507,'Cape_Of_Ancient_Lord','Ancient Cape',5,82000,NULL,600,NULL,2,NULL,0,0xFFFFFFFE,7,2,4,NULL,40,1,0,' bonus bAgi,1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2508,'Ragamuffin_Cape','Ragamuffin Manteau',5,56000,NULL,500,NULL,1,NULL,0,0xFFFFFFFE,7,2,4,NULL,0,1,0,' bonus bMdef,10; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2509,'Clack_Of_Servival','Survivor\'s Manteau',5,20000,NULL,550,NULL,0,NULL,0,0x00810204,7,2,4,NULL,75,1,0,' bonus bVit,10; if(isequipped(1618) || isequipped(1620)){ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2509,'Clack_Of_Servival','Survivor\'s Manteau',5,20000,NULL,550,NULL,0,NULL,0,0x00810204,7,2,4,NULL,75,1,0,' bonus bMdef,5; bonus bVit,10; if(isequipped(1618) || isequipped(1620)){ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2510,'Novice_Hood','Somber Novice Hood',5,1,NULL,1,NULL,2,NULL,0,0x00000001,7,2,4,NULL,0,0,0,' bonus2 bSubEle,Ele_Neutral,20; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2511,'Skeleton\'s_Cape','Skeleton Manteau',5,5000,NULL,700,NULL,1,NULL,0,0xFFFFFFFE,7,2,4,NULL,75,1,0,' bonus bStr,2; bonus bInt,-3; bonus bDex,2; bonus bVit,-3; bonus bLuk,2; bonus bAgi,-4; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2512,'Novice_Manteau','Novice Manteau',5,50000,NULL,500,NULL,2,NULL,1,0x00000001,7,2,4,NULL,40,1,0,' bonus2 bSubEle,Ele_Neutral,10; ',NULL,NULL);
@@ -1324,6 +1326,8 @@ REPLACE INTO `item_db` VALUES (2540,'Sheriff\'s_Manteau','Sheriff\'s Manteau',5,
 REPLACE INTO `item_db` VALUES (2541,'Aesprika','Aesprika',5,NULL,NULL,400,NULL,5,NULL,0,0xFFFFFFFF,7,2,4,NULL,94,0,0,' bonus bMdef,5; bonus2 bSubEle,Ele_Neutral,30; bonus2 bSubEle,Ele_Water,30; bonus2 bSubEle,Ele_Earth,30; bonus2 bSubEle,Ele_Fire,30; bonus2 bSubEle,Ele_Wind,30; bonus2 bSubEle,Ele_Poison,30; bonus2 bSubEle,Ele_Holy,30; bonus2 bSubEle,Ele_Dark,30; bonus2 bSubEle,Ele_Ghost,30; bonus2 bSubEle,Ele_Undead,30; bonus bFlee,30; skill 26,1; bonus bUnbreakableArmor,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2542,'Naght_Seiger_Manteau','Naght Seiger Flame Manteau',5,NULL,NULL,0,NULL,4,NULL,1,0xFFFFFFFE,7,2,4,NULL,55,0,0,' bonus bMaxHPRate,5; bonus bMdef,2; bonus bMatkRate,1; bonus2 bAddEle,Ele_Fire,2; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2543,'Sylph_Manteau','Sylph Manteau',5,NULL,NULL,0,NULL,9,NULL,0,0xFFFFFFFF,7,2,4,NULL,0,0,0,' bonus bFlee,13; bonus2 bSubEle,Ele_Neutral,13; bonus bFlee2,1; ',NULL,NULL);
+#  **
+REPLACE INTO `item_db` VALUES (2546,'Beach_Manteau','Beach Manteau',5,NULL,NULL,600,NULL,0,NULL,1,0xFFFFFFFF,7,2,4,NULL,0,1,0,' bonus bStr,1; bonus bInt,1; bonus2 bSubEle,Ele_Fire,10; ',NULL,NULL);
 #  Accessories
 # ===================================================================
 REPLACE INTO `item_db` VALUES (2601,'Ring','Ring',5,30000,NULL,100,NULL,0,NULL,0,0xFFFFFFFE,7,2,136,NULL,20,0,0,' bonus bStr,2; ',NULL,NULL);
@@ -1439,7 +1443,7 @@ REPLACE INTO `item_db` VALUES (2711,'Spiritual_Ring_C','Refined Spiritual Ring',
 REPLACE INTO `item_db` VALUES (2712,'Certificate_TW','Collector\'s Edition Book',5,NULL,10,300,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,1,0,0,' bonus bAgi,3; bonus bVit,3; bonus bLuk,3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2714,'Marvelous_Pandent','Marvelous Pendant',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (2715,'Skul_Ring_','Skull Ring',5,10000,NULL,100,NULL,0,NULL,1,0xFFFFFFFF,7,2,136,NULL,0,0,0,' bonus2 bSubRace,RC_Undead,1; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (2716,'Librarian_Gloves','Librarian Gloves',5,NULL,NULL,100,NULL,0,NULL,1,0x00812200,7,2,136,NULL,0,0,0,' bonus MaxSP,20; if (getiteminfo(getequipid(EQI_HAND_R),11) == 15 && isequipped(2717)) bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (2716,'Librarian_Gloves','Librarian Gloves',5,NULL,NULL,100,NULL,0,NULL,1,0x00812200,7,2,136,NULL,0,0,0,' bonus MaxSP,20; if (getiteminfo(getequipid(EQI_HAND_R),11) == 15 && isequipped(2717)) { bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2717,'Pocket_Watch','Pocket Watch',5,NULL,NULL,100,NULL,0,NULL,0,0x00010204,7,2,136,NULL,80,0,0,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (2718,'Lunatic_Brooch','Lunatic Brooch',5,NULL,NULL,100,NULL,0,NULL,1,0x00080808,7,2,136,NULL,65,0,0,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (2719,'Iron_Wrist','Iron Wrist',5,NULL,10,700,NULL,0,NULL,0,0x000444A2,2,2,136,NULL,50,0,0,' bonus2 bSkillAtk,5,6; bonus2 bSkillAtk,42,6; ',NULL,NULL);
@@ -1465,6 +1469,8 @@ REPLACE INTO `item_db` VALUES (2738,'Commemorative_Coin','Shining Commemorative
 REPLACE INTO `item_db` VALUES (2739,'Commemorative_Coin_','General\'s Commemorative Coin',5,NULL,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,7,2,136,NULL,80,0,0,' bonus bAtkRate,5; bonus bMatkRate,5; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2740,'Commemorative_Coin__','Rusty Commemorative Coin',5,NULL,NULL,0,NULL,1,NULL,0,0xFFFFFFFF,7,2,136,NULL,80,0,0,' bonus bAtkRate,3; bonus bMatkRate,3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (2741,'All_In_One_Ring','All In One Ring',5,NULL,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,' skill 28,1; skill 26,1; bonus bNoCastCancel,0; bonus bAllStats,1; bonus bCastrate,10; ',NULL,NULL);
+#  **
+REPLACE INTO `item_db` VALUES (2751,'Academy_of_Badge','Academy of Badge',5,NULL,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,' if(BaseLevel < 80) { bonus bMaxHP,400; bonus bMaxSP,200; } ',NULL,NULL);
 #  Cards
 # ===================================================================
 REPLACE INTO `item_db` VALUES (4001,'Poring_Card','Poring Card',6,NULL,10,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16,NULL,NULL,NULL,NULL,' bonus bLuk,2; bonus bFlee2,1; ',NULL,NULL);
@@ -2301,6 +2307,11 @@ REPLACE INTO `item_db` VALUES (5383,'Hunter_Cap','Hunter Cap',5,NULL,NULL,250,NU
 # REPLACE INTO `item_db` VALUES (5395,'Tiraya_Bonnet','Tiraya Bonnet',5,NULL,NULL,500,NULL,2,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,398,NULL,NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5396,'Jasper_Crest','Jasper Crest',5,NULL,NULL,700,NULL,2,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,399,' bonus bDex,3; bonus bVit,1; ',NULL,NULL);
 # REPLACE INTO `item_db` VALUES (5397,'Scuba_Gear','Scuba Gear',5,0,NULL,100,NULL,0,NULL,0,0xFFFFFFFF,7,2,512,NULL,0,0,400,' bonus2 bSubEle,Ele_Water,10; ',NULL,NULL);
+#  **
+# REPLACE INTO `item_db` VALUES (5400,'Fox_Hat','Fox Mask',5,NULL,10,200,NULL,1,NULL,0,0xFFFFFFFF,7,0,769,NULL,0,1,403,' bonus bLuk,1; ',NULL,NULL);
+#  **
+# REPLACE INTO `item_db` VALUES (5406,'Academy_Freshman_Hat','Academy Freshman Hat',5,NULL,10,200,NULL,1,NULL,0,0xFFFFFFFF,7,0,256,NULL,0,NULL,409,' bonus bMaxHP,80; bonus bMaxSP,10; ',NULL,NULL);
+# REPLACE INTO `item_db` VALUES (5407,'Academy_Completion_Hat','Academy 1st Stage Completion Hat',5,NULL,10,200,NULL,1,NULL,1,0xFFFFFFFF,7,0,256,NULL,0,NULL,410,' bonus bMaxSP,30; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5800,'Blush_Of_Groom','Blush of Groom',5,NULL,NULL,50,NULL,0,NULL,0,0xFFFFFFFF,7,2,512,NULL,0,0,125,' bonus2 bSubRace,RC_DemiHuman,3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5801,'Ribbon_Of_Bride','Red Tailed Ribbon',5,NULL,NULL,100,NULL,5,NULL,0,0xFFFFFFFF,7,2,256,NULL,0,1,167,' bonus bAllStats,2; bonus2 bSubRace,RC_DemiHuman,10; if (getskilllv(29) == 10) { bonus3 bAutoSpellWhenHit,28,10,20; } else { bonus3 bAutoSpellWhenHit,28,5,20; } ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (5802,'Upgrade_Elephant_Hat','Upgraded Elephant Hat',5,NULL,NULL,500,NULL,3,NULL,1,0xFFFFFFFF,7,2,256,NULL,0,1,215,NULL,NULL,NULL);
@@ -3456,7 +3467,7 @@ REPLACE INTO `item_db` VALUES (12232,'GingerBread','Ginger Bread',0,20,NULL,150,
 REPLACE INTO `item_db` VALUES (12233,'Kvass','Kvass',0,20,NULL,200,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 100,100; ',NULL,NULL);
 # Valentine's Day Event (2007)
 REPLACE INTO `item_db` VALUES (12234,'Cacao99','Fierce Cacao 99%',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 25,0; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12235,'Strawberry_Choco','Strawberry Chocolate',11,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 0,5; skilleffect 34,0; sc_start SC_BLESSING,240000,10; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12235,'Strawberry_Choco','Strawberry Chocolate',2,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 0,5; skilleffect 34,0; sc_start SC_BLESSING,240000,10; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12236,'Choco_Tart','Chocolate Tart',11,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 5,0; itemskill 33,5; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12237,'Choco_Lump','Dollop of Chocolate',2,NULL,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' percentheal 0,5; sc_start SC_Poison,18000,0; sc_start SC_Bleeding,18000,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12238,'New_Year_Rice_Cake_1','New Year Rice Cake',0,20,NULL,100,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
@@ -3498,7 +3509,7 @@ REPLACE INTO `item_db` VALUES (12272,'Military_Rations_B','Military Rations B',0
 REPLACE INTO `item_db` VALUES (12273,'Military_Rations_C','Military Rations C',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCFLEE,600000,33; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12274,'Daehwandan','Daehwandan',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCMHPRATE,36000000,5; percentheal 10,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12275,'Taecheongdan','Taecheongdan',0,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCMSPRATE,36000000,5; percentheal 0,10; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (12279,'Undead_Element_Scroll','Shadow Armor Scroll',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start4 SC_ARMOR_ELEMENT,300000,20,20,20,20; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (12279,'Undead_Element_Scroll','Shadow Armor Scroll',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (12280,'Holy_Element_Scroll','Holy Armor Scroll',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' specialeffect2 91; sc_start SC_BENEDICTIO,300000,1; ',NULL,NULL);
 # Net Cafe Premium
 REPLACE INTO `item_db` VALUES (12298,'SP_Reduction_Potion','SP Reduction Potion',0,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_SPCOST_RATE,36000000,15; ',NULL,NULL);
@@ -3657,7 +3668,7 @@ REPLACE INTO `item_db` VALUES (13030,'Dragon_Killer_','Dragon Killer',4,NULL,10,
 REPLACE INTO `item_db` VALUES (13031,'Sword_Breaker_','Swordbreaker',4,NULL,10,1000,70,NULL,1,3,0x028F5EEE,7,2,2,4,36,1,1,' bonus bBreakWeaponRate,500; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13032,'Mail_Breaker_','Mailbreaker',4,NULL,10,1000,70,NULL,1,3,0x028F5EEE,7,2,2,4,36,1,1,' bonus bBreakArmorRate,500; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13033,'Assasin_Dagger_','Assassin Dagger',4,NULL,10,600,140,NULL,1,1,0x00001000,7,2,2,4,36,1,1,' bonus bMaxHPrate,20; bonus bMaxSPrate,15; bonus bAspdRate,2; bonus bAtkEle,Ele_Dark; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (13034,'Twilight_Desert','Desert Twilight',4,NULL,NULL,600,130,NULL,1,2,0x00001000,2,2,2,3,70,1,1,' if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddRace,RC_DemiHuman,30; bonusautoscript "{ sc_start SC_INCASPDRATE,7000,100; }",10; } ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (13034,'Twilight_Desert','Desert Twilight',4,NULL,NULL,600,130,NULL,1,2,0x00001000,2,2,2,3,70,1,1,' if (isequipped(13035)) { bonus bMaxSP,20; bonus bMaxHPRate,5; bonus bHit,10; bonus2 bAddSize,2,30; bonusautoscript "{ sc_start SC_INCASPDRATE,7000,100; }",10; } ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13035,'Sandstorm','Desert Winds',4,NULL,NULL,600,50,NULL,1,4,0x00001000,2,2,2,2,70,1,1,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (13036,'Assassin_Dagger','Assassin Dagger',4,NULL,0,0,120,NULL,1,0,0x029E7CEB,7,2,2,3,80,1,1,' bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja) bonus bMatkRate,15; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13037,'Assassin_Dagger_','Assassin Dagger',4,NULL,0,0,120,NULL,1,0,0x029E7CEB,7,2,2,3,80,1,1,' bonus bStr,1; bonus bAgi,1; bonus2 bAddRace,RC_DemiHuman,75; bonus bUnbreakableWeapon,0; if (Class == Job_Ninja) bonus bMatkRate,15; ',NULL,NULL);
@@ -4129,6 +4140,14 @@ REPLACE INTO `item_db` VALUES (13894,'Earth_Converter_Box','Earth Converter Box'
 REPLACE INTO `item_db` VALUES (13902,'Fish_Head_Box','Fish Head Box',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 5380,1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13903,'Santa_Poring_Box','Santa Poring Box',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 5381,1; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (13904,'Bell_Ribbon_Box','Bell Ribbon Box',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 5382,1; ',NULL,NULL);
+#  **
+REPLACE INTO `item_db` VALUES (14221,'Amplification_10_Scroll_Box','Mystical Amplification Scroll 10ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14593,10; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14222,'Amplification_30_Scroll_Box','Mystical Amplification Scroll 30ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14593,30; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14223,'Amplification_50_Scroll_Box','Mystical Amplification Scroll 50ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14593,50; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14224,'Quagmire_10_Scroll_Box','Quagmire Scroll 10ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14594,10; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14225,'Quagmire_30_Scroll_Box','Quagmire Scroll 30ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14594,30; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14226,'Quagmire_50_Scroll_Box','Quagmire Scroll 50ea Box',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' getitem 14594,50; ',NULL,NULL);
+#  **
 REPLACE INTO `item_db` VALUES (14508,'Zeny_Pet_Egg_Scroll','Zeny Pet Egg Scroll',2,20,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (14509,'Light_Center_Pot','Light Concentration Potion',2,NULL,NULL,20,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_ASPDPOTION0,1800000,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14510,'Light_Awakening_Pot','Light Awakening Potion',2,NULL,NULL,20,NULL,NULL,NULL,NULL,0xFFF7FEEF,7,2,NULL,NULL,40,NULL,NULL,' sc_start SC_ASPDPOTION1,1800000,0; ',NULL,NULL);
@@ -4162,10 +4181,10 @@ REPLACE INTO `item_db` VALUES (14537,'Regeneration_Potion','Regeneration Potion'
 REPLACE INTO `item_db` VALUES (14538,'Glass_of_Illusion','Glass of Illusion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (14539,'Shadow_Armor_S','Shadow Armor Scroll',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Dark,1,0; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14540,'Holy_Armor_S','Holy Armor Scroll',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' specialeffect2 91; sc_start4 SC_ELEMENTALCHANGE,1800000,1,Ele_Holy,1,0; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14541,'S_Def_Potion','Small Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCDEFRATE,60000,3; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14542,'B_Def_Potion','Big Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCDEFRATE,180000,3; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14543,'S_Mdef_Potion','Small Magic Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCMDEFRATE,60000,3; ',NULL,NULL);
-REPLACE INTO `item_db` VALUES (14544,'B_Mdef_Potion','Big Magic Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_INCMDEFRATE,180000,3; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14541,'S_Def_Potion','Small Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_DEF_RATE,60000,3; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14542,'B_Def_Potion','Big Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_DEF_RATE,180000,3; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14543,'S_Mdef_Potion','Small Magic Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_MDEF_RATE,60000,3; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14544,'B_Mdef_Potion','Big Magic Defense Potion',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_MDEF_RATE,180000,3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14545,'Battle_Manual_x3','Field Manual 300%',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' sc_start SC_EXPBOOST,1800000,300; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14546,'Firecracker_Love','Love You Firecracker',2,NULL,1,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' misceffect(682); ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14547,'Firecracker_Wday','White Day Firecracker',2,NULL,1,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' misceffect(683); ',NULL,NULL);
@@ -4207,3 +4226,6 @@ REPLACE INTO `item_db` VALUES (14582,'Yellow_Butterfly_Wing','Yellow Butterfly W
 REPLACE INTO `item_db` VALUES (14583,'Green_Butterfly_Wing','Green Butterfly Wing',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' callfunc "F_CashCity",2; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14584,'Red_Butterfly_Wing','Red Butterfly Wing',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' callfunc "F_CashCity",3; ',NULL,NULL);
 REPLACE INTO `item_db` VALUES (14585,'Blue_Butterfly_Wing','Blue Butterfly Wing',2,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' callfunc "F_CashCity",4; ',NULL,NULL);
+#  **
+REPLACE INTO `item_db` VALUES (14593,'Mystical_Amplification_Scroll','Mystical_Amplification_Scroll',11,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' itemskill 366,10; ',NULL,NULL);
+REPLACE INTO `item_db` VALUES (14594,'Quagmire_scroll','Quagmire scroll',11,NULL,NULL,10,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,' itemskill 92,5; ',NULL,NULL);
diff --git a/sql-files/mob_db.sql b/sql-files/mob_db.sql
index 4e3015456..64cc41b89 100644
--- a/sql-files/mob_db.sql
+++ b/sql-files/mob_db.sql
@@ -913,17 +913,17 @@ REPLACE INTO `mob_db` VALUES (1825,'EVENT_GOBLINE_XMAS_','Chistmas Goblin','Chis
 REPLACE INTO `mob_db` VALUES (1826,'EVENT_MYST_','Myst','Myst',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1827,'EVENT_SASQUATCH_','Sasquatch','Sasquatch',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1828,'EVENT_GULLINBURSTI_','Gullinbrusti','Gullinbrusti',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
-REPLACE INTO `mob_db` VALUES (1829,'SWORD_GUARDIAN','Sword Guardian','Sword Master',86,152533,0,155013,122604,2,7590,9140,60,33,1,40,54,65,125,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,1,2122,10,1176,50,0,0,0,0,0,0,4427,1);
-REPLACE INTO `mob_db` VALUES (1830,'BOW_GUARDIAN','Bow Guardian','Bow Master',80,80404,0,50149,23006,12,1840,2520,40,62,1,80,33,90,165,55,14,16,2,7,80,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,1701,50,2367,20,2701,4,0,0,0,0,0,0,0,0,4428,1);
-REPLACE INTO `mob_db` VALUES (1831,'SALAMANDER','Salamander','Salamander',91,97934,0,72000,55000,2,7590,10860,65,50,1,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,7097,3000,994,30,716,100,2680,1,1920,50,2621,1,2364,20,0,0,0,0,4429,1);
-REPLACE INTO `mob_db` VALUES (1832,'IFRIT','Ifrit','Ifrit',99,7700000,0,3154321,3114520,3,13530,17000,40,50,1,180,25,190,199,50,10,12,2,0,83,0x37B5,130,212,384,360,1577160,10000,603,5500,617,5000,616,2000,994,10000,2677,3000,2678,100,2679,100,1471,2000,1133,2000,1473,2000,0,0,0,0,4430,1);
-REPLACE INTO `mob_db` VALUES (1833,'KASA','Kasa','Kasa',85,80375,0,49000,38000,2,3030,3500,23,70,1,110,31,200,140,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2500,994,30,2680,1,2344,10,1730,10,1626,10,0,0,0,0,4431,1);
-REPLACE INTO `mob_db` VALUES (1834,'G_SALAMANDER','Salamander','Salamander',91,97934,0,0,0,2,7590,10860,65,50,1,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,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);
-REPLACE INTO `mob_db` VALUES (1835,'G_KASA','Kasa','Kasa',85,80375,0,0,0,2,3030,3500,23,70,1,110,31,250,140,30,10,12,2,0,63,0x37B5,150,800,600,288,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);
-REPLACE INTO `mob_db` VALUES (1836,'MAGMARING','Magmaring','Magmaring',40,5300,0,2110,1910,1,550,700,25,24,1,60,30,10,60,17,10,12,0,0,43,0x83,300,1472,384,288,0,0,0,0,0,0,0,0,7097,3000,757,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4432,1);
-REPLACE INTO `mob_db` VALUES (1837,'IMP','Imp','Fire Imp',76,46430,0,25200,11077,1,1059,1509,27,50,1,76,30,150,99,10,10,12,0,6,63,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7122,3000,13303,3,7098,2500,1376,10,1972,25,0,0,0,0,0,0,0,0,4433,1);
-REPLACE INTO `mob_db` VALUES (1838,'KNOCKER','Knocker','Knocker',50,7755,0,2202,4023,1,889,990,28,50,1,44,50,62,65,60,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2208,10,2124,3,1732,5,0,0,0,0,4434,1);
-REPLACE INTO `mob_db` VALUES (1839,'BYORGUE','Byorgue','Byorgue',86,38133,0,19000,9500,2,1340,2590,20,13,1,80,12,30,70,10,14,16,1,7,20,0x37B5,170,800,600,360,0,0,0,0,0,0,0,0,1270,50,5096,3,1232,20,12087,500,603,40,2530,1,7110,4365,0,0,0,0,4426,1);
+REPLACE INTO `mob_db` VALUES (1829,'SWORD_GUARDIAN','Sword Guardian','Sword Master',86,152533,0,155013,122604,2,7590,9140,60,33,110,40,54,65,125,65,14,16,2,7,80,0x37B5,170,140,384,288,0,0,0,0,0,0,0,0,7069,3000,1370,30,1163,50,1168,1,2122,10,1176,50,0,0,0,0,0,0,4427,1);
+REPLACE INTO `mob_db` VALUES (1830,'BOW_GUARDIAN','Bow Guardian','Bow Master',80,80404,0,50149,23006,12,1840,2520,40,62,95,80,33,90,165,55,14,16,2,7,80,0x37B5,170,76,384,288,0,0,0,0,0,0,0,0,7069,3000,1723,30,1701,50,2367,20,2701,4,0,0,0,0,0,0,0,0,4428,1);
+REPLACE INTO `mob_db` VALUES (1831,'SALAMANDER','Salamander','Salamander',91,97934,0,72000,55000,2,7590,10860,65,50,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,0,0,0,0,0,0,0,0,7097,3000,994,30,716,100,2680,1,1920,50,2621,1,2364,20,0,0,0,0,4429,1);
+REPLACE INTO `mob_db` VALUES (1832,'IFRIT','Ifrit','Ifrit',99,7700000,0,3154321,3114520,3,13530,17000,40,50,120,180,25,190,199,50,10,12,2,0,83,0x37B5,130,212,384,360,1577160,10000,603,5500,617,5000,616,2000,994,10000,2677,3000,2678,100,2679,100,1471,2000,1133,2000,1473,2000,0,0,0,0,4430,1);
+REPLACE INTO `mob_db` VALUES (1833,'KASA','Kasa','Kasa',85,80375,0,49000,38000,2,3030,3500,23,70,45,110,31,200,140,30,10,12,2,0,63,0x37B5,150,800,600,288,0,0,0,0,0,0,0,0,7097,3000,7122,2500,994,30,2680,1,2344,10,1730,10,1626,10,0,0,0,0,4431,1);
+REPLACE INTO `mob_db` VALUES (1834,'G_SALAMANDER','Salamander','Salamander',91,97934,0,0,0,2,7590,10860,65,50,90,55,44,45,180,25,10,12,2,0,63,0x37B5,160,140,384,288,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);
+REPLACE INTO `mob_db` VALUES (1835,'G_KASA','Kasa','Kasa',85,80375,0,0,0,2,3030,3500,23,70,45,158,31,250,160,30,10,12,2,0,63,0x37B5,150,800,600,288,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);
+REPLACE INTO `mob_db` VALUES (1836,'MAGMARING','Magmaring','Magmaring',40,5300,0,2110,1910,1,550,700,25,24,40,60,30,10,60,17,10,12,0,0,43,0x83,300,1472,384,288,0,0,0,0,0,0,0,0,7097,3000,757,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,4432,1);
+REPLACE INTO `mob_db` VALUES (1837,'IMP','Imp','Fire Imp',76,46430,0,25200,11077,1,1059,1509,27,50,37,76,30,150,99,10,10,12,0,6,63,0x3395,150,824,432,360,0,0,0,0,0,0,0,0,7122,3000,13303,3,7098,2500,1376,10,1972,25,0,0,0,0,0,0,0,0,4433,1);
+REPLACE INTO `mob_db` VALUES (1838,'KNOCKER','Knocker','Knocker',50,7755,0,2202,4023,1,889,990,28,50,25,44,50,62,65,60,10,12,0,6,22,0x191,200,1548,384,288,0,0,0,0,0,0,0,0,997,30,1003,150,1040,5500,2286,1,2208,10,2124,3,1732,5,0,0,0,0,4434,1);
+REPLACE INTO `mob_db` VALUES (1839,'BYORGUE','Byorgue','Byorgue',86,38133,0,19000,9500,2,1340,2590,20,13,25,80,12,30,70,10,14,16,1,7,20,0x37B5,170,800,600,360,0,0,0,0,0,0,0,0,1270,50,5096,3,1232,20,12087,500,603,40,2530,1,7110,4365,0,0,0,0,4426,1);
 REPLACE INTO `mob_db` VALUES (1840,'GOLDEN_SAVAGE','Golden Savage','Golden Savage',99,500,0,1,1,1,500,700,100,99,0,1,1,50,120,1,10,12,2,2,42,0xF1,150,1960,960,384,0,0,0,0,0,0,0,0,610,3000,7444,100,616,5,969,500,714,100,5159,1,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1841,'G_SNAKE_','Snake','Boa',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1842,'G_ANACONDAQ_','Anacondaq','Anacondaq',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
@@ -956,11 +956,11 @@ REPLACE INTO `mob_db` VALUES (1867,'BANSHEE','Banshee','Banshee',81,35111,0,1700
 REPLACE INTO `mob_db` VALUES (1868,'G_BANSHEE','Banshee','Banshee',81,35111,0,0,0,1,1666,2609,30,55,30,74,1,120,75,1,10,12,1,6,47,0x3795,150,674,504,504,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);
 REPLACE INTO `mob_db` VALUES (1869,'FLAME_SKULL','Flame Skull','Flame Skull',60,10800,0,3000,2600,1,100,1200,20,40,50,100,30,40,140,110,10,12,0,6,68,0x3195,150,972,648,432,0,0,0,0,0,0,0,0,7005,5000,2425,20,13170,20,958,6000,0,0,0,0,0,0,0,0,0,0,4439,1);
 REPLACE INTO `mob_db` VALUES (1870,'NECROMANCER','Necromancer','Necromancer',88,98000,0,45000,35000,1,3500,4000,0,40,1,50,1,190,166,10,10,12,1,1,89,0x37B5,150,1816,1320,420,0,0,0,0,0,0,0,0,7752,3000,1624,20,932,4500,2532,10,717,100,609,100,7117,1500,0,0,0,0,4440,1);
-REPLACE INTO `mob_db` VALUES (1871,'FALLINGBISHOP','Falling Bishop','Fallen Bishop Hibram',80,3333333,0,1111111,1111111,1,3220,5040,50,0,1,80,15,126,120,20,10,12,1,6,47,0x37B5,150,432,720,360,555555,10000,607,5500,617,5000,617,5000,523,10000,1420,500,2677,500,1422,500,985,5432,1614,2000,0,0,0,0,0,0,4441,1);
+REPLACE INTO `mob_db` VALUES (1871,'FALLINGBISHOP','Fallen Bishop','Fallen Bishop Hibram',80,3333333,0,1111111,1111111,1,3220,5040,50,0,1,80,15,126,120,20,10,12,1,6,47,0x37B5,150,432,720,360,555555,10000,607,5500,617,5000,617,5000,523,10000,1420,500,2677,500,1422,500,985,5432,1614,2000,0,0,0,0,0,0,4441,1);
 REPLACE INTO `mob_db` VALUES (1872,'BEELZEBUB_FLY','Beelzebub Fly','Hell Fly',66,500000,0,0,0,1,1200,2000,25,15,33,105,60,15,72,30,10,12,0,4,84,0x37B5,100,676,576,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);
 REPLACE INTO `mob_db` VALUES (1873,'BEELZEBUB','Beelzebub','Beelzebub',98,6666666,0,0,0,1,4100,4960,40,35,6,110,200,250,120,66,10,12,0,6,88,0x37B5,100,100,576,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);
 REPLACE INTO `mob_db` VALUES (1874,'BEELZEBUB_','Beelzebub','Beelzebub',98,6666666,0,6666666,6666666,2,10000,13410,40,40,6,110,200,250,166,66,10,12,2,6,88,0x37B5,100,212,504,432,3333333,10000,607,5500,617,5000,617,5000,7754,9000,2423,2000,1565,2000,2000,2000,2702,2000,985,5432,742,5500,0,0,0,0,4145,1);
-REPLACE INTO `mob_db` VALUES (1875,'TRISTAN_3RD','Tristan 3RD','Tristan III',80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x37B5,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1875,'TRISTAN_3RD','Tristan 3RD','Dead King',80,43000,0,1,1,2,1366,1626,25,30,5,10,10,69,70,1,10,12,1,1,89,0x3695,175,1816,1152,360,0,0,0,0,0,0,0,0,7754,9000,938,9000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0);
 REPLACE INTO `mob_db` VALUES (1876,'E_LORD_OF_DEATH','Lord of Death','Lord of the Dead',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1877,'G_CRYSTAL','Crystal','Crystal',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1878,'E_SHINING_PLANT','Shining Plant','Shining Plant',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
@@ -1005,16 +1005,16 @@ REPLACE INTO `mob_db` VALUES (1913,'OBJ_FLAG_B','Flag','Flag',1,50,0,0,0,1,7,10,
 REPLACE INTO `mob_db` VALUES (1914,'OBJ_A2','Flag','Flag',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);
 REPLACE INTO `mob_db` VALUES (1915,'OBJ_B2','Flag','Flag',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);
 #  Satan Morroc
-REPLACE INTO `mob_db` VALUES (1916,'MOROCC','Satan Morroc','Satan Morroc',99,60000000,0,0,0,1,7,10,29,65,1,1,1,1,6,30,10,12,2,6,87,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1917,'MOROCC_','Satan Morroc','Satan Morroc',99,60000000,0,0,0,1,7,10,29,65,1,1,1,1,6,30,10,12,2,6,87,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1918,'MOROCC_1','Morroc\'s Shadow','Morroc\'s Shadow',97,190000,0,0,0,1,7,10,20,37,1,1,1,1,6,30,10,12,2,8,26,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1919,'MOROCC_2','Morroc\'s Shadow','Morroc\'s Shadow',97,190000,0,0,0,1,7,10,20,5,1,1,1,1,6,30,10,12,1,6,67,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1920,'MOROCC_3','Morroc\'s Shadow','Morroc\'s Shadow',96,143000,0,0,0,1,7,10,15,30,1,1,1,1,6,30,10,12,1,6,69,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1921,'MOROCC_4','Morroc\'s Shadow','Morroc\'s Shadow',98,150000,0,0,0,1,7,10,18,54,1,1,1,1,6,30,10,12,1,6,68,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1922,'G_MOROCC_1','Morroc\'s Shadow','Morroc\'s Shadow',97,190000,0,0,0,1,7,10,20,37,1,1,1,1,6,30,10,12,2,8,26,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1923,'G_MOROCC_2','Morroc\'s Shadow','Morroc\'s Shadow',97,190000,0,0,0,1,7,10,20,5,1,1,1,1,6,30,10,12,1,6,67,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1924,'G_MOROCC_3','Morroc\'s Shadow','Morroc\'s Shadow',96,143000,0,0,0,1,7,10,15,30,1,1,1,1,6,30,10,12,1,6,69,0x37B5,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);
-REPLACE INTO `mob_db` VALUES (1925,'G_MOROCC_4','Morroc\'s Shadow','Morroc\'s Shadow',98,150000,0,0,0,1,7,10,18,54,1,1,1,1,6,30,10,12,1,6,68,0x37B5,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);
+REPLACE INTO `mob_db` VALUES (1916,'MOROCC','Satan Morroc','Satan Morroc',99,20000000,0,6700000,4500000,2,32000,32001,29,65,140,160,30,250,180,50,10,12,2,6,87,0x37B5,100,76,540,432,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);
+REPLACE INTO `mob_db` VALUES (1917,'MOROCC_','Satan Morroc','Satan Morroc',99,15000000,0,3600000,3000000,2,15000,18000,29,65,140,160,30,250,180,40,10,12,2,6,87,0x37B5,100,76,540,432,3600000,5000,607,5500,617,5000,617,5000,5808,1000,2374,2000,2375,2000,2433,2500,7799,9000,7798,9000,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1918,'MOROCC_1','Morroc Shadow','Morroc Shadow',97,190000,0,61000,140000,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,0,0,0,0,0,0,0,0,2111,10,7799,1000,7798,3000,985,160,7054,4850,2537,3,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1919,'MOROCC_2','Morroc Shadow','Morroc Shadow',97,190000,0,65000,120000,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,0,0,0,0,0,0,0,0,2536,3,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1920,'MOROCC_3','Morroc Shadow','Morroc Shadow',96,143000,0,50000,80000,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,0,0,0,0,0,0,0,0,2508,10,7799,1000,7798,3000,985,160,7054,4850,2728,3,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1921,'MOROCC_4','Morroc Shadow','Morroc Shadow',98,150000,0,51000,70000,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,0,0,0,0,0,0,0,0,2729,5,7799,1000,7798,3000,984,160,7053,3500,0,0,0,0,0,0,0,0,0,0);
+REPLACE INTO `mob_db` VALUES (1922,'G_MOROCC_1','Morroc Shadow','Morroc Shadow',97,120000000,0,0,0,2,7000,8600,20,35,150,152,30,180,186,70,10,12,2,8,26,0x37B5,110,576,540,432,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);
+REPLACE INTO `mob_db` VALUES (1923,'G_MOROCC_2','Morroc Shadow','Morroc Shadow',97,120000000,0,0,0,1,3500,5100,20,5,120,83,20,10,166,50,10,12,1,6,67,0x37B5,150,576,540,432,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);
+REPLACE INTO `mob_db` VALUES (1924,'G_MOROCC_3','Morroc Shadow','Morroc Shadow',96,120000000,0,0,0,1,3400,5000,15,37,40,200,20,60,100,37,10,12,1,6,69,0x37B5,150,212,540,432,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);
+REPLACE INTO `mob_db` VALUES (1925,'G_MOROCC_4','Morroc Shadow','Morroc Shadow',98,120000000,0,0,0,1,3000,4025,18,54,60,60,30,220,125,20,10,12,1,6,68,0x37B5,150,1536,540,432,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);
 #  Most of what's below here is just place-holder data. Nothing concrete yet.
 REPLACE INTO `mob_db` VALUES (1926,'JAKK_H','Jakk','Jakk',38,300,0,0,0,1,5,5,5,30,1,38,38,43,75,45,10,12,1,0,43,0x3695,200,1180,648,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);
 REPLACE INTO `mob_db` VALUES (1927,'WHISPER_H','Whisper','Whisper',34,100,0,0,0,1,5,5,0,45,1,51,14,0,60,0,10,12,0,6,68,0x3195,150,1960,504,960,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);
@@ -1053,9 +1053,9 @@ REPLACE INTO `mob_db` VALUES (1959,'G_ENTWEIHEN_2','Entweihen Ghost','Entweihen
 REPLACE INTO `mob_db` VALUES (1960,'G_ENTWEIHEN_3','Entweihen Ghost','Entweihen Ghost',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1961,'G_ENTWEIHEN_4','Entweihen Ghost','Entweihen Ghost',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
 REPLACE INTO `mob_db` VALUES (1962,'G_ANTONIO','Antoni','Antonio',1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x83,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);
-# New Pet
+#  New Pet
 REPLACE INTO `mob_db` VALUES (1963,'P_CHUNG_E','Chung E','New Year Doll',49,23900,0,2396,993,1,460,1050,8,15,38,65,43,30,90,15,10,12,1,7,40,0x3695,170,1728,816,1188,0,0,0,0,0,0,0,0,7053,4850,740,100,1806,10,518,500,0,0,0,0,0,0,5042,2,0,0,0,0);
-# Monster Mercenaries?
+#  Monster Mercenaries?
 # REPLACE INTO `mob_db` VALUES (1964,'NIGHTMARE','Nightmare','Nightmare',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);
 # REPLACE INTO `mob_db` VALUES (1965,'WILD_RoSE','Wild Rose','Wild Rose',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);
 # REPLACE INTO `mob_db` VALUES (1966,'DOPPELGANGER','Doppelganger','Doppelganger',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);