From d96766497a4c32ca9b3efc2b039b4059d6166e8e Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Fri, 3 Dec 2010 16:14:07 +0000 Subject: Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. (burgerport:4569) Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates. As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate. Updated instances with more proper English, care of Resplendent. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14555 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/Changelog.txt | 4 ++ db/item_db.txt | 16 +++---- db/item_misc.txt | 128 +++++++++++++++++++++++++++++++++---------------------- 3 files changed, 89 insertions(+), 59 deletions(-) (limited to 'db') diff --git a/db/Changelog.txt b/db/Changelog.txt index a24d002bf..c4921478f 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,6 +8,10 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= +2010/12/02 + * Rev. 14555 Corrected incorrect bonuses relating to bAddMonsterDropItem/Group. (burgerport:4569) [L0ne_W0lf] + * Updated the IG_Ore, IG_Food, IG_Recovery and IG_Jewel item groups to official items/rates. + - As a result bAddMonsterDropItemGroup now uses the highest rate in group as it's base rate. 2010/12/02 * Rev. 14552 Updated some more cash shop boxes to use rentitem instead of getitem. [L0ne_W0lf] * Added mercenary skills for Mimic, Disguise, Alice, Doppelganger, and Egnigem. diff --git a/db/item_db.txt b/db/item_db.txt index a6d98554a..a2b6a781e 100644 --- a/db/item_db.txt +++ b/db/item_db.txt @@ -492,8 +492,8 @@ 1139,Tale_Fing_,Tirfing,4,20,,1000,200,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bHPLossRate,35,10000; },{},{} 1140,Byeorrun_Gum,Byeollungum,4,20,,900,150,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus2 bSubRace,RC_NonBoss,-10; bonus2 bAddRace,RC_Boss,50; bonus bAllStats,2; },{},{} 1141,Immaterial_Sword,Immaterial Sword,4,20,,900,140,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPVanishRate,30,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{} -1142,Jewel_Sword,Jeweled Sword,4,20,,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Jewel,5; },{},{} -1143,Gaia_Sword,Gaia Sword,4,20,,2500,140,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Ore,5; },{},{} +1142,Jewel_Sword,Jeweled Sword,4,20,,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Jewel,100; },{},{} +1143,Gaia_Sword,Gaia Sword,4,20,,2500,140,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Ore,30; },{},{} 1144,Sasimi,Sashimi,4,20,,1400,75,,1,0,0x000654E2,7,2,2,3,48,1,2,{ bonus bAtkEle,Ele_Wind; bonus3 bAddMonsterDropItem,544,RC_Fish,4000; },{},{} 1145,Holy_Avenger,Holy Avenger,4,450000,,1350,125,,1,0,0x00004000,7,2,2,3,75,1,2,{ bonus bAtkEle,Ele_Holy; bonus bVit,2; },{},{} 1146,Town_Sword,Town Sword,4,42000,,800,100,,1,1,0x00000001,7,2,2,3,30,1,2,{},{},{} @@ -1833,7 +1833,7 @@ 4149,Gargoyle_Card,Gargoyle Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,RC_Insect,100; },{},{} 4150,Goat_Card,Goat Card,6,20,,10,,,,,,,,16,,,,,{ if(getrefine()<6) { bonus bDef,2; bonus bMdef,5; } },{},{} 4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{} -4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItemGroup,IG_Juice,RC_Insect,900; },{},{} +4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,533,RC_Insect,300; },{},{} 4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; if(isequipped(4247,4273)) { bonus3 bAddMonsterDropItem,544,RC_Fish,3000; bonus2 bAddEle,Ele_Water,30; } },{},{} 4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{} 4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{} @@ -1896,11 +1896,11 @@ 4212,Bon_Gun_Card,Bongun Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"SM_BASH",1,20; bonus2 bAddSkillBlow,"SM_BASH",5; bonus2 bAddDefClass,1026,-100; },{},{} 4213,Brilight_Card,Brilight Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,600; },{},{} 4214,Bloody_Murderer_Card,Bloody Murderer Card,6,20,,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Insect,7; },{},{} -4215,Blazzer_Card,Blazer Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Food,500; },{},{} +4215,Blazzer_Card,Blazer Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Food,600; },{},{} 4216,Sasquatch_Card,Sasquatch Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,600; },{},{} 4217,Live_Peach_Tree_Card,Enchanted Peach Tree Card,6,20,,10,,,,,,,,32,,,,,{ bonus3 bAutoSpell,"AL_HEAL",1+9*(getskilllv("AL_HEAL")==10),20; if(isequipped(4280,4185,4293,4312)) { bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass == Job_Acolyte) { bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; } } },{},{} 4218,Succubus_Card,Succubus Card,6,20,,10,,,,,,,,16,,,,,{ bonus bMaxHP,1000; if (isequipped(4269)) { bonus bVit,1; bonus bHPrecovRate,10; } else { bonus bVit,-3; bonus bHPrecovRate,-20; } },{},{} -4219,Sageworm_Card,Sage Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Gemstone,90; },{},{} +4219,Sageworm_Card,Sage Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItem,715,30; bonus2 bAddMonsterDropItem,716,30; bonus2 bAddMonsterDropItem,717,30; },{},{} 4220,Solider_Card,Solider Card,6,20,,10,,,,,,,,16,,,,,{ bonus bDef,2; bonus bMdef,2; },{},{} 4221,Skeleton_General_Card,Skeleton General Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Insect,-20; bonus2 bExpAddRace,RC_Insect,10; },{},{} 4222,Skel_Prisoner_Card,Skeleton Prisoner Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,300+600*(isequipped(4025)); },{},{} @@ -1908,7 +1908,7 @@ 4224,Stem_Worm_Card,Stem Worm Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12032,RC_Brute,100; },{},{} 4225,Stone_Shooter_Card,Stone Shooter Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; bonus bHit,10; },{},{} 4226,Sting_Card,Sting Card,6,20,,10,,,,,,,,32,,,,,{ bonus bDef,2; if(getrefine()>8) bonus bMdef,5; },{},{} -4227,Spring_Rabbit_Card,Spring Rabbit Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Meat,50; bonus3 bAddMonsterDropItemGroup,IG_Meat,RC_Brute,400; },{},{} +4227,Spring_Rabbit_Card,Spring Rabbit Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Meat,50; bonus3 bAddMonsterDropItem,517,RC_Brute,200; bonus3 bAddMonsterDropItem,528,RC_Brute,200; },{},{} 4228,Sleeper_Card,Sleeper Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12031,RC_Fish,100; },{},{} 4229,C_Tower_Manager_Card,Tower Keeper Card,6,20,,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bCastrate,-5; if(isequipped(4244,4299,4313)) { bonus bDef,3; bonus bMdef,3; } },{},{} 4230,Shinobi_Card,Shinobi Card,6,20,,10,,,,,,,,136,,,,,{ bonus bAgi,1; bonus3 bAutoSpellWhenHit,"AS_CLOAKING",5,100; },{},{} @@ -1963,7 +1963,7 @@ 4279,Deleter_Card,Earth Deleter Card,6,20,,10,,,,,,,,16,,,,,{ bonus bSPrecovRate,-100; bonus bSPGainValue,10; },{},{ heal 0,-100; } 4280,Geographer_Card,Geographer Card,6,20,,10,,,,,,,,16,,,,,{ bonus3 bAutoSpellWhenHit,"AL_BLESSING",2+8*(getskilllv("AL_BLESSING")==10),30; },{},{} 4281,Zipper_Bear_Card,Zipper Bear Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus2 bSPDrainValue,-1,0; if(BaseClass == Job_Merchant) bonus bUnbreakableWeapon,0; },{},{} -4282,Tengu_Card,Tengu Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Recovery,500; },{},{} +4282,Tengu_Card,Tengu Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Recovery,600; },{},{} 4283,Greatest_General_Card,Greatest General Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,"MO_CALLSPIRITS",5,2+18*(BaseClass == Job_Acolyte); },{},{} 4284,Chepet_Card,Chepet Card,6,20,,10,,,,,,,,2,,,,,{ bonus4 bAutoSpell,"AL_HEAL",5,50,1; },{},{} 4285,Choco_Card,Choco Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee2,5; bonus bFlee,10; },{},{} @@ -2007,7 +2007,7 @@ 4323,Garm_Baby_Card,Hatii Babe Card,6,20,,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,"MG_FROSTDIVER",3,50+250*isequipped(4324); },{},{} 4324,Garm_Card,Hatii Card,6,20,,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,5000; },{},{} 4325,Harpy_Card,Harpy Card,6,20,,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bSkillAtk,"MG_NAPALMBEAT",5; if(isequipped(4191,4208,4258,4309,4327)) { bonus bMaxHP,500; bonus bDef,5; bonus bMDef,5; bonus2 bSkillAtk,14,10; bonus2 bSkillAtk,19,10; bonus2 bSkillAtk,20,10; if(BaseClass == Job_Mage) { bonus bMatkRate,3; bonus bCastrate,-15; } } },{},{} -4326,See_Otter_Card,Sea-Otter Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Fish,50; bonus3 bAddMonsterDropItemGroup,IG_Fish,RC_Fish,600; },{},{} +4326,See_Otter_Card,Sea-Otter Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Fish,50; bonus3 bAddMonsterDropItem,551,RC_Fish,300; bonus3 bAddMonsterDropItem,544,RC_Fish,300; },{},{} 4327,Blood_Butterfly_Card,Bloody Butterfly Card,6,20,,10,,,,,,,,136,,,,,{ bonus bCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,18,5; },{},{} 4328,Hyegun_Card,Yao Jun Card,6,20,,10,,,,,,,,4,,,,,{ bonus bFlee,15; bonus bCritical,1; if(isequipped(4090,4212)) bonus bAllStats,1; },{},{} 4329,Phendark_Card,Phendark Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_DemiHuman,5; },{},{ heal 0,-5; } diff --git a/db/item_misc.txt b/db/item_misc.txt index 63ef67bed..206342698 100644 --- a/db/item_misc.txt +++ b/db/item_misc.txt @@ -56,43 +56,65 @@ 17,12120,1 // Earth Resist Potion 17,12121,1 // Thunder Resist Potion // Ores -18,756,1 // Rough Oridecon -18,757,1 // Rough Elunium -18,998,1 // Iron -18,999,1 // Steel -18,1002,1 // Iron Ore -18,1003,1 // Coal -18,1010,1 // Phracon -18,1011,1 // Emveretarcon +18,1002,30 // Iron_Ore +18,998,28 // Iron +18,993,26 // Yellow_Live +18,1003,24 // Coal +18,992,22 // Wind_Of_Verdure +18,1010,20 // Phracon +18,991,18 // Crystal_Blue +18,990,16 // Boody_Red +18,999,14 // Steel +18,1011,12 // Emveretarcon +18,757,10 // Elunium_Stone +18,756,9 // Oridecon_Stone +18,997,8 // Great_Nature +18,996,7 // Rough_Wind +18,995,6 // Mistic_Frozen +18,994,5 // Flame_Heart +18,985,4 // Elunium +18,984,3 // Oridecon +18,969,2 // Gold +18,714,1 // Emperium // Food Types -19,512,1 // Apple -19,513,1 // Banana -19,514,1 // Grape -19,515,1 // Carrot -19,516,1 // Potato -19,517,1 // Meat -19,528,1 // Monster Food -19,529,1 // Candy -19,530,1 // Candy Cane -19,544,1 // Raw Fish -19,551,1 // Sushi +19,526,5 // Royal_Jelly +19,12042,10 // Str_Dish02 +19,12057,10 // Agi_Dish02 +19,12068,10 // Vit_Dish03 +19,12062,10 // Dex_Dish02 +19,12068,10 // Luk_Dish03 +19,12047,10 // Int_Dish02 +19,531,30 // Apple_Juice +19,532,30 // Banana_Juice +19,533,30 // Grape_Juice +19,534,30 // Carrot_Juice +19,538,30 // Well_Baked_Cookie +19,536,50 // Ice_Cream +19,544,50 // Fish_Slice +19,548,50 // Cheese +19,551,50 // Shusi +19,553,50 // Bun +19,554,50 // Mojji +19,535,50 // Pumpkin +19,516,100 // Sweet_Potato +19,513,100 // Banana +19,512,600 // Apple // Recovery Types -20,501,1 // Red Potion -20,502,1 // Orange Potion -20,503,1 // Yellow Potion -20,504,1 // White Potion -20,505,1 // Blue Potion -20,506,1 // Green Potion -20,507,1 // Red Herb -20,508,1 // Yellow Herb -20,509,1 // White Herb -20,510,1 // Blue Herb -20,511,1 // Green Herb -20,531,1 // Apple Juice -20,532,1 // Banana Juice -20,533,1 // Grape Juice -20,534,1 // Carrot Juice -// Minerals +20,522,5 // Fruit_Of_Mastela +20,521,5 // Leaflet_Of_Aloe +20,520,10 // Leaflet_Of_Hinal +20,545,10 // Red_Slim_Potion +20,12118,10 // Resist_Earth +20,508,20 // Yellow_Herb +20,501,20 // Red_Potion +20,511,30 // Green_Herb +20,507,30 // Red_Herb +20,569,50 // Novice_Potion +20,549,50 // Nice_Sweet_Potato +20,529,100 // Candy +20,528,200 // Monster's_Feed +20,550,600 // Popped_Rice +// Minerals - Unused 21,714,1 // Emperium 21,756,1 // Rough Oridecon 21,757,1 // Rough Elunium @@ -255,22 +277,26 @@ 26,2718,1 // Lunatic Brooch 26,2719,1 // Iron Wrist // jewels -27,718,1 // Garnet -27,719,1 // Amethyst -27,720,1 // Aquamarine -27,721,1 // Emerald -27,722,1 // Pearl -27,723,1 // Ruby -27,724,1 // Cursed Ruby -27,725,1 // Sardonyx -27,726,1 // Sapphire -27,727,1 // Opal -27,728,1 // Topaz -27,729,1 // Zircon -27,730,1 // 1carat Diamond -27,731,1 // 2carat Diamond -27,732,1 // 3carat Diamond -27,733,1 // Cracked Diamond +27,715,100 // Yellow_Gemstone +27,716,100 // Red_Gemstone +27,717,100 // Blue_Gemstone +27,718,10 // Dark_Red_Jewel +27,719,10 // Violet_Jewel +27,720,10 // Skyblue_Jewel +27,721,10 // Azure_Jewel +27,722,10 // Scarlet_Jewel +27,723,10 // Cardinal_Jewel +27,724,10 // Cardinal_Jewel_ +27,725,10 // Red_Jewel +27,726,10 // Blue_Jewel +27,727,10 // White_Jewel +27,728,10 // Golden_Jewel +27,729,10 // Bluish_Green_Jewel +27,730,5 // Crystal_Jewel +27,731,4 // Crystal_Jewel_ +27,732,3 // Crystal_Jewel__ +27,733,27 // Crystal_Jewel___ +27,746,50 // Glass_Bead // Egg Boy 32,514,300 // Grape 32,564,522 // Rice Ball -- cgit v1.2.3-60-g2f50