- Merged some of the 'plug' items into the main item_db

- Updated sql-files/item_db.sql to latest.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5191 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EVERYTHING ELSE
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
 
+2006/02/05
+	* Updated sql-files/item_db.sql with current item_db. [Skotlex]
 2006/02/04
 	* Skotlex's Falcon Assault fix. [Vicious]
 2006/02/03

db/Changelog.txt

@@ -27,6 +27,8 @@
 
 =========================
 
+02/05
+	* Merged most of the 'plug' items into the main item_db. [Skotlex]
 02/04
 	* Added monster skills and drops to Plasma(all types), Orc baby, green iguana. Thanks [MasterOfMuppets]
 	  to Tharis for providing the info.

db/item_db.txt

@@ -85,6 +85,7 @@
 581,Mushroom,Mushroom,0,40,,20,,,,,16777215,7,2,,,,,,{ itemheal rand(10,14),0; }
 582,Orange,Orange,0,,10,20,,,,,16777215,7,2,,,,,,{ itemheal rand(10,15),rand(10,15); }
 583,Ketupat_,Ketupat,0,,10,150,,,,,16777215,7,2,,,,,,{}
+584,Skewer_Soup,Skewer Soup,0,50,,60,,,,,127918079,7,2,,,,,,{ itemheal rand(45,64),0; }
 
 // Usable Items
 //===================================================================
@@ -1015,6 +1016,7 @@
 2354,Gebney_Armor,Gebney Armor,5,,10,3500,,7,,0,119529470,7,2,16,,54,1,0,{ bonus bVit,2; bonus bMaxHPrate,10; }
 2355,Angel_Protection,Angel Protection,5,,10,600,,4,,1,8388609,7,2,16,,40,1,0,{ bonus bMdef,20; if(isequipped(2116,2420,2521,5125)==0) end; bonus bMaxHP,900; bonus bMaxSP,100; bonus4 bAutoSpellWhenHit,361,1,20,0; }
 2356,Holy_Cloth_of_Benefit,Holy Cloth of Benefit,5,,10,2500,,5,,1,33024,7,2,16,,70,1,,{ bonus bMdef,5; bonus2 bResEff,Eff_Blind,8000; }
+2357,Valkyrie's_Armor,Valkyrie's Armor,5,,10,2800,,6,,1,119529470,2,2,16,,0,1,0,{ bonus bAllStats,1; bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus2 bResEff,Eff_Silence,5000; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus2 bResEff,Eff_Stan,5000; }
 
 // Footgears
 //===================================================================
@@ -1038,6 +1040,7 @@
 2418,Boots_of_Vidar,Boots of Vidar,5,,10,650,,4,,0,119529470,7,2,64,,65,1,0,{ bonus bMaxHPrate,9; bonus bMaxSPrate,9; }
 2419,Gebney's_Combat_Boots,Gebney's Combat Boots,5,,10,700,,4,,0,119529470,7,2,64,,54,1,0,{ bonus bMdef,3; bonus bMaxHPrate,5; bonus bMaxSPrate,5; }
 2420,Second_Advent_of_Angel,Second Advent of Angel,5,,10,10,,0,,1,8388609,7,2,64,,0,1,0,{ bonus bMaxHP,100; }
+2421,Valkyrie's_Shoes,Valkyrie's Shoes,5,,10,500,,4,,1,119529470,2,2,64,,0,1,0,{ bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus bMaxHP,(BaseLevel*5); else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bMaxSP,(JobLevel*2); }
 
 // Garments
 //===================================================================
@@ -1064,6 +1067,7 @@
 2521,Warmth_of_Angel,Warmth of Angel,5,,10,400,,2,,0,8388609,7,2,4,,20,1,0,{ bonus bHPrecovRate,5; }
 2522,Running_Shirt,Running Shirt,5,,10,150,,2,,0,127918079,7,2,4,,0,1,0,{ bonus bMdef,1; if(isequipped(2339)==0) end; bonus bAgi,5; bonus bFlee,10; }
 2523,Running_Shirt_,Running Shirt_,5,,10,150,,2,,1,127918079,7,2,4,,0,1,0,{ bonus bMdef,1; if(isequipped(2339)==0) end; bonus bAgi,5; bonus bFlee,10; }
+2524,Valkyrie's_Manteau,Valkyrie's Manteau,5,,10,500,,3,,1,119529470,2,2,4,,0,1,0,{ bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus bFlee2,5+(getequiprefinerycnt(5)*2); else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bShortWeaponDamageReturn,5+(getequiprefinerycnt(5)*2);}
 
 // Accessories
 //===================================================================
@@ -1131,7 +1135,7 @@
 2665,Ring_of_Exorcism,Ring of Exorcism,5,,10,500,,0,,0,33040,7,2,136,,60,0,0,{ bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; }
 2666,Lamp_of_Hope,Lamp of Hope,5,,,100,,0,,0,127918079,7,2,136,,0,0,0,{ bonus bStr,2; bonus2 bResEff,Eff_Blind,10; }
 2667,Glove_of_Archer,Gloves of Archer,5,,10,300,,0,,0,127918079,7,2,136,,60,0,0,{ bonus bHit,5; bonus bCritical,5; bonus bDex,1; }
-
+2668,Woman_Glory,Woman Glory,5,,10,1500,,1,,0,127918079,7,2,136,,94,,,{ bonus bAllStats,3; bonus bSPrecovRate,20; }
 // Cards
 //===================================================================
 4001,Poring_Card,Poring Card,6,,10,10,,,,,,,,16,,,,,{ bonus bLuk,2; bonus bFlee2,1; }
@@ -1601,8 +1605,16 @@
 5132,Angeling_Hat,Angeling Hat,5,,10,700,,2,,0,127918079,7,2,256,,38,1,204,{ bonus2 bSubRace,RC_DemiHuman,10; }
 5133,Sheep_Hat,Sheep Hat,5,,10,150,,1,,0,33040,7,2,256,,50,1,205,{ bonus bShortWeaponDamageReturn,5; }
 5134,Pumpkin-Head,Pumpkin-Head,5,,10,200,,2,,0,127918079,7,2,256,,0,0,206,{}
-5135,Cyclops_Eye,Cyclops Eye,5,,0,200,,0,,0,119529470,7,2,512,,75,0,207,{ bonus bMaxSP,50; }
+5135,Cyclops_Eye,Cyclops Eye,5,,10,200,,0,,0,119529470,7,2,512,,75,0,207,{ bonus bMaxSP,50; }
 5136,Louise's_Santa_Hat,Louise's Santa Hat,5,,10,100,,3,,0,127918079,7,2,256,,0,1,20,{ bonus bMdef,1; bonus bLuk,1; bonus4 bAutoSpellWhenHit,34,10,10,0; bonus4 bAutoSpellWhenHit,75,5,10,0;}
+5137,Alice_Doll,Alice Doll,5,,10,500,,0,,0,119529470,7,2,256,,30,0,208,{ bonus bStr,1; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEff2,Eff_Freeze,10; }
+5138,Magic_Eyes,Magic Eyes,5,,10,300,,0,,0,67174916,7,2,256,,30,1,209,{ bonus bCastrate,-10; bonus bUseSPrate,20; }
+5139,Lotus,Lotus,5,,10,200,,0,,0,127918079,7,2,256,,10,0,210,{ bonus bDex,1; bonus bInt,1; bonus bMdef,5; }
+5140,Kawaii_Ribbon,Kawaii Ribbon,5,,10,400,,0,,0,127918079,7,2,256,,10,1,211,{ bonus2 bSubRace,RC_Undead,5; bonus2 bSubRace,RC_Demon,5; }
+5141,Marionette_Doll,Marionette Doll,5,,10,400,,0,,0,119529470,7,2,256,,30,1,212,{ bonus bStr,1; }
+5142,Crescent_Helm,Crescent Helm,5,,10,3000,,8,,0,279714,7,2,768,,50,1,213,{ bonus bVit,1; bonus2 bSubRace,RC_DemiHuman,5; }
+5143,Kabuki_Mask,Kabuki Mask,5,,10,1000,,5,,0,119529470,7,2,769,,10,1,214,{ bonus2 bResEff,EFf_Silence,3000; }
+5144,Gamble_Hat,Gambler Hat,5,,10,200,,2,,0,127918079,7,2,256,,0,1,16,{ bonus bLuk,5; }
 
 // More Etc Items
 //===================================================================
@@ -2121,6 +2133,11 @@
 7513,Pocket_Watch,Pocket Watch,3,,10,10,,,,,,0,2,,,,,,{}
 7514,Monster_Ticket,Monster Ticket,3,,10,0,,,,,,0,2,,,,,,{}
 7515,Interesting_Medal,Interesting Medal,3,,10,0,,,,,,0,2,,,,,,{}
+7516,Green_Keycard,Green Keycard,3,,10,0,,,,,,0,2,,,,,,{}
+7517,Gold_Coin,Golden Coin,3,,10,100,,,,,,0,2,,,,,,{}
+7518,Women's_Medal,Women's Medal,3,,10,10,,,,,,0,2,,,,,,{}
+7525,Summer_Festival_Ticket,Summer Festival Ticket,3,,10,10,,,,,,0,2,,,,,,{}
+7526,Application,Application,3,,10,0,,,,,,0,2,,,,,,{}
 
 // Pet Eggs
 //===================================================================
@@ -2324,6 +2341,9 @@
 12130,Cookie_Bag,Cookie Bag,3,,10,70,,,,,127918079,7,2,,,,,,{}
 12131,Lucky_Potion,Lucky Potion,0,,10,100,,,,,127918079,7,2,,,,,,{}
 12132,Santa's_Bag,Santa's Bag,2,,10,200,,,,,127918079,7,2,,,,,,{ sc_start SC_Xmas,600000,0;}
+12133,McDonald's_Ice_Cone,McDonald's Ice Cone,0,50,,80,,,,,127918079,7,2,,,,,,{ itemheal rand(45,64),0; 		// Restores one half of maximum HP and SP and lets you forget about the heat.}
+12134,Red_Envelope_,Red Envelope,2,,10,10,,,,,127918079,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); }
+12135,Green_Ale,Green Ale,2,,10,30,,,,,127918079,7,2,,,,,,{}
 
 // More Weapons
 //===================================================================
@@ -2333,33 +2353,13 @@
 13002,Ginnungagap,Ginnungagap,4,,10,700,120,,1,0,77553391,7,2,2,4,70,1,1,{ bonus bAtkEle,Ele_Dark; bonus2 bAddEff,Eff_Blind,500; bonus2 bAddEff2,Eff_Blind,50; }
 13003,Coward,Coward,4,52000,,700,80,,1,1,77553391,7,2,2,3,55,1,1,{ bonus bDef,5; }
 13004,Coward_,Coward,4,52000,,700,80,,1,2,77553391,7,2,2,3,55,1,1,{ bonus bDef,5; }
-13005,Angel_Wing_Dagger,Angel Wing Dagger,4,,10,10,0,,1,1,,0,2,,0,0,0,0,{}
+13005,Angel_Wing_Dagger,Angel Wing Dagger,4,,10,10,0,,1,1,0,0,2,0,0,0,0,0,{}
 
 
 // Temp Plugs. Someone good with the DB's? If so, please re-check the items and place them accordingly.
-
-12134,Red_Envelope_,Red Envelope,2,,10,10,,,,,127918079,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); }
-7516,Green_Keycard,Green Keycard,3,,10,0,,,,,,0,2,,,,,,{}
-2357,Valkyrie's_Armor,Valkyrie's Armor,5,,10,2800,,6,,1,119529470,2,2,16,,0,1,0,{ bonus bAllStats,1; bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus2 bResEff,Eff_Silence,5000; else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus2 bResEff,Eff_Stan,5000; }
-2421,Valkyrie's_Shoes,Valkyrie's Shoes,5,,10,500,,4,,1,119529470,2,2,64,,0,1,0,{ bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus bMaxHP,(BaseLevel*5); else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bMaxSP,(JobLevel*2); }
-2524,Valkyrie's_Manteau,Valkyrie's Manteau,5,,10,500,,3,,1,119529470,2,2,4,,0,1,0,{ bonus bUnbreakableArmor,0; if(BaseClass==Job_Mage||BaseClass==Job_Archer||BaseClass==Acolyte) bonus bFlee2,5+(getequiprefinerycnt(5)*2); else if(BaseClass==Job_Swordman||BaseClass==Job_Merchant||BaseClass==Job_Thief) bonus bShortWeaponDamageReturn,5+(getequiprefinerycnt(5)*2);}
-584,Skewer_Soup,Skewer Soup,0,50,,60,,,,,127918079,7,2,,,,,,{ itemheal rand(45,64),0; }
-12133,McDonald's_Ice_Cone,McDonald's Ice Cone,0,50,,80,,,,,127918079,7,2,,,,,,{ itemheal rand(45,64),0; }		// Restores one half of maximum HP and SP and lets you forget about the heat.
-5137,Alice_Doll,Alice Doll,5,,10,500,,0,,0,119529470,7,2,256,,30,0,208,{ bonus bStr,1; bonus2 bAddRace,RC_DemiHuman,10; bonus2 bAddEff2,Eff_Freeze,10; }
-5138,Magic_Eyes,Magic Eyes,5,,10,300,,0,,0,67174916,7,2,256,,30,1,209,{ bonus bCastrate,-10; bonus bUseSPrate,20; }
-5139,Lotus,Lotus,5,,10,200,,0,,0,127918079,7,2,256,,10,0,210,{ bonus bDex,1; bonus bInt,1; bonus bMdef,5; }
-5140,Kawaii_Ribbon,Kawaii Ribbon,5,,10,400,,0,,0,127918079,7,2,256,,10,1,211,{ bonus2 bSubRace,RC_Undead,5; bonus2 bSubRace,RC_Demon,5; }
-5141,Marionette_Doll,Marionette Doll,5,,10,400,,0,,0,119529470,7,2,256,,30,1,212,{ bonus bStr,1; }
-5142,Crescent_Helm,Crescent Helm,5,,10,3000,,8,,0,279714,7,2,768,,50,1,213,{ bonus bVit,1; bonus2 bSubRace,RC_DemiHuman,5; }
-5143,Kabuki_Mask,Kabuki Mask,5,,10,1000,,5,,0,119529470,7,2,769,,10,1,214,{ bonus2 bResEff,EFf_Silence,3000; }
-5144,Gamble_Hat,Gambler Hat,5,,10,200,,2,,0,127918079,7,2,256,,0,1,16,{ bonus bLuk,5; }
-2668,Woman_Glory,Woman Glory,5,,10,1500,,1,,0,127918079,7,2,136,,94,,,{ bonus bAllStats,3; bonus bSPrecovRate,20; }
 12136,Women's_Bundle,Women's Bundle,2,,10,100,,,,,127918079,7,2,,,,,,{}							//you can get item ID 558,529,2668,7518
-7518,Women's_Medal,Women's Medal,3,,10,10,,,,,,0,2,,,,,,{}
-//7519,...,
-//7520,...,
-12135,Green_Ale,Green Ale,2,,10,30,,,,,127918079,7,2,,,,,,{}
-7517,Gold_Coin,Golden Coin,3,,10,100,,,,,,0,2,,,,,,{}
-7525,Summer_Festival_Ticket,Summer Festival Ticket,3,,10,10,,,,,,0,2,,,,,,{}
-7526,Application,Application,3,,10,0,,,,,,0,2,,,,,,{}
+//7519,...,,,,,,,,,,,,,,,,,,{}
+//7520,...,,,,,,,,,,,,,,,,,,{}
 585,Brusti,Brusti,0,15,,20,,,,,127918079,7,2,,,,,,{ itemheal rand(17,20),0; }						//TODO: Cast Level 3 Magnificat.
+
+