* Added two new item groups, and implemented the remaining in the item database.

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

5 files changed, 41 insertions, 10 deletions

diff --git a/db/Changelog.txt b/db/Changelog.txt
index 54685edba..9d3064384 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,8 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
+2010/07/16
+	* Rev. 14364 Added two new item groups, and implemented the remaining in the item database. [L0ne_W0lf]
 2010/07/10
 	* Rev. 14363 Fixed a typo in item db. [Inkfish]
 2010/07/05
diff --git a/db/const.txt b/db/const.txt
index 8410cc2f7..e54f886b7 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -557,6 +557,8 @@ IG_Easter_Scroll	49
 IG_Pierre_Treasurebox	50
 IG_Cherish_Box	51
 IG_Cherish_Box_Ori	52
+IG_Louise_Costume_Box	53
+IG_Xmas_Gift	54
 
 SC_ALL -1
 SC_STONE	0
diff --git a/db/item_db.txt b/db/item_db.txt
index dc61c3edd..b64f1155a 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -4450,12 +4450,12 @@
 12278,Alice_Summon_Book,Alice Contract,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_create 1275,1800000; },{},{}
 12279,Undead_Element_Scroll,Undead Elemental Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start4 SC_ARMOR_RESIST,300000,20,20,20,20; },{},{}
 12280,Holy_Element_Scroll,Holy Elemental Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_BENEDICTIO; sc_start SC_BENEDICTIO,300000,1; },{},{}
-12281,Tresure_Box_WoE,Event Treasure Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12281,Tresure_Box_WoE,Event Treasure Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Tresure_Box_WoE),1; },{},{}
 12282,Internet_Cafe1,Internet Cafe1,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCALLSTATUS,5400000,3; sc_start SC_ATKPOTION,5400000,15; sc_start SC_MATKPOTION,5400000,15; },{},{}
 12283,Internet_Cafe2,Internet Cafe2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCSTR,5400000,8; sc_start SC_INCDEX,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_ATKPOTION,5400000,32; sc_start SC_INCFLEE,5400000,5; },{},{}
 12284,Internet_Cafe3,Internet Cafe3,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCINT,5400000,8; sc_start SC_INCVIT,5400000,4; sc_start SC_INCDEX,5400000,6; sc_start SC_MATKPOTION,5400000,40; },{},{}
 12285,Internet_Cafe4,Internet Cafe4,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCDEX,5400000,8; sc_start SC_INCLUK,5400000,4; sc_start SC_INCAGI,5400000,6; sc_start SC_ATKPOTION,5400000,24; sc_start SC_MATKPOTION,5400000,24; },{},{}
-12286,Masquerade_Ball_Box2,Masquerade Ball Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12286,Masquerade_Ball_Box2,Masquerade Ball Box2,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Masquerade_2),1; },{},{}
 12287,Love_Angel,Love Angel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 1; },{},{}
 12288,Squirrel,Squirrel Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 2; },{},{}
 12289,Gogo,Gogo Magic Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ setfont 3; },{},{}
@@ -4503,12 +4503,12 @@
 12331,Ginseng,Ginseng,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 6,0; },{},{}
 12332,Fruit_Juice,Fruit Juice,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,6; },{},{}
 12333,Ansila,Ancilla,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12334,Cherish_Box,Treasure Edition Helm Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12334,Cherish_Box,Treasure Edition Helm Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Cherish_Box),1; },{},{}
 12335,Yummy_Skewered_Dish,Grilled Delicious Skewer,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 60,60; },{},{}
 12336,Baked_Mushroom,Grilled Mushroom,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 30,30; },{},{}
 12337,Grilled_Sausage,Grilled Sausages,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 20,20; },{},{}
 12338,Grilled_Corn,Grilled Corn,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_INCSTR,180000,2; sc_start SC_INCINT,180000,2; sc_start SC_INCAGI,180000,2; },{},{}
-12339,Cherish_Box_Ori,Treasure Edition Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12339,Cherish_Box_Ori,Treasure Edition Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Cherish_Box_Ori),1; },{},{}
 12340,Mysterious_Rice_Powder,Chewy Rice Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1815; },{},{}
 12341,Special_Alloy_Trap_Box,Special Alloy Trap Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12342,Manuk's_Opportunity,Manuk's Opportunity,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_POTION_BERSERK; sc_start SC_MANU_ATK,600000,10; },{},{}
@@ -4524,8 +4524,8 @@
 12352,Dun_Tele_Scroll3,Dungeon Teleport Scroll 3,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12353,Tiny_Waterbottle,Small Bottle,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_WATERWEAPON,90000,1; },{},{}
 12354,Buche_De_Noel,Buche De Noel,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 EF_ANGELUS; sc_start SC_INCMHPRATE,600000,3; sc_start SC_INCMSPRATE,600000,3; sc_start SC_INCHITRATE,600000,3; sc_start SC_INCCRI,600000,7; },{},{}
-12355,Xmas_Gift,Xmas Gift,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12356,Louise_Costume_Box,Louise Costume Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12355,Xmas_Gift,Xmas Gift,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Xmas_Gift),1; },{},{}
+12356,Louise_Costume_Box,Louise Costume Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Louise_Costume_Box),1; },{},{}
 12357,Shiny_Wing_Gown,Shiny Wing Gown,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1002; },{},{}
 12358,Fan_Of_Wind,Fan Of Wind,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1513; },{},{}
 12359,Very_Soft_Plant,Very Soft Plant,2,0,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1586; },{},{}
@@ -4582,7 +4582,7 @@
 12711,Pretzel,Pretzel,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12712,Green_Beer,Green Beer,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12713,Monster_Extract,Monster Extract,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12714,Easter_Scroll,Easter Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12714,Easter_Scroll,Easter Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Easter_Scroll),1; },{},{}
 12715,Black_Treasure_Chest,Black Treasure Chest,2,0,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12716,Indian_Rice_Cake,Indian Rice Cake,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12717,Poison_Paralysis,Paralyze,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@@ -5779,7 +5779,7 @@
 14593,Magic_Power_Scroll,Mystical Amplification Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "HW_MAGICPOWER",10; },{},{}
 14594,Quagmire_Scroll,Quagmire Scroll,11,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "WZ_QUAGMIRE",5; },{},{}
 14595,Unsealed_Magic_Spell,Unsealed Magic Spell,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "yuno_fild09",255,127; },{},{}
-14596,Pierre_Treasurebox,Pierre's Treasure Box,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14596,Pierre_Treasurebox,Pierre's Treasure Box,2,2,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Pierre_Treasurebox),1; getitem groupranditem(IG_Pierre_Treasurebox),1; getitem groupranditem(IG_Pierre_Treasurebox),1; getitem groupranditem(IG_Pierre_Treasurebox),1; getitem groupranditem(IG_Pierre_Treasurebox),1; getitem groupranditem(IG_Pierre_Treasurebox),1; },{},{}
 14597,PhreeoniS,Phreeoni Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,180000,4121; },{},{}
 14598,GhostringS,Ghostring Scroll,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMSCRIPT,60000,4047; },{},{}
 14599,Greed_Scroll_C,Greed Scroll,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/item_misc.txt b/db/item_misc.txt
index ae28973d6..9b2375072 100644
--- a/db/item_misc.txt
+++ b/db/item_misc.txt
@@ -161,6 +161,10 @@
 22,10018,1	// Monkey Circlet
 22,10019,1	// Red Scarf
 22,10020,1	// Grave Keeper's Sword
+22,12373,1	// 
+22,12374,1	// 
+22,12395,1	// 
+22,12395,1	// 
 // Bundle Of Magic Scroll
 23,686,1	// Level 3 Earth Spike
 23,687,1	// Level 5 Earth Spike
@@ -525,4 +529,27 @@
 52,5212,2	// Solar Panels
 52,5305,2	// Pirate Dagger
 52,5332,2	// Loki Mask
-52,2712,2	// Collector's Edition Book
\ No newline at end of file
+52,2712,2	// Collector's Edition Book
+// Louise_Costume_Box
+53,12132,9	// Red_Bag
+53,12260,1	// Cool_Summer_Outfit
+// Xmas_Gift
+54,14550,3	// Fire_Cracker_Xmas
+54,14546,3	// Fire_Cracker_Love
+54,644,33	// Gift_Box
+54,12702,18	// Old_Bleu_Box
+54,12105,3	// Set_Of_Taiming_Item
+54,12107,3	// Wrapped_Mask
+54,603,12	// Old_Blue_Box
+54,12108,6	// Bundle_Of_Magic_Scroll
+54,12354,21	// Buche_De_Noel
+54,12016,6	// Speed_Up_Potion
+54,12017,6	// Slow_Down_Potion
+54,12130,6	// Cookie_Bag
+54,12132,3	// Red_Bag
+54,12110,6	// First_Aid_Kit
+54,732,6	// Crystal_Jewel__
+54,559,9	// Light_Orange_Pot
+54,560,9	// HandMade_Chocolate_
+54,573,9	// Chocolate_Drink
+54,5136,6	// Santa's_Hat_
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 12fcdf6bb..5a3c042f6 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -22,7 +22,7 @@
 #define IG_FINDINGORE 6
 #define IG_POTION 37
 //The max. item group count (increase this when needed).
-#define MAX_ITEMGROUP 53
+#define MAX_ITEMGROUP 55
 
 #define CARD0_FORGE 0x00FF
 #define CARD0_CREATE 0x00FE