Updated some existing items and added some others.

* Changed NPC_BLEEDING in mob_skill_db to be target not self.
* Added Event drops to tarou, cramp, martin. (enable in mob_db2)
* Added new pet: New Year Doll (quest reward) thanks to Yomanda.

Added Lunar new year event for 2008 from iRO. Read comments before enabling.

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

9 files changed, 326 insertions, 25 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 66fadb438..b6def1d0d 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -38,6 +38,10 @@
 
 =======================
 2008/02/07
+	* Rev. 12183 Updated some existing items and added some others. [L0ne_W0lf]
+	* Changed NPC_BLEEDING in mob_skill_db to be target not self.
+	* Added Event drops to tarou, cramp, martin. (enable in mob_db2)
+	* Added new pet: New Year Doll (quest reward) thanks to Yomanda.
 	* Corrected Freezing Trap's type to weapon.
 	* Changed suiton's element to water.
 	* Changed Landmine's trigger area to 0 (1x1, to match its splash range).
diff --git a/db/item_db.txt b/db/item_db.txt
index 20e556400..b30184d5c 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -161,13 +161,13 @@
 660,Prohibition_Red_Candle,Forbidden Red Candle,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1200; },{},{}
 661,Sway_Apron,Soft Apron,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1275; },{},{}
 662,Inspector_Certificate,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect 507; sc_start SC_SpeedUp0,180000,0; },{},{}
-663,Korea_Rice_Cake,Songpyun,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}
+663,Korea_Rice_Cake,Korean Rice Cake,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}
 // Item Givers
 664,Gift_Box_1,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox_1),1; },{},{}
 665,Gift_Box_2,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox_2),1; },{},{}
 666,Gift_Box_3,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox_3),1; },{},{}
 667,Gift_Box_4,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox_4),1; },{},{}
-668,Handsei,Red_Envelope,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); },{},{}
+668,Handsei,Red Envelope,2,0,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(1000,10000); },{},{}
 669,Rice_Cake_Soup,Rice-Cake Soup,0,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal -100,-100; },{},{}
 // Coins
 670,Gold_Coin_Moneybag,Bag of Gold Coins,2,100000,,400,,,,,0xFFFFFFFF,7,3,,,,,,{},{},{}
@@ -1194,13 +1194,13 @@
 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,,55,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; },{},{}
-2376,General's_Plate_Mail,General's Plate Mail,5,,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bAddItemHealRate,IG_Recovery,10; bonusautoscript "{ heal 6000,0; }",10,BF_WEAPON; }; },{},{}
-2377,Elite_Engineer's_Armor,Elite Engineer's Armor,5,,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,42,20; bonus2 bSkillHeal,231,10; bonus bUnbreakableArmor,0; }; },{},{}
-2378,Assassin's_Robe,Assassin's Robe,5,,,0,,7,,1,0x00021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bAgi,3; bonus bCritical,3; bonus bMaxHPRate,12; bonusautoscript "{ heal 3000,0; }",10,BF_WEAPON; }; },{},{}
-2379,Wolong's_Battle_Robe,Wolong's_Battle Robe,5,,,0,,3,,1,0x00010204,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; bonus2 bAddEffWhenHit,Eff_Stone,100; }; },{},{}
-2380,Robe_of_Order,Robe of Order,5,,,0,,3,,1,0x00008110,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bcastRate,156,-50; bonus2 bSkillHeal,28,6; bonus2 bSkillHeal,70,6; bonus2 bAddEffWhenHit,Eff_Stone,100; }; },{},{}
-2381,Elite_Marksman_Suit,Elite Marksman Suit,5,,,0,,3,,1,0x00180808,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }; },{},{}
-2382,Elite_Shooter's_Suit,Elite Shooter's Suit,5,,,0,,3,,1,0x01000000,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,3; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; }; },{},{}
+2376,General's_Plate_Mail,General's Plate Mail,5,,,0,,7,,1,0x006444A2,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bVit,3; bonus bMaxHPRate,12; bonus2 bAddItemHealRate,IG_Recovery,10; bonusautoscript "{ skilleffect 28,6000; heal 6000,0; }",10,BF_WEAPON; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2377,Elite_Engineer's_Armor,Elite Engineer's Armor,5,,,0,,7,,1,0x00040420,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2538) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bStr,3; bonus bMaxHPRate,12; bonus2 bSkillAtk,42,20; bonus2 bSkillHeal,231,10; bonus bUnbreakableArmor,0; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2378,Assassin's_Robe,Assassin's Robe,5,,,0,,7,,1,0x00021040,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2435)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bAgi,3; bonus bCritical,3; bonus bMaxHPRate,12; bonusautoscript "{  skilleffect 28,3000; heal 3000,0; }",10,BF_WEAPON; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2379,Wolong's_Battle_Robe,Wolong's_Battle Robe,5,,,0,,3,,1,0x00010204,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bResEff,Eff_Stun,2000; bonus2 bAddEffWhenHit,Eff_Stone,100; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2380,Robe_of_Order,Robe of Order,5,,,0,,3,,1,0x00008110,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bInt,3; bonus bMaxHPRate,12; bonus2 bcastRate,156,-50; bonus2 bSkillHeal,28,6; bonus2 bSkillHeal,70,6; bonus2 bAddEffWhenHit,Eff_Stone,100; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2381,Elite_Marksman_Suit,Elite Marksman Suit,5,,,0,,3,,1,0x00180808,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
+2382,Elite_Shooter's_Suit,Elite Shooter's Suit,5,,,0,,3,,1,0x01000000,7,2,16,,80,1,0,{ bonus bMaxHP,150; bonus bMdef,2; bonus2 bSubRace,RC_DemiHuman,2; if (isequipped(2539) && isequipped(2436)) { bonus2 bSubRace,RC_DemiHuman,6; bonus bDex,3; bonus bMaxHPRate,12; bonus bLongAtkDef,10; bonus bDelayRate,-25; bonus2 bAddRace,RC_NonBoss,3; bonus2 bAddRace,RC_Boss,3; }; },{},{}
 2383,Brynhildr,Brynhildr,5,,10,400,,10,,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; bonus2 bAddRace2,5,10; bonus bMatkRate,10; bonus bUnbreakableArmor,0; },{},{}
 // Footgears
 //===================================================================
@@ -2227,6 +2227,8 @@
 //5361,Ganster_Scarf,Ganster Scarf,5,,,100,,0,,0,0xFFFFFFFF,7,2,1,,60,0,369,{ bonus bBaseAtk,5; if(BaseJob == Job_Rogue) skill 223,1; },{},{}
 //5362,Ninja's_Scroll,Ninja's Scroll,5,,,200,,0,,0,0xFFFFFFFF,7,2,1,,60,0,370,{ bonus bMatkRate,1; },{},{}
 //5366,Love_Dad_Bandana,Love Dad Bandana,5,,,200,,3,,0,0xFFFFFFFF,7,2,256,,0,1,374,{ bonus bStr,2; },{},{}
+5368,White_Wing,White Wing,5,20,,100,,2,,0,0xFFFFFFFE,7,2,256,,0,1,38,{ bonus2 bAddMonsterDropItem,12279,300; },{},{}
+5369,Dark_Wing,Dark Wing,5,20,,100,,1,,0,0xFFFFFFFE,7,2,256,,0,1,39,{ bonus2 bAddMonsterDropItem,12280,300; },{},{}
 //5370,Orchid_Hairband,Orchid Hairband,5,,,200,,1,,0,0xFFFFFFFF,7,2,256,,0,1,376,{ bonus bInt,1; },{},{}
 5371,Judge_Cap,Judge Cap,5,,,300,,2,,0,0xFFFFFFFF,7,2,256,,0,1,377,{ bonus bLuk,1; bonus bMaxSP,30; },{},{}
 //5372,Koneko_Hat,Koneko Hat,5,,,500,,1,,0,0xFFFFFFFF,7,2,256,,0,1,378,{ bonus bDelayRate,-3; bonus bMatkRate,3; bonus bMaxSPrate,3; bonus bMdef,3; },{},{}
@@ -2932,7 +2934,7 @@
 7767,Chung_E_Cake,Green Maiden's Cake,3,,10,10,,,,,,,,,,,,,{},{},{}
 7768,Squid,Squid,3,,10,10,,,,,,,,,,,,,{},{},{}
 7769,Egg_Yolk,Egg Yolk,3,,10,10,,,,,,,,,,,,,{},{},{}
-7770,Sweat_Rice,Sweat Rice,3,,10,10,,,,,,,,,,,,,{},{},{}
+7770,Sweat_Rice,Sweet Rice,3,,10,10,,,,,,,,,,,,,{},{},{}
 7771,Lotus_Leaf,Lotus Leaf,3,,10,10,,,,,,,,,,,,,{},{},{}
 7772,String,String,3,,10,10,,,,,,,,,,,,,{},{},{}
 7773,Battle_Badge,Battle Badge,3,,10,0,,,,,,,,,,,,,{},{},{}
@@ -3016,7 +3018,7 @@
 7866,Certificate,Certificate,3,,10,0,,,,,,,,,,,,,{},{},{}
 7867,Sesame_Bag,Sesame Bag,3,,10,100,,,,,,,,,,,,,{},{},{}
 7868,Fresh_Water,Fresh Water,3,,10,100,,,,,,,,,,,,,{},{},{}
-7869,Rice_Bag,Rice Bag,3,,10,100,,,,,,,,,,,,,{},{},{}
+7869,Rice_Bag,Rice Pouch,3,,10,100,,,,,,,,,,,,,{},{},{}
 7870,Corn,Corn,3,,10,20,,,,,,,,,,,,,{},{},{}
 7871,Bean_Bag,Bean Bag,3,,10,20,,,,,,,,,,,,,{},{},{}
 7872,Herb,Herb,3,,10,30,,,,,,,,,,,,,{},{},{}
@@ -3083,6 +3085,7 @@
 9035,Deleter_Egg,Deleter Egg,7,,10,0,,,,,,,,,,,,,{},{},{}
 9036,Diabolic_Egg,Diabolic Egg,7,,10,0,,,,,,,,,,,,,{},{},{}
 9037,Wanderer_Egg,Wanderer Egg,7,,10,0,,,,,,,,,,,,,{},{},{}
+9038,Chung_E_Egg_,New year Doll Egg,7,,10,0,,,,,,,,,,,,,{},{},{}
 // Pet Accessories
 //===================================================================
 10001,Skull_Helm,Skull Helm,8,,10,0,,,,,,,,,,,,,{},{},{}
@@ -3331,10 +3334,10 @@
 12192,Pumpkin_Pie,Pumpkin Pie,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12193,Brizel,Brizel,2,,10,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12194,Present_From_Home,Present from Home,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12195,Rich_Rice_Cake,Rich Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12196,Filling_Rice_Cake,Filling Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12197,Salty_Rice_Cake,Salty Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12198,Lucky_Rice_Cake,Lucky Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12195,Rich_Rice_Cake,Plain Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal 0,rand(50,80); },{},{}
+12196,Filling_Rice_Cake,Hearty Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,0; },{},{}
+12197,Salty_Rice_Cake,Salty Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(400,500),rand(20,40); },{},{}
+12198,Lucky_Rice_Cake,Lucky Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCLUK,60000,21; },{},{}
 12199,Rice_Scroll,Rice Scroll,2,,0,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12200,Event_Cake,Event Cake,2,,10,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12201,Red_Box_,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -3394,6 +3397,8 @@
 12273,Military_Rations_C,Military Rations C,0,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCFLEE,600000,33; },{},{}
 12274,Daehwandan,Daehwandan,0,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMHPRATE,36000000,5; percentheal 10,0; },{},{}
 12275,Taecheongdan,Taecheongdan,0,,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMSPRATE,36000000,5; percentheal 0,10; },{},{}
+12279,Undead_Element_Scroll,Shadow Armor Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Fire,20,Ele_Water,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Water,20,Ele_Wind,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Earth,20,Ele_Fire,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Wind,20,Ele_Earth,0; },{},{}
+12280,Holy_Element_Scroll,Holy Armor Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start SC_BENEDICTIO,300000,1; },{},{}
 12701,Old_Blue_Box_F,Old Blue Box,2,,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 //April Fools Day Event (2007)
 12702,Old_Bleu_Box,Old Bleu Box,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_BleuBox),1; getitem groupranditem(IG_BleuBox),1; },{},{}
@@ -3991,11 +3996,11 @@
 14536,Abrasive,Abrasive,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCCRI,300000,30; },{},{}
 14537,Regeneration_Potion,Regeneration Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCHEALRATE,1800000,20; },{},{}
 14538,Glass_of_Illusion,Glass of Illusion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-14539,Shadow_Armor_Scroll,Shadow Armor Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1800000,Ele_Shadow,20,Ele_Holy,-15; },{},{}
-14540,Holy_Armor_Scroll,Holy Armor Scroll,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,1800000,Ele_Holy,20,Ele_Shadow,-15; },{},{}
+14539,Undead_Element_Scroll_,Shadow Armor Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Fire,20,Ele_Water,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Water,20,Ele_Wind,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Earth,20,Ele_Fire,0; sc_start4 SC_ARMOR_ELEMENT,300000,Ele_Wind,20,Ele_Earth,0; },{},{}
+14540,Holy_Element_Scroll_,Holy Armor Scroll,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 91; sc_start SC_BENEDICTIO,300000,1; },{},{}
 14541,Small_Defense_Potion,Small Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEFRATE,60000,3; },{},{}
 14542,Big_Defense_Potion,Big Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEFRATE,180000,3; },{},{}
-14543,Small_Magic_Defense_Potion,Small Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMDEFRATE,600000,3; },{},{}
+14543,Small_Magic_Defense_Potion,Small Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMDEFRATE,60000,3; },{},{}
 14544,Big_Magic_Defense_Potion,Big Magic Defense Potion,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCMDEFRATE,180000,3; },{},{}
 14545,Field_Manual_300%,Field Manual 300%,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,300; },{},{}
 14546,Love_You_Firecracker,Love You Firecracker,2,,1,10,,,,,0xFFFFFFFF,7,2,,,,,,{ misceffect(682); },{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index 6c08aa912..48197eaeb 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -961,3 +961,5 @@
 1923,MORROC_SHADOW_GOLEM,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
 1924,MORROC_SHADOW_HUMAN,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
 1925,MORROC_SHADOW_SPIRIT,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
+//
+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
diff --git a/db/mob_db2.txt b/db/mob_db2.txt
index 6289fc1a0..93e417a8b 100644
--- a/db/mob_db2.txt
+++ b/db/mob_db2.txt
@@ -18,3 +18,9 @@
 //1237,HOLLOW_PORING,Hollow Poring,Hollow Poring,1,50,0,2,1,1,7,10,0,5,1,1,1,0,6,30,10,12,1,3,21,0x83,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,512,150,619,20,0,0,0,0,4001,10
 //Custom Fire Poring. Warning, Colides with META_DENIRO
 //1239,FIRE_PORING,Fire Poring,Fire Poring,1,50,0,2,1,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,131,400,1872,672,480,0,0,0,0,0,0,0,0,909,7000,1202,100,938,400,512,1000,713,1500,741,5,619,20,0,0,0,0,4001,20
+
+//Lunar New Year 2008 Event Monster overrides
+//Uncomment if event is enabled, as these drops modifications are nessecary.
+//1145,MARTIN,Martin,Martin,18,1109,0,134,86,1,52,63,0,5,12,18,30,15,15,5,10,12,0,2,42,0x81,300,1480,480,480,0,0,0,0,0,0,0,0,1017,9000,1018,500,1251,10,2225,5,5009,1,10010,10,2224,15,7869,1500,0,0,4046,1
+//1175,TAROU,Tarou,Tarou,11,284,0,57,28,1,34,45,0,0,1,20,11,10,24,5,10,12,0,2,27,0x91,150,1744,1044,684,0,0,0,0,0,0,0,0,1016,9000,919,3000,949,800,528,1000,701,2,7869,2500,0,0,0,0,0,0,4028,1
+//1209,CRAMP,Cramp,Cramp,56,4720,0,2300,1513,1,395,465,0,5,1,85,35,5,65,60,10,12,0,2,45,0x3095,100,1000,500,1000,0,0,0,0,0,0,0,0,7007,4656,528,1000,726,80,746,110,568,250,510,70,984,95,7869,1500,0,0,4296,1
diff --git a/db/mob_skill_db.txt b/db/mob_skill_db.txt
index 8b840f514..14bc0f41d 100644
--- a/db/mob_skill_db.txt
+++ b/db/mob_skill_db.txt
@@ -568,7 +568,7 @@
 1115,Eddga@MG_FIREBALL,chase,17,20,10000,0,0,yes,target,skillused,18,,,,,,
 1115,Eddga@NPC_CALLSLAVE,attack,352,1,10000,0,30000,yes,self,always,0,,,,,,
 1115,Eddga@NPC_CALLSLAVE,idle,352,1,10000,0,30000,yes,self,always,0,,,,,,
-1115,Eddga@NPC_BLEEDING,attack,660,5,2000,0,3000,yes,self,always,0,,,,,,32
+1115,Eddga@NPC_BLEEDING,attack,660,5,2000,0,3000,yes,target,always,0,,,,,,32
 1115,Eddga@AM_DEMONSTRATION,attack,229,5,2000,0,2000,yes,target,always,0,,,,,,6
 1115,Eddga@AM_DEMONSTRATION,chase,229,5,2000,0,2000,yes,target,always,0,,,,,,6
 1115,Eddga@NPC_SUMMONSLAVE,attack,196,8,10000,700,10000,no,self,slavele,3,1603,,,,,
@@ -4232,7 +4232,7 @@
 1785,Atros@NPC_DEFENDER,idle,205,1,10000,0,5000,yes,self,longrangeattacked,,,,,,,
 1785,Atros@KN_TWOHANDQUICKEN,attack,60,20,2000,0,120000,yes,self,myhpltmaxrate,30,,,,,,36
 1785,Atros@NPC_PULSESTRIKE,attack,661,5,2000,0,30000,yes,self,always,0,,,,,,32
-1785,Atros@NPC_BLEEDING,attack,660,5,1000,0,5000,yes,self,always,0,,,,,,32
+1785,Atros@NPC_BLEEDING,attack,660,5,1000,0,5000,yes,target,always,0,,,,,,32
 1785,Atros@SM_BASH,attack,5,10,1000,0,5000,yes,target,always,0,,,,,,
 1785,Atros@NPC_DARKNESSATTACK,attack,190,3,500,800,5000,no,target,always,0,,,,,,
 1785,Atros@SM_MAGNUM,attack,7,20,10000,0,5000,yes,self,attackpcge,2,,,,,,
@@ -4367,7 +4367,7 @@
 1830,Bow Master@AC_CHARGEARROW,attack,148,1,2000,0,5000,yes,target,always,,,,,,,
 1830,Bow Master@NPC_STUNATTACK,attack,179,5,1500,0,5000,yes,target,always,,,,,,,
 1830,Bow Master@NPC_COMBOATTACK,attack,171,5,1500,0,5000,yes,target,always,,,,,,,
-1830,Bow Master@NPC_BLEEDING,attack,660,5,1500,0,5000,yes,self,always,,,,,,,
+1830,Bow Master@NPC_BLEEDING,attack,660,5,1500,0,5000,yes,target,always,,,,,,,
 1830,Bow Master@NPC_WIDEBLEEDING,attack,665,4,10000,0,15000,yes,self,myhpltmaxrate,40,,,,,,
 1831,Salamander@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,
 1831,Salamander@MG_FIREBALL,idle,17,5,10000,0,5000,yes,target,always,,,,,,,
@@ -4375,7 +4375,7 @@
 1831,Salamander@CR_REFLECTSHIELD,idle,252,3,1000,0,200000,no,self,always,,,,,,,
 1831,Salamander@CR_REFLECTSHIELD,attack,252,3,1000,0,200000,no,self,always,,,,,,,
 1831,Salamander@NPC_FIREATTACK,attack,186,5,2000,1000,200000,no,target,always,,,,,,,
-1831,Salamander@NPC_BLEEDING,attack,660,3,500,500,10000,no,self,always,,,,,,,
+1831,Salamander@NPC_BLEEDING,attack,660,3,500,500,10000,no,target,always,,,,,,,
 1831,Salamander@AS_SONICBLOW,attack,136,10,1000,0,10000,yes,target,always,,,,,,,
 1831,Salamander@SM_MAGNUM,attack,7,7,1000,0,10000,yes,self,attackpcge,2,,,,,,
 1831,Salamander@KN_TWOHANDQUICKEN,attack,60,20,2000,0,300000,yes,self,myhpltmaxrate,40,,,,,,
@@ -4421,7 +4421,7 @@
 1834,Salamander@MG_FIREBALL,chase,17,5,10000,0,5000,yes,target,always,,,,,,,
 1834,Salamander@CR_REFLECTSHIELD,attack,252,3,1000,0,200000,no,self,always,,,,,,,
 1834,Salamander@NPC_FIREATTACK,attack,186,5,2000,1000,200000,no,target,always,,,,,,,
-1834,Salamander@NPC_BLEEDING,attack,660,3,500,500,10000,no,self,always,,,,,,,
+1834,Salamander@NPC_BLEEDING,attack,660,3,500,500,10000,no,target,always,,,,,,,
 1834,Salamander@AS_SONICBLOW,attack,136,10,1000,0,10000,yes,target,always,,,,,,,
 1834,Salamander@SM_MAGNUM,attack,7,7,1000,0,10000,yes,self,attackpcge,2,,,,,,
 1834,Salamander@KN_TWOHANDQUICKEN,attack,60,20,2000,0,300000,yes,self,myhpltmaxrate,40,,,,,,
diff --git a/db/pet_db.txt b/db/pet_db.txt
index 68266e2b9..04bdccd29 100644
--- a/db/pet_db.txt
+++ b/db/pet_db.txt
@@ -69,3 +69,4 @@
 1385,DELETER,Deleter,14572,9035,0,7822,80,20,50,100,250,20,2000,175,0,0,300,300,800,{ petskillattack 7,5,5,5; }
 1382,DIABOLIC,Diabolic,14573,9036,0,7823,80,20,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack 83,2,5,5; }
 1208,WANDER_MAN,Wanderer,14574,9037,0,7824,80,20,50,100,250,20,2000,100,0,0,300,300,800,{ petskillattack 347,5,5,5; }
+1963,P_CHUNG_E,New Year Doll,0,9038,0,554,80,20,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack 250,5,5,5; }
\ No newline at end of file
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 74cac8755..dd4f6363b 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2008/02/07
+	* Rev. 12183 Added Lunar new year event for 2008 from iRO. [L0ne_W0lf]
+	- Please read the comments before enabling.
 	* Rev. 12182 Updated some Airship/port npcs. [L0ne_W0lf]
 	* Rev. 12181 Updated "Old Blue Box quest" and enabled it. [L0ne_W0lf]
 	- This quest no longer gives unlimited Old Blue Boxes,
diff --git a/npc/events/lunar_2008.txt b/npc/events/lunar_2008.txt
new file mode 100644
index 000000000..2e3d741b2
--- /dev/null
+++ b/npc/events/lunar_2008.txt
@@ -0,0 +1,282 @@
+//===== eAthena Script =======================================
+//= Lunar New Year Event (2008)
+//===== By: ==================================================
+//= L0ne_W0lf
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena SVN
+//===== Description: =========================================
+//= iRO Lunar New Year event; Year of the Rat. (2008)
+//= Kill Cramps, Taruus, and Matrins to retrieve "Rice Pouches"
+//= in return for various rice-themed foods, envelopes, and
+//= a "New year Doll" egg. Rates are guessed.
+//=
+//= Cramp, Tarou, and Matrin drops altered, Uncomment in
+//= mob_db2 to enable. [required]
+//=
+//= Miss Lunar NPC uses the sprite 4_f_nacoruri, which isn't
+//= standard in kRO's data files. If you're having problems
+//= or are unsure if your client supports that sprite, an
+//= alternate NPC header has been included.
+//===== Additional Comments: =================================
+//= v1.0 First version.
+//============================================================
+
+payon_in01,193,30,4	script	Rice Mill Grandma#rat	78,{
+	mes "[Rice Mill Grandma]";
+	if (!lunar_rat) {
+		mes "Those filthy little";
+		mes "creatures! Scurrying";
+		mes "around, snatching things";
+		mes "from me! If only they";
+		mes "weren't so blamed quick...";
+		next;
+		select("What's wrong?");
+		mes "[Rice Mill Grandma]";
+		mes "Oh, I was just making";
+		mes "some rice cakes and";
+		mes "pastries to celebrate";
+		mes "the new year, but these";
+		mes "animals have been stealing";
+		mes "the Rice Pouches I've prepared.";
+		next;
+		select("Rice Pouches?");
+		mes "[Rice Mill Grandma]";
+		mes "Yes, my son needs those";
+		mes "Rice Pouches to pound the";
+		mes "rice in a mortar, but I can't";
+		mes "make any pastries if I don't";
+		mes "even have the rice. Do you";
+		mes "think you can help me?";
+		next;
+		if (select("Of course.:I don't even know you.") == 1) {
+			set lunar_rat,1;
+			mes "[" + strcharinfo(0)+"]";
+			mes "Of course.";
+			mes "What can I do?";
+			next;
+			mes "[Rice Mill Grandma]";
+			mes "Well, do you think you";
+			mes "can catch the animals that";
+			mes "stole my Rice Pouches?";
+			mes "They're these blue and";
+			mes "white rats and these";
+			mes "nasty little moles.";
+			next;
+			select("Not a problem.");
+			mes "[" + strcharinfo(0)+"]";
+			mes "Not a problem.";
+			mes "I'll catch those animals,";
+			mes "and bring back any Rice";
+			mes "Pouches that I can find.";
+			next;
+			mes "[Rice Mill Grandma]";
+			mes "Oh, thank you!";
+			mes "Good luck catching";
+			mes "those pests for me~";
+			close;
+		}
+		mes "[Rice Mill Grandma]";
+		mes "I... Well...";
+		mes "That's true, but I was";
+		mes "planning on giving you";
+		mes "something nice in return";
+		mes "for your help. I know you're";
+		mes "not a bad person, so...";
+		close;
+	}
+	else if ((lunar_rat >= 1 && lunar_rat <= 2) || lunar_rat == 4) {
+		if (countitem(7770) >= 1 && lunar_rat == 2) {
+			mes "Oh, is that the";
+			mes "Sweet Rice my son made?";
+			mes "Would you let me have it?";
+			mes "Please wait here a moment,";
+			mes "and I'll make you some pastry~";
+			delitem 7770,1; //Sweet_rice
+			set lunar_rat,3;
+			close;
+		}
+		else if (lunar_rat == 4) {
+			if (countitem(7770) >= 1) {
+				mes "Oh, is that the";
+				mes "Sweet Rice my son made?";
+				mes "Would you let me have it?";
+				mes "Please wait here a moment,";
+				mes "and I'll make you some pastry~";
+				delitem 7770,1; //Sweet_rice
+				set lunar_rat,5;
+				close;
+			}
+			mes "Oh, where are all the";
+			mes "Rice Pouches? We need";
+			mes "them to make more rice cakes...";
+			close;
+		}
+		else if (countitem(7869) < 1 && lunar_rat <= 2) {
+			mes "Ooh, those white and";
+			mes "blue mouses might have";
+			mes "snatched my Rice Pouches";
+			mes "Those moles probably took";
+			mes "them too. Such nasty little";
+			mes "creatures, aren't they?";
+			close;
+		}
+		mes "Oh, is that one of my";
+		mes "Rice Pouches? I'm sorry,";
+		mes "but the pain my hips..";
+		mes "Would you mind being";
+		mes "a dear, and delivering";
+		mes "that to my son for me?";
+		set lunar_rat,2;
+		close;
+	}
+	else if (lunar_rat == 3 || lunar_rat == 5) {
+		set .@reward,rand(1,100);
+		if (.@reward <= 5) {
+			if (lunar_rat == 3) {
+				getitem 9038,1; // New_Year_Doll_Egg
+				set lunar_rat,4;
+			}
+			else if (lunar_rat == 5) {
+				getitem 668,1; // Red_Envelope
+			}
+		}
+		else if (.@reward >= 6 && .@reward <= 10) getitem 12198,2; // Lucky_Rice_Cake
+		else if (.@reward >= 11 && .@reward <= 30) getitem 12195,3; // Plain_Rice_Cake
+		else if (.@reward >= 31 && .@reward <= 40) getitem 12196,2; // Hearty_Rice_Cake
+		else if (.@reward >= 41 && .@reward <= 55) getitem 12123,2; // Honey_Pastry
+		else if (.@reward >= 56 && .@reward <= 70) getitem 12122,2; // Sesame_Pastry
+		else if (.@reward >= 71 && .@reward <= 80) getitem 12124,2; // Rainbow_Cake
+		else if (.@reward >= 81 && .@reward <= 90) getitem 12198,2; // Korean_Rice_Cake
+		else if (.@reward >= 91 && .@reward <= 100) getitem 12197,3; // Salty_Rice_Cake
+		// After getting the egg there is a chance to get an envelope with each turn in
+		if (rand(1,20) <= 5 && lunar_rat == 4) getitem 668,1; // Red_Envelope
+		// Set the quest accordingly for repeat turn-ins.
+		if (lunar_rat == 3) set lunar_rat,2;
+		else if (lunar_rat == 5) set lunar_rat,4;
+		mes "It's not nearly enough";
+		mes "to repay you for what you've";
+		mes "done for me, but I'd like";
+		mes "you to have this pastry that";
+		mes "I just made. Please enjoy it~";
+		next;
+		mes "[Rice Mill Grandma]";
+		mes "Thank you for the";
+		mes "Sweet Rice! I'll be";
+		mes "sure to make something";
+		mes "delicious for you if you";
+		mes "bring me more, okay?";
+		close;
+	}
+}
+
+payon,215,127,4	script	Rice Mill Man#rat	54,{
+	mes "[Rice Mill Man]";
+	if (!lunar_rat) {
+		mes "Breaks my heart...";
+		mes "My mom spends all this";
+		mes "time preparing rice for";
+		mes "the new year, and it's all";
+		mes "stolen by rats and vermin!";
+		close;
+	}
+	else if (lunar_rat == 1) {
+		mes "I hear from my mother";
+		mes "that you're helping her out.";
+		mes "She's a sweet old lady, huh?";
+		mes "If you find ang Rice Pouches,";
+		mes "you might want to have her";
+		mes "inspect them first.";
+		close;
+	}
+	else if (lunar_rat >= 2) {
+		if (countitem(7869) < 1) {
+			mes "If you bring me some";
+			mes "Rice Pouches, then I can";
+			mes "pound into into Sweet Rice.";
+			mes "You're here to help out my";
+			mes "mother, right? Thanks,";
+			mes "I really appreciate that.";
+			close;
+		}
+		mes "Oh, you brought me some";
+		mes "Rice Pouches from my mother?";
+		mes "Give me a second, and I'll";
+		mes "get this rice pounded into";
+		mes "paste, lickety split.";
+		next;
+		mes "[Rice Mill Man]";
+		mes "Hoo! Haa! Hi-yah!";
+		mes "Woosha! Whoosha!";
+		mes "Ka-taaaaaaaaaa!";
+		mes "WOOOSHA!";
+		next;
+		mes "[Rice Mill Man]";
+		mes "All done. Here, this";
+		mes "Sweet Rice is ready to";
+		mes "be made into pastries";
+		mes "Would you please bring";
+		mes "this to my mother?";
+		selitem 7869,1; //Rice_Pouch
+		getitem 7770,1; //Sweet_Rice
+		close;
+	}
+}
+
+//payon,126,113,4	script	Miss Lunar#rat	862,{
+payon,126,113,4	script	Miss Lunar#rat	719,{
+	mes "[Lunar]";
+	if ((MaxWeight-Weight) < 3000) {
+		mes "Oh, I'm sorry, but we";
+		mes "can't do any business if";
+		mes "you're carry so much stuff.";
+		mes "Would you mind storing some of";
+		mes "your things with the Kafra Service?";
+		close;
+	}
+	if (lunar_rat < 4) {
+		mes "I want to earn enough";
+		mes "money to buy that big";
+		mes "crescent silver pin.";
+		mes "I have to sell as much";
+		mes "of this Mojji as I can!";
+		close;
+	}
+	else if (lunar_rat >= 4) {
+		mes "Oh, hello! I'm selling";
+		mes "special rice cakes made";
+		mes "from sweet rice. You can";
+		mes "eat it yourself, or feed it";
+		mes "to your New Year Doll if";
+		mes "you have one as a pet.";
+		next;
+		mes "[Lunar]";
+		mes "Anyway, I'm selling";
+		mes "10 Mojji for 3,000 zeny";
+		mes "Would you like to try some?";
+		next;
+		if (select("Yes:No") == 1) {
+			if (Zeny >= 3000) {
+				set Zeny,Zeny-3000;
+				getitem 554,10; // Mojji
+				mes "[Lunar]";
+				mes "Thank you, and I hope you";
+				mes "have a happy new year!";
+				mes "Please come again~";
+				close;
+			}
+			mes "[Lunar]";
+			mes "Oh, I'm sorry, but you";
+			mes "don't have enough";
+			mes "zeny right now....";
+			close;
+		}
+		mes "[Lunar]";
+		mes "Oh, alright. Well, I'll";
+		mes "be here if you or your";
+		mes "friends want some Mojji";
+		mes "later, alight? Goodbye~";
+		close;
+	}
+}
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index f8d878c0d..d5fed64a4 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -179,8 +179,7 @@ npc: npc/kafras/dts_warper.txt
 //npc: npc/events/halloween_2006.txt
 //Official indian Ro Event Children Week
 //npc: npc/events/children_week.txt
-//Semi-Official Lunar New Year (2008) event (iRO)
-//Currently not in reposiotory.
+//Official Lunar New Year (2008) event (iRO)
 //npc: npc/events/lunar_2008.txt
 
 //Novice WoE is a kRO Event, after the event, the scripts were disabled.