* Increased Item group limit for new item groups.

* Added several new item groups, and updated some existing groups.
- IG_RedBox, IG_GreenBox, IG_OldYellowBox, IG_OldGiftBox IG_MagicCardAlbum, IG_HometownGift, and IG_Masquerade.
- IG_CardAlbum no longer gives Ghostring or Angeling Cards.
- Added Hahoe Mask to Wrapped Mask list.


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

7 files changed, 114 insertions, 16 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 02b052553..817267b90 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date	Added
 AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
+2008/06/24
+	* Rev. 12891 Increased Item group limit for new item groups. [L0ne_W0lf]
 2008/06/23
 	* Fixed: replaced TYPEs with ENGINEs in SQL files (for better compatibility, TYPE is a synonym) [akrus]
 2008/06/22
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 46e3de4f1..4a42109e1 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,12 @@
 	2385 Recuvative_Armor		Should trigger HP/SP return with magical kills as well.
 
 =======================
+2008/06/24
+	* Rev. 12891 Added several new item groups, and updated some existing groups. [L0ne_W0lf]
+	- IG_RedBox, IG_GreenBox, IG_OldYellowBox, IG_OldGiftBox
+	- IG_MagicCardAlbum, IG_HometownGift, and IG_Masquerade.
+	- IG_CardAlbum no longer gives Ghostring or Angeling Cards.
+	- Added Hahoe Mask to Wrapped Mask list.
 2008/06/23
 	* Fixed / updated items to recent kRO 14593,2621-2626,4175,2719 [$ephiroth]
 
diff --git a/db/const.txt b/db/const.txt
index 39b5fa7e3..2b780e612 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -524,6 +524,13 @@ IG_FoodBag	36
 IG_Potion	37
 IG_RedBox_2	38
 IG_BleuBox	39
+IG_RedBox	40
+IG_GreenBox	41
+IG_OldYellowBox	42
+IG_OldGiftBox	43
+IG_MagicCardAlbum	44
+IG_HometownGift	45
+IG_Masquerade	46
 
 SC_ALL -1
 SC_STONE	0
diff --git a/db/item_cardalbum.txt b/db/item_cardalbum.txt
index af707fda2..19ec39b93 100644
--- a/db/item_cardalbum.txt
+++ b/db/item_cardalbum.txt
@@ -48,14 +48,14 @@
 3,4044,3	//Smokie Card
 3,4045,3	//Horn Card
 3,4046,3	//Martin Card
-3,4047,1	//Ghostring Card
+//3,4047,1	//Ghostring Card
 3,4048,3	//Poison Spore Card
 3,4049,3	//Vadon Card
 3,4050,3	//Male Thief Bug Card
 3,4051,3	//Yoyo Card
 3,4052,3	//Elder Willow Card
 3,4053,1	//Vitata Card
-3,4054,1	//Angeling Card
+//3,4054,1	//Angeling Card
 3,4055,3	//Marina Card
 3,4056,3	//Dustiness Card
 3,4057,2	//Metaller Card
diff --git a/db/item_db.txt b/db/item_db.txt
index b1fea6a9d..0d866ecb6 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3408,15 +3408,15 @@
 12183,Holy_Arrow_Quiver,Holy Arrow Quiver,2,,1,250,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1772,500; },{},{}
 12184,Mercenary_Red_Potion,Mercenary's Red Potion,2,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12185,Mercenary_Blue_Potion,Mercenary's Blue Potion,2,1000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12186,Red_Box,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12187,Green_Box,Old Green Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12186,Red_Box,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_RedBox),1; },{},{}
+12187,Green_Box,Old Green Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GreenBox),1; },{},{}
 12188,Moon_Snack,Fantastic Moon Snack,2,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{}
 12189,Red_Box_,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_RedBox_2),1; },{},{}
 12190,Moon_Cake,Moon Cake,2,,1,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12191,Special_Moon_Cake,Special Moon Cake,2,,1,500,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12192,Pumpkin_Pie,Pumpkin Pie,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 5,5; },{},{}
 12193,Brizel,Brizel,2,,10,20,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12194,Present_From_Home,Present from Home,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12194,Hometown_Gift,Present from Home,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_HometownGift),1; },{},{}
 12195,Plain_Rice_Cake,Plain Rice Cake,2,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,20; },{},{}
 12196,Hearty_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,,,,,,{ percentheal 10,10; },{},{}
@@ -3461,16 +3461,16 @@
 12237,Choco_Lump,Dollop of Chocolate,2,,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 0,5; sc_start SC_Poison,18000,0; sc_start SC_Bleeding,18000,0; },{},{}
 12238,New_Year_Rice_Cake_1,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12239,New_Year_Rice_Cake_2,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12240,Old_Yellow_Box,Old Yellow Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(5259,5262),1; },{},{}
+12240,Old_Yellow_Box,Old Yellow Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_YellowBox),1; },{},{}
 12241,M_Center_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{}
 12242,M_Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0xFFF7FEEF,7,2,,,40,,,{ sc_start SC_ASPDPOTION1,1800000,0; },{},{}
 12243,M_Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x01E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{}
-12244,Old_Gift_Box,Old Gift Box,2,,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem rand(5270,5272),1; },{},{}
+12244,Old_Gift_Box,Old Gift Box,2,,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_OldGiftBox),1; },{},{}
 //St. Patrick's Day Event (2007)
 12245,Green_Ale_US,Green Ale,0,5000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,0; },{},{}
-12246,Magic_Card_Album,Magic Card Album,2,10000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12246,Magic_Card_Album,Magic Card Album,2,10000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_MagicCardAlbum),1; },{},{}
 12247,Halohalo,Halo-Halo,2,2,,100,,,,,0xFFFFFFFF,7,2,,,20,,,{ sc_start SC_INCALLSTATUS,600000,3; },{},{}
-12248,Masquerade_Ball_Box,Fancy Ball Box,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5296,1; getitem 5297,1; getitem 5298,1; },{},{}
+12248,Masquerade_Ball_Box,Fancy Ball Box,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Masquerade),1; },{},{}
 12249,Payroll_Of_Kafra_,Kafra Employee Paystub,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12250,Str_Dish_M,Steamed Tongue,2,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_STRFood,3600000,10; percentheal 20,20; },{},{}
 12251,Agi_Dish_M,Steamed Desert Scorpions,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_AGIFood,3600000,10; percentheal 15,5; },{},{}
diff --git a/db/item_misc.txt b/db/item_misc.txt
index 4c8524bd0..cc19a72cc 100644
--- a/db/item_misc.txt
+++ b/db/item_misc.txt
@@ -113,7 +113,7 @@
 21,1003,1	//Coal
 21,1010,1	//Phracon
 21,1011,1	//Emveretarcon
-// taming items
+// Set_Of_Taiming_Item
 22,619,1	//Unripe Apple
 22,620,1	//Orange Juice
 22,621,1	//Bitter Herb
@@ -161,7 +161,7 @@
 22,10018,1	//Monkey Circlet
 22,10019,1	//Red Scarf
 22,10020,1	//Grave Keeper's Sword
-//scrolls
+// Bundle_Of_Magic_Scroll
 23,686,1	//Level 3 Earth Spike
 23,687,1	//Level 5 Earth Spike
 23,688,1	//Level 3 Cold Bolt
@@ -180,7 +180,7 @@
 23,12000,1	//Level 5 Frost Diver
 23,12001,1	//Level 3 Heal
 23,12002,1	//Level 5 Heal
-//quivers
+// Random_Quiver
 24,12004,1	//Quiver
 24,12005,1	//Iron Arrow Quiver
 24,12006,1	//Steel Arrow Quiver
@@ -194,7 +194,7 @@
 24,12014,1	//Immaterial Arrow Quiver
 24,12015,1	//Rusty Arrow Quiver
 24,12183,1	//Holy Arrow Quiver
-//masks
+// Wrapped_Mask
 25,2278,10	//Mr. Smile
 25,2281,10	//Opera Masque
 25,2288,10	//Mr. Scream
@@ -207,7 +207,8 @@
 25,5089,10	//Annoyed Mask
 25,5090,10	//Goblin Leader Mask
 25,5121,1	//Zherlthsh Mask
-//accessory
+25,5176,2	//Hahoe Mask
+// Accessory_Box
 26,2601,10	//Ring
 26,2602,10	//Earring
 26,2603,10	//Necklace
@@ -280,7 +281,7 @@
 35,7398,1	//Lotto Ball 38
 35,7540,1	//Lotto Ball 39
 35,7541,1	//Lotto Ball 40
-// Food Package
+// Food_Package
 36,512,1	//Apple
 36,513,1	//Banana
 36,514,1	//Grape
@@ -347,3 +348,85 @@
 39,644,1	//Gift Box
 39,519,1	//Milk
 39,538,1	//Well-baked Cookie
+// Red_Box
+40,5187,10	//Twin Ribbon
+40,5181,11	//Helm of Darkness
+40,5182,1	//Puppy Hat
+40,5186,11	//Geographer Decoration
+40,5185,11	//Laurel Crown
+40,5183,11	//Nest Hat
+40,5137,11	//Alice Doll
+40,5139,11	//Lotus
+40,5138,11	//Magic Eyes
+40,5140,11	//Kawaii Ribbon
+40,5152,1	//Phoenix Crown
+40,5142,11	//Crescent Helm
+40,5143,12	//Kabuki Mask
+40,5099,12	//Neko Mimi
+// Green_Box
+41,12075,100	//Steamed Tongue
+41,12080,100	//Dragon Breath Cocktail
+41,12085,100	//Immortal Stew
+41,12090,100	//Steamed Desert Scorpions
+41,12095,100	//Hwergelmir's Tonic
+41,12100,100	//Cooked Nine Tail
+41,607,100	//Yggdrasil Berry
+41,608,100	//Yggdrasil Seed
+41,12018,100	//Firecracker
+41,573,100	//Chocolate Drink
+41,5182,1	//Puppy Hat
+// Old_Yellow_Box
+42,5259,1	//Elephant Hat
+42,5260,1	//Cookie Hat
+42,5261,1	//Silver Tiara
+42,5262,1	//Golden Tiara
+// Old_Gift_Box
+43,5271,15	//Phoenix Crown
+43,5272,40	//Smiling Mask
+43,5270,45	//Happy Wig
+// Magic_Card_Album
+44,4047,1	//Ghostring Card
+44,4054,1	//Angeling Card
+44,4163,1	//Gryphon Card
+44,4169,1	//Dark Illusion Card
+44,4174,1	//Deviling Card
+44,4179,10	//Dragon Fly Card
+44,4183,10	//Vagabond Wolf Card
+44,4197,10	//Mastering Card
+44,4198,1	//Maya Purple Card
+44,4203,10	//Mutant Dragonoid Card
+44,4207,1	//Mysteltainn Card
+44,4211,1	//Vocal card
+44,4237,5	//Owl Duke Card
+44,4238,5	//Owl Baron Card
+44,4241,1	//Arc Angeling Card
+44,4250,1	//Executioner Card
+44,4254,1	//Tirfing Card
+44,4266,10	//Eclipse Card
+44,4284,10	//Chepet Card
+44,4285,10	//Choco Card
+44,4290,5	//Cat O' Nine Tails Card
+44,4291,10	//Kobold Leader Card
+44,4300,10	//Chimera Card
+44,4306,10	//Toad Card
+44,4320,1	//Bloody Knight Card
+44,4336,1	//Ungoliant Card
+44,4354,1	//Gemini-S58 Card
+44,4384,1	//Hydro Card
+44,4395,3	//Thanatos Maero Card
+44,4396,3	//Thanatos Odium Card
+44,4397,3	//Thanatos Despero Card
+// Hometown_Gift
+45,12195,1	//Plain Rice Cake
+45,12196,1	//Hearty Rice Cake
+45,12197,1	//Salty Rice Cake
+45,12198,1	//Lucky Rice Cake
+45,12122,1	//Sesame Pastry
+45,12123,1	//Honey Pastry
+45,12124,1	//Rainbow Cake
+45,663,1	//Korean Rice Cake
+// Masquerade_Ball_Box
+46,5296,10	//Drooping Nine Tail
+46,5297,1	//Soul Wing
+46,5298,10	//Dokebi's Wig
+46,5299,10	//Pagdayaw
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 6be49f3e9..b634ad841 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -21,7 +21,7 @@
 #define IG_FINDINGORE 6
 #define IG_POTION 37
 //The max. item group count (increase this when needed).
-#define MAX_ITEMGROUP 40
+#define MAX_ITEMGROUP 47
 
 #define CARD0_FORGE 0x00FF
 #define CARD0_CREATE 0x00FE