Item Database updates.

- Updated Memory of Wedding effect, and some item names.
- Added the Diablos item set information.
- Added cast-delay reduction to Diablos Robe.

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

2 files changed, 17 insertions, 12 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index f43d2bdd0..7b3d6aeee 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -33,6 +33,11 @@
 	13034 Desert_Twilight		Small chance to activate max Attack Speed for 7 seconds.
 
 =======================
+10/14
+	* Rev. 11475 Item Database updates. [L0ne_W0lf]
+	- Updated Memory of Wedding effect, and some item names.
+	- Added the Diablos item set information.
+	- Added cast-delay reduction to Diablos Robe.
 10/13
 	* Fixed duration of NPC_POWERUP [Playtester]
 10/12
diff --git a/db/item_db.txt b/db/item_db.txt
index 5f9b5a1b7..2bb2aa5e1 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -182,7 +182,7 @@
 678,Poison_Bottle,Poison Bottle,0,5000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ if(Class == Job_Assassin_Cross) { sc_start SC_DPoison,60000,0; sc_start SC_ASPDPOTION2,60000,0; } else percentheal -100,-100; },{},{}
 679,Gold_Pill,Pilule,0,5000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{}
 680,Magical_Carnation,Magic Carnation,0,,0,1000,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,20; },{},{}
-681,Memory_Of_Wedding,Sweet Memory of Marriage,2,50000,,10,,,,,0xFFFFFFFF,7,3,,,,,,{},{},{}
+681,Memory_Of_Wedding,Sweet Memory of Marriage,2,50000,,10,,,,,0xFFFFFFFF,7,3,,,,,,{ sc_start SC_WEDDING,600000,0; },{},{}
 // ATK/MATK Potions
 682,Realgar_Wine,Distilled Fighting Spirit,0,,0,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ATKPOTION,60000,30; },{},{}
 683,Exorcize_Herb,Herb of Incantation,0,,0,50,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MATKPOTION,60000,30; },{},{}
@@ -986,10 +986,10 @@
 2123,Orleans'_Plate,Orleans' Plate,5,,10,1000,,5,,1,0x0FFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; bonus bMagicDamageReturn,5; if (isequipped(2701)) bonus bCastrate,-10; },{},{}
 2124,Thorny_Shield,Thorny Shield,5,,10,1000,,5,,1,0x0FFFFFFE,2,2,32,,55,1,1,{ bonus bMDef,2; if (isequipped(2702)) { bonus bAspdRate,20; bonus bShortWeaponDamageReturn,5; } },{},{}
 2125,Strong_Shield,Strong Shield,5,,10,2500,,4,,1,0xFFFFFFFE,2,2,32,,75,1,1,{ bonus bNoKnockback,0; bonus bNearAtkDef,-20; bonus bLongAtkDef,-20; bonus bMagicAtkDef,-20; },{},{}
-//2126,±¸¾à_Shield,±¸¾à_Shield,5,,10,700,,3,,0,0xFFFFFFFE,7,2,32,,75,1,1,{ bonus bMDef,3; },{},{}
+2126,Old_Shield,Old_Shield,5,,10,700,,3,,0,0xFFFFFFFE,7,2,32,,75,1,1,{ bonus bMDef,3; },{},{}
 2127,Sakray_Test_Shield,Sakray Test Shield,5,,10,0,,10,,0,0xFFFFFFFF,7,2,32,1,1,0,1,{ bonus2 bSubRace,RC_NonBoss,-25; bonus2 bSubRace,RC_Boss,-25; },{},{}
 2128,Herald_Of_GOD_,Sacred Mission,5,128000,,1600,,5,,1,0x00004000,7,2,32,,83,1,3,{ bonus bVit,3; bonus bInt,2; bonus bMdef,3; bonus bUnbreakableShield,0; },{},{}
-//2129,±¸¸¶ÀÇ_¼º¼­,Unknown Sheild,5,,,600,,5,,0,0x00008100,7,2,32,,50,1,1,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; },{},{}
+2129,Sacred_Scripture,Sacred Scripture,5,,,600,,5,,0,0x00008100,7,2,32,,50,1,1,{ bonus bHPrecovRate,3; bonus bSPrecovRate,3; bonus bInt,1; if(isequipped(1631)) bonus2 bSkillAtk,79,20; bonus3 bAutoSpellWhenHit,77,1,10; },{},{}
 2130,Cross_Shield,Cross Shield,5,,,2000,,6,,0,0x00004000,7,2,32,,80,1,1,{ bonus bStr,1; bonus2 bSkillAtk,251,30; bonus2 bSkillAtk,251,30; bonus bUseSPrate,10; },{},{}
 2131,Book_of_Charms_Volume_1,Book of Chars Vol. 1,5,,,1000,,2,,0,0x00010204,2,2,32,,80,1,1,{ bonus bMDef,3; bonus bInt,2; bonus2 bAddEffWhenHit,Eff_Stun,300; },{},{}
 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 479,5; },{},{}
@@ -1169,8 +1169,8 @@
 2371,G_Strings_,Pantie,5,1000,,100,,4,,1,0xFFFFFFFF,7,2,16,,0,1,0,{},{},{}
 2372,Mage_Coat_,Mage Coat,5,,10,600,,5,,1,0x00810204,7,2,16,,50,1,0,{ bonus bMdef,5; bonus bInt,1; },{},{}
 2373,Holy_Robe_,Holy Robe,5,,10,1700,,7,,1,0x00008110,7,2,16,,60,1,0,{ bonus bMdef,5; bonus2 bSubRace,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; },{},{}
-2374,Diablos_Robe,Diablos Robe,5,,,300,,6,,1,0x00098B1C,2,2,16,,0,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus2 bSkillheal,28,6; },{},{}
-2375,Diablos_Armor,Diablos Armor,5,,,600,,7,,1,0x000654E2,2,2,16,,0,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; },{},{}
+2374,Diablos_Robe,Diablos Robe,5,,,300,,6,,1,0x00098B1C,2,2,16,,0,1,0,{ bonus bMaxSP,150; bonus bMdef,5; bonus2 bSkillheal,28,6; bonus bDelayRate,-10; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
+2375,Diablos_Armor,Diablos Armor,5,,,600,,7,,1,0x000654E2,2,2,16,,0,1,0,{ bonus bStr,2; bonus bDex,1; bonus bMaxHP,150; bonus2 bResEff,Eff_Stun,500; bonus2 bResEff,Eff_Stone,500; if (isequipped(2729)) bonus bAtkRate,3; bonus bMatkRate,3; },{},{}
 // Footgears
 //===================================================================
 2401,Sandals,Sandals,5,400,,200,,1,,0,0xFFFFFFFF,7,2,64,,0,1,0,{},{},{}
@@ -1245,7 +1245,7 @@
 2534,Sakray_Test_Garment,Sakray Test Garment,5,,10,0,,10,,0,0x006654E2,7,2,4,1,1,0,0,{ bonus2 bSubEle,Ele_Neutral,17; bonus bFlee,17; },{},{}
 2535,Clack_of_Survival_C,Refined Survivor's Manteau,5,,0,0,,5,,0,0x00810204,7,2,4,,1,0,0,{ bonus bVit,10; bonus bMdef,10; if (isequipped(1618) || isequipped(1620)) { bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } },{},{}
 2536,Skin_of_Ventoss,Skin of Ventoss,5,,,250,,2,,1,0xFFFFFFFE,7,2,4,,60,0,0,{ bonus bMdef,5; bonus bMaxHP,200; bonus bFlee,10; },{},{}
-2537,Diablos_Manteau,Diablos Manteau,5,,,250,,5,,1,0x000FDF80,2,2,4,,1,0,0,{ bonus2 bSubEle,Ele_Neutral,5; bonus bMaxHP,100; },{},{}
+2537,Diablos_Manteau,Diablos Manteau,5,,,250,,5,,1,0x000FDF80,2,2,4,,1,0,0,{ bonus2 bSubEle,Ele_Neutral,5; bonus bMaxHP,100; if (isequipped(2433)) bonus bMaxHPRate,6; },{},{}
 // Accessories
 //===================================================================
 2601,Ring,Ring,5,30000,,100,,0,,0,0xFFFFFFFE,7,2,136,,20,0,0,{ bonus bStr,2; },{},{}
@@ -2181,8 +2181,8 @@
 5803,Love_Flower_Hat,Love Flower Hat,5,,10,100,,2,,0,0xFFFFFFFF,7,2,256,,0,0,5,{ bonus2 bAddMonsterDropItem,608,100; },{},{}
 5804,Pirate_Eye_Bandage,Pirate Eye Bandage,5,,10,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,13,{},{},{}
 5805,Victorious_Coronet,Victorious Coronet,5,,10,150,,1,,0,0xFFFFFFFF,7,2,256,,70,1,43,{ bonus bMaxHPrate,15; bonus bSPrecovRate,5; },{},{}
-//5806,Poet_³ªÅ»¸®¾ÆÀÇ_Hat,Poet_³ªÅ»¸®¾ÆÀÇ_Hat,5,,10,300,,0,,0,0xFFFFFFFF,7,2,256,,1,0,67,{},{},{}
-//5807,¿ÁÅä¹ö_Pest_Hat,¿ÁÅä¹ö_Pest_Hat,5,,,100,,1,,0,0xFFFFFFFE,7,2,256,,1,0,104,{},{},{}
+5806,Natalie's_Poet_Hat,Natalie's Poet Hat,5,,10,300,,0,,0,0xFFFFFFFF,7,2,256,,1,0,67,{},{},{}
+5807,Octopus_Hat,Octopus Hat,5,,,100,,1,,0,0xFFFFFFFE,7,2,256,,1,0,104,{},{},{}
 5808,Dark_Bashilrium,Dark Bashilrium,5,,,250,,5,,1,0x00CFFF80,2,2,769,,1,0,203,{ bonus2 bResEff,Eff_Stone,2000+(getrefine()*2); bonus2 bResEff,Eff_Freeze,2000+(getrefine()*2); bonus2 bResEff,Eff_Stun,2000+(getrefine()*2); },{},{}
 // More Etc Items
 //===================================================================
@@ -2887,7 +2887,7 @@
 7789,Free_Coupon_6,Free Coupon 6,3,,10,10,,,,,,,,,,,,,{},{},{}
 7790,Free_Coupon_7,Free Coupon 7,3,,10,10,,,,,,,,,,,,,{},{},{}
 7791,Free_Coupon_8,Free Coupon 8,3,,10,10,,,,,,,,,,,,,{},{},{}
-//7792,±¸¾à,±¸¾à,3,,10,10,,,,,,,,,,,,,{},{},{}
+7792,Old,Old,3,,10,0,,,,,,,,,,,,,{},{},{}
 7793,Golden_Apple,Golden Apple,3,,10,0,,,,,,,,,,,,,{},{},{}
 7794,Fate_Crow,Fate Crow,3,,10,10,,,,,,,,,,,,,{},{},{}
 7795,Ami's_Photograph_Collection,Ami's Photograph Collection,3,,10,10,,,,,,,,,,,,,{},{},{}
@@ -2895,9 +2895,9 @@
 7797,Author_Note,Author Note,3,,10,10,,,,,,,,,,,,,{},{},{}
 7798,Darkness_Fragment,Darkness Fragment,3,,10,10,,,,,,,,,,,,,{},{},{}
 7799,Darkness_Crystal,Darkness Crystal,3,,10,10,,,,,,,,,,,,,{},{},{}
-//7800,¸¶·ÂÀÇ_Golden_Apple,¸¶·ÂÀÇ_Golden_Apple,3,,10,0,,,,,,,,,,,,,{},{},{}
+7800,Golden_Charm_Apple,Golden Charm Apple,3,,10,0,,,,,,,,,,,,,{},{},{}
 7801,Girl's_Letter,Girl's Letter,3,,10,10,,,,,,,,,,,,,{},{},{}
-//7802,½ÎÀÎø,½ÎÀÎø,3,,10,10,,,,,,,,,,,,,{},{},{}
+7802,Sun_Oil,Sun Oil,3,,10,10,,,,,,,,,,,,,{},{},{}
 7803,Beginner's_Field_Manual,Beginner's Field Manual,3,,10,10,,,,,,,,,,,,,{},{},{}
 //7804,¼öÇà_Áõ¸í¼­,¼öÇà_Áõ¸í¼­,3,,10,10,,,,,,,,,,,,,{},{},{}
 7805,Brown_Jenoss's_Family_Ring,Brown Jenoss's Family Ring,3,,10,10,,,,,,,,,,,,,{},{},{}
@@ -2955,7 +2955,7 @@
 7883,Reed_Pipe,Reed Pipe,3,,10,0,,,,,,,,,,,,,{},{},{}
 7884,Jade_Plate,Jade Plate,3,,10,0,,,,,,,,,,,,,{},{},{}
 7885,Sacred_Arrow,Sacred Arrow,3,,10,0,,,,,,,,,,,,,{},{},{}
-//7886,ÆϼÒ,ÆϼÒ,3,,10,10,,,,,,,,,,,,,{},{},{}
+7886,Bean_Paste,Bean Paste,3,,10,10,,,,,,,,,,,,,{},{},{}
 7887,Dried_Fruit_Box,Dried Fruit Box,3,,10,30,,,,,,,,,,,,,{},{},{}
 7888,Nut_Bag,Nut Bag,3,,10,30,,,,,,,,,,,,,{},{},{}
 7889,Chicken_Feed,Chicken Feed,3,,10,20,,,,,,,,,,,,,{},{},{}