summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--db/const.txt8
-rw-r--r--db/item_cardalbum.txt338
-rw-r--r--db/item_giftbox.txt599
-rw-r--r--db/item_misc.txt595
-rw-r--r--src/map/itemdb.c7
-rw-r--r--src/map/itemdb.h7
6 files changed, 1175 insertions, 379 deletions
diff --git a/db/const.txt b/db/const.txt
index 00ab23a76..9cb0906ab 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -374,6 +374,14 @@ IG_Quiver 24
IG_Mask 25
IG_Accesory 26
IG_Jewel 27
+IG_GiftBox_1 28
+IG_GiftBox_2 29
+IG_GiftBox_3 30
+IG_GiftBox_4 31
+IG_EggBoy 32
+IG_EggGirl 33
+IG_GiftBoxChina 34
+
SC_STONE 0
SC_FREEZE 1
diff --git a/db/item_cardalbum.txt b/db/item_cardalbum.txt
index 2e4c9a076..138db1aa8 100644
--- a/db/item_cardalbum.txt
+++ b/db/item_cardalbum.txt
@@ -3,273 +3,85 @@
// Structure of Database:
// GroupID,ItemID,Rate
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4001,1 //Poring Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4002,1 //Fabre Card
-3,4003,1 //Pupa Card
-3,4003,1 //Pupa Card
-3,4003,1 //Pupa Card
-3,4003,1 //Pupa Card
-3,4003,1 //Pupa Card
-3,4003,1 //Pupa Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
-3,4004,1 //Drops Card
+3,4001,7 //Poring Card
+3,4002,7 //Fabre Card
+3,4003,6 //Pupa Card
+3,4004,7 //Drops Card
3,4005,1 //Santa Poring Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4006,1 //Lunatic Card
-3,4007,1 //Peco Peco Egg Card
-3,4007,1 //Peco Peco Egg Card
-3,4007,1 //Peco Peco Egg Card
-3,4007,1 //Peco Peco Egg Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4008,1 //Picky Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4009,1 //Chonchon Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4010,1 //Willow Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4011,1 //Picky Egg Card
-3,4012,1 //Thief Bug Egg Card
-3,4012,1 //Thief Bug Egg Card
-3,4012,1 //Thief Bug Egg Card
-3,4012,1 //Thief Bug Egg Card
-3,4012,1 //Thief Bug Egg Card
-3,4013,1 //Andre Egg Card
-3,4013,1 //Andre Egg Card
-3,4013,1 //Andre Egg Card
-3,4013,1 //Andre Egg Card
-3,4013,1 //Andre Egg Card
-3,4014,1 //Roda Frog Card
-3,4014,1 //Roda Frog Card
-3,4014,1 //Roda Frog Card
-3,4014,1 //Roda Frog Card
-3,4014,1 //Roda Frog Card
-3,4015,1 //Condor Card
-3,4015,1 //Condor Card
-3,4015,1 //Condor Card
-3,4015,1 //Condor Card
-3,4015,1 //Condor Card
-3,4016,1 //Thief Bug Card
-3,4016,1 //Thief Bug Card
-3,4016,1 //Thief Bug Card
-3,4016,1 //Thief Bug Card
-3,4016,1 //Thief Bug Card
-3,4017,1 //Savage Babe Card
-3,4017,1 //Savage Babe Card
-3,4017,1 //Savage Babe Card
-3,4017,1 //Savage Babe Card
-3,4017,1 //Savage Babe Card
-3,4019,1 //Hornet Card
-3,4019,1 //Hornet Card
-3,4019,1 //Hornet Card
-3,4019,1 //Hornet Card
-3,4019,1 //Hornet Card
-3,4020,1 //Farmiliar Card
-3,4020,1 //Farmiliar Card
-3,4020,1 //Farmiliar Card
-3,4020,1 //Farmiliar Card
-3,4020,1 //Farmiliar Card
-3,4021,1 //Rocker Card
-3,4021,1 //Rocker Card
-3,4021,1 //Rocker Card
-3,4021,1 //Rocker Card
-3,4021,1 //Rocker Card
-3,4022,1 //Spore Card
-3,4022,1 //Spore Card
-3,4022,1 //Spore Card
-3,4022,1 //Spore Card
-3,4022,1 //Spore Card
-3,4023,1 //Baby Desert Wolf Card
-3,4023,1 //Baby Desert Wolf Card
-3,4023,1 //Baby Desert Wolf Card
-3,4023,1 //Baby Desert Wolf Card
-3,4023,1 //Baby Desert Wolf Card
-3,4024,1 //Plankton Card
-3,4024,1 //Plankton Card
-3,4024,1 //Plankton Card
-3,4024,1 //Plankton Card
-3,4024,1 //Plankton Card
-3,4025,1 //Skeleton Card
-3,4025,1 //Skeleton Card
-3,4025,1 //Skeleton Card
-3,4025,1 //Skeleton Card
-3,4025,1 //Skeleton Card
-3,4026,1 //Female Thief Bug Card
-3,4026,1 //Female Thief Bug Card
-3,4026,1 //Female Thief Bug Card
-3,4027,1 //Kukre Card
-3,4027,1 //Kukre Card
-3,4027,1 //Kukre Card
-3,4028,1 //Tarou Card
-3,4028,1 //Tarou Card
-3,4028,1 //Tarou Card
-3,4029,1 //Wolf Card
-3,4029,1 //Wolf Card
-3,4029,1 //Wolf Card
-3,4030,1 //Mandragora Card
-3,4030,1 //Mandragora Card
-3,4030,1 //Mandragora Card
-3,4031,1 //Peco Peco Card
-3,4031,1 //Peco Peco Card
-3,4031,1 //Peco Peco Card
-3,4032,1 //Ambernite Card
-3,4032,1 //Ambernite Card
-3,4032,1 //Ambernite Card
-3,4033,1 //Poporing Card
-3,4033,1 //Poporing Card
-3,4033,1 //Poporing Card
-3,4034,1 //Wormtail Card
-3,4034,1 //Wormtail Card
-3,4034,1 //Wormtail Card
-3,4035,1 //Hydra Card
-3,4035,1 //Hydra Card
-3,4035,1 //Hydra Card
-3,4036,1 //Muka Card
-3,4036,1 //Muka Card
-3,4036,1 //Muka Card
-3,4037,1 //Snake Card
-3,4037,1 //Snake Card
-3,4037,1 //Snake Card
-3,4038,1 //Zombie Card
-3,4038,1 //Zombie Card
-3,4038,1 //Zombie Card
-3,4039,1 //Stainer Card
-3,4039,1 //Stainer Card
-3,4039,1 //Stainer Card
-3,4040,1 //Creamy Card
-3,4040,1 //Creamy Card
-3,4040,1 //Creamy Card
-3,4041,1 //Coco Card
-3,4041,1 //Coco Card
-3,4041,1 //Coco Card
-3,4042,1 //Steel Chonchon Card
-3,4042,1 //Steel Chonchon Card
-3,4042,1 //Steel Chonchon Card
-3,4043,1 //Andre Card
-3,4043,1 //Andre Card
-3,4043,1 //Andre Card
-3,4044,1 //Smokie Card
-3,4044,1 //Smokie Card
-3,4044,1 //Smokie Card
-3,4045,1 //Horn Card
-3,4045,1 //Horn Card
-3,4045,1 //Horn Card
-3,4046,1 //Martin Card
-3,4046,1 //Martin Card
-3,4046,1 //Martin Card
+3,4006,7 //Lunatic Card
+3,4007,4 //Peco Peco Egg Card
+3,4008,7 //Picky Card
+3,4009,7 //Chonchon Card
+3,4010,7 //Willow Card
+3,4011,7 //Picky Egg Card
+3,4012,5 //Thief Bug Egg Card
+3,4013,5 //Andre Egg Card
+3,4014,5 //Roda Frog Card
+3,4015,5 //Condor Card
+3,4016,5 //Thief Bug Card
+3,4017,5 //Savage Babe Card
+3,4019,5 //Hornet Card
+3,4020,5 //Farmiliar Card
+3,4021,5 //Rocker Card
+3,4022,5 //Spore Card
+3,4023,5 //Baby Desert Wolf Card
+3,4024,5 //Plankton Card
+3,4025,5 //Skeleton Card
+3,4026,3 //Female Thief Bug Card
+3,4027,3 //Kukre Card
+3,4028,3 //Tarou Card
+3,4029,3 //Wolf Card
+3,4030,3 //Mandragora Card
+3,4031,3 //Peco Peco Card
+3,4032,3 //Ambernite Card
+3,4033,3 //Poporing Card
+3,4034,3 //Wormtail Card
+3,4035,3 //Hydra Card
+3,4036,3 //Muka Card
+3,4037,3 //Snake Card
+3,4038,3 //Zombie Card
+3,4039,3 //Stainer Card
+3,4040,3 //Creamy Card
+3,4041,3 //Coco Card
+3,4042,3 //Steel Chonchon Card
+3,4043,3 //Andre Card
+3,4044,3 //Smokie Card
+3,4045,3 //Horn Card
+3,4046,3 //Martin Card
3,4047,1 //Ghostring Card
-3,4048,1 //Poison Spore Card
-3,4048,1 //Poison Spore Card
-3,4048,1 //Poison Spore Card
-3,4049,1 //Vadon Card
-3,4049,1 //Vadon Card
-3,4049,1 //Vadon Card
-3,4050,1 //Male Thief Bug Card
-3,4050,1 //Male Thief Bug Card
-3,4050,1 //Male Thief Bug Card
-3,4051,1 //Yoyo Card
-3,4051,1 //Yoyo Card
-3,4051,1 //Yoyo Card
-3,4052,1 //Elder Willow Card
-3,4052,1 //Elder Willow Card
-3,4052,1 //Elder Willow 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,4055,1 //Marina Card
-3,4055,1 //Marina Card
-3,4055,1 //Marina Card
-3,4056,1 //Dustiness Card
-3,4056,1 //Dustiness Card
-3,4056,1 //Dustiness Card
-3,4057,1 //Metaller Card
-3,4057,1 //Metaller Card
-3,4058,1 //Thara Frog Card
-3,4058,1 //Thara Frog Card
-3,4060,1 //Goblin Card
-3,4060,1 //Goblin Card
-3,4061,1 //Cornutus Card
-3,4061,1 //Cornutus Card
-3,4062,1 //Anacondaq Card
-3,4062,1 //Anacondaq Card
-3,4063,1 //Caramel Card
-3,4063,1 //Caramel Card
-3,4064,1 //Zerom Card
-3,4064,1 //Zerom Card
-3,4065,1 //Kaho Card
-3,4065,1 //Kaho Card
-3,4066,1 //Orc Warrior Card
-3,4066,1 //Orc Warrior Card
-3,4067,1 //Megalodon Card
-3,4067,1 //Megalodon Card
-3,4068,1 //Scorpion Card
-3,4068,1 //Scorpion Card
-3,4069,1 //Drainliar Card
-3,4069,1 //Drainliar Card
-3,4070,1 //Eggyra Card
-3,4070,1 //Eggyra Card
-3,4071,1 //Orc Zombie Card
-3,4071,1 //Orc Zombie Card
-3,4072,1 //Golem Card
-3,4072,1 //Golem Card
-3,4073,1 //Pirate Skeleton Card
-3,4073,1 //Pirate Skeleton Card
-3,4074,1 //Bigfoot Card
-3,4074,1 //Bigfoot Card
-3,4075,1 //Argos Card
-3,4075,1 //Argos Card
-3,4076,1 //Magnolia Card
-3,4076,1 //Magnolia Card
-3,4077,1 //Phen Card
-3,4077,1 //Phen Card
-3,4078,1 //Savage Card
-3,4078,1 //Savage Card
-3,4079,1 //Mantis Card
-3,4079,1 //Mantis Card
-3,4080,1 //Flora Card
-3,4080,1 //Flora Card
-3,4081,1 //Hode Card
-3,4081,1 //Hode Card
+3,4055,3 //Marina Card
+3,4056,3 //Dustiness Card
+3,4057,2 //Metaller Card
+3,4058,2 //Thara Frog Card
+3,4060,2 //Goblin Card
+3,4061,2 //Cornutus Card
+3,4062,2 //Anacondaq Card
+3,4063,2 //Caramel Card
+3,4064,2 //Zerom Card
+3,4065,2 //Kaho Card
+3,4066,2 //Orc Warrior Card
+3,4067,2 //Megalodon Card
+3,4068,2 //Scorpion Card
+3,4069,2 //Drainliar Card
+3,4070,2 //Eggyra Card
+3,4071,2 //Orc Zombie Card
+3,4072,2 //Golem Card
+3,4073,2 //Pirate Skeleton Card
+3,4074,2 //Bigfoot Card
+3,4075,2 //Argos Card
+3,4076,2 //Magnolia Card
+3,4077,2 //Phen Card
+3,4078,2 //Savage Card
+3,4079,2 //Mantis Card
+3,4080,2 //Flora Card
+3,4081,2 //Hode Card
3,4082,1 //Desert Wolf Card
3,4083,1 //Rafflesia Card
3,4084,1 //Marine Sphere Card
diff --git a/db/item_giftbox.txt b/db/item_giftbox.txt
index c9ea6575f..b44b759fe 100644
--- a/db/item_giftbox.txt
+++ b/db/item_giftbox.txt
@@ -3,15 +3,11 @@
// Structure of Database:
// GroupID,ItemID,Rate
-4,756,1 //Rough Oridecon
-4,756,1 //Rough Oridecon
-4,756,1 //Rough Oridecon
-4,756,1 //Rough Oridecon
-4,756,1 //Rough Oridecon
-4,757,1 //Rough Elunium
-4,757,1 //Rough Elunium
-4,984,1 //Oridecon
-4,984,1 //Oridecon
+
+// GiftBox
+4,756,5 //Rough Oridecon
+4,757,2 //Rough Elunium
+4,984,2 //Oridecon
4,985,1 //Elunium
4,714,1 //Emperium
4,999,1 //Steel
@@ -83,5 +79,588 @@
4,539,1 //Piece of Cake
4,603,1 //Old Blue Box
4,617,1 //Old Purple Box
-4,644,20 //Gift Box
+4,644,19 //Gift Box
4,1558,1 //Girl's Diary
+// GiftBox_1
+28,756,5 //Rough Oridecon
+28,757,2 //Rough Elunium
+28,984,2 //Oridecon
+28,985,1 //Elunium
+28,714,1 //Emperium
+28,999,1 //Steel
+28,1000,1 //Star Crumb
+28,994,1 //Flame Heart
+28,995,1 //Mystic Frozen
+28,996,1 //Rough Wind
+28,997,1 //Great Nature
+28,975,1 //Scarlet Dyestuff
+28,976,1 //Lemon Dyestuff
+28,978,1 //Cobaltblue Dyestuff
+28,979,1 //Darkgreen Dyestuff
+28,980,1 //Orange Dyestuff
+28,981,1 //Violet Dyestuff
+28,982,1 //White Dyestuff
+28,983,1 //Black Dyestuff
+28,969,1 //Gold
+28,718,1 //Garnet
+28,719,1 //Amethyst
+28,720,1 //Aquamarine
+28,721,1 //Emerald
+28,722,1 //Pearl
+28,723,1 //Ruby
+28,724,1 //Cursed Ruby
+28,725,1 //Sardonyx
+28,726,1 //Sapphire
+28,727,1 //Opal
+28,728,1 //Topaz
+28,729,1 //Zircon
+28,730,1 //1carat Diamond
+28,731,1 //2carat Diamond
+28,732,1 //3carat Diamond
+28,733,1 //Cracked Diamond
+28,734,1 //Red Frame
+28,735,1 //Chung Jah
+28,736,1 //China
+28,737,1 //Black Ladle
+28,738,1 //Pencil Case
+28,739,1 //Rouge
+28,740,1 //Puppet
+28,741,1 //Poring Doll
+28,742,1 //Chonchon Doll
+28,743,1 //Spore Doll
+28,744,1 //Bouquet
+28,745,1 //Wedding Bouquet
+28,746,1 //Glass Bead
+28,747,1 //Crystal Mirror
+28,748,1 //Witherless Rose
+28,749,1 //Frozen Rose
+28,750,1 //Baphomet Doll
+28,751,1 //Osiris Doll
+28,752,1 //Grasshopper Doll
+28,753,1 //Yoyo Doll
+28,754,1 //Raccoon Doll
+28,706,1 //Four Leaf Clover
+28,4005,1 //Santa Poring Card
+28,7034,1 //Red Stocking
+28,501,1 //Red Potion
+28,502,1 //Orange Potion
+28,503,1 //Yellow Potion
+28,504,1 //White Potion
+28,505,1 //Blue Potion
+28,506,1 //Green Potion
+28,526,1 //Royal Jelly
+28,529,1 //Candy
+28,530,1 //Candy Cane
+28,537,1 //Pet Food
+28,538,1 //Well-baked Cookie
+28,539,1 //Piece of Cake
+28,603,1 //Old Blue Box
+28,617,1 //Old Purple Box
+28,644,19 //Gift Box
+28,1558,1 //Girl's Diary
+//GiftBox_2
+29,756,5 //Rough Oridecon
+29,757,2 //Rough Elunium
+29,984,2 //Oridecon
+29,985,1 //Elunium
+29,714,1 //Emperium
+29,999,1 //Steel
+29,1000,1 //Star Crumb
+29,994,1 //Flame Heart
+29,995,1 //Mystic Frozen
+29,996,1 //Rough Wind
+29,997,1 //Great Nature
+29,975,1 //Scarlet Dyestuff
+29,976,1 //Lemon Dyestuff
+29,978,1 //Cobaltblue Dyestuff
+29,979,1 //Darkgreen Dyestuff
+29,980,1 //Orange Dyestuff
+29,981,1 //Violet Dyestuff
+29,982,1 //White Dyestuff
+29,983,1 //Black Dyestuff
+29,969,1 //Gold
+29,718,1 //Garnet
+29,719,1 //Amethyst
+29,720,1 //Aquamarine
+29,721,1 //Emerald
+29,722,1 //Pearl
+29,723,1 //Ruby
+29,724,1 //Cursed Ruby
+29,725,1 //Sardonyx
+29,726,1 //Sapphire
+29,727,1 //Opal
+29,728,1 //Topaz
+29,729,1 //Zircon
+29,730,1 //1carat Diamond
+29,731,1 //2carat Diamond
+29,732,1 //3carat Diamond
+29,733,1 //Cracked Diamond
+29,734,1 //Red Frame
+29,735,1 //Chung Jah
+29,736,1 //China
+29,737,1 //Black Ladle
+29,738,1 //Pencil Case
+29,739,1 //Rouge
+29,740,1 //Puppet
+29,741,1 //Poring Doll
+29,742,1 //Chonchon Doll
+29,743,1 //Spore Doll
+29,744,1 //Bouquet
+29,745,1 //Wedding Bouquet
+29,746,1 //Glass Bead
+29,747,1 //Crystal Mirror
+29,748,1 //Witherless Rose
+29,749,1 //Frozen Rose
+29,750,1 //Baphomet Doll
+29,751,1 //Osiris Doll
+29,752,1 //Grasshopper Doll
+29,753,1 //Yoyo Doll
+29,754,1 //Raccoon Doll
+29,706,1 //Four Leaf Clover
+29,4005,1 //Santa Poring Card
+29,7034,1 //Red Stocking
+29,501,1 //Red Potion
+29,502,1 //Orange Potion
+29,503,1 //Yellow Potion
+29,504,1 //White Potion
+29,505,1 //Blue Potion
+29,506,1 //Green Potion
+29,526,1 //Royal Jelly
+29,529,1 //Candy
+29,530,1 //Candy Cane
+29,537,1 //Pet Food
+29,538,1 //Well-baked Cookie
+29,539,1 //Piece of Cake
+29,603,1 //Old Blue Box
+29,617,1 //Old Purple Box
+29,644,19 //Gift Box
+29,1558,1 //Girl's Diary
+// Gift_Box3
+30,756,5 //Rough Oridecon
+30,757,2 //Rough Elunium
+30,984,2 //Oridecon
+30,985,1 //Elunium
+30,714,1 //Emperium
+30,999,1 //Steel
+30,1000,1 //Star Crumb
+30,994,1 //Flame Heart
+30,995,1 //Mystic Frozen
+30,996,1 //Rough Wind
+30,997,1 //Great Nature
+30,975,1 //Scarlet Dyestuff
+30,976,1 //Lemon Dyestuff
+30,978,1 //Cobaltblue Dyestuff
+30,979,1 //Darkgreen Dyestuff
+30,980,1 //Orange Dyestuff
+30,981,1 //Violet Dyestuff
+30,982,1 //White Dyestuff
+30,983,1 //Black Dyestuff
+30,969,1 //Gold
+30,718,1 //Garnet
+30,719,1 //Amethyst
+30,720,1 //Aquamarine
+30,721,1 //Emerald
+30,722,1 //Pearl
+30,723,1 //Ruby
+30,724,1 //Cursed Ruby
+30,725,1 //Sardonyx
+30,726,1 //Sapphire
+30,727,1 //Opal
+30,728,1 //Topaz
+30,729,1 //Zircon
+30,730,1 //1carat Diamond
+30,731,1 //2carat Diamond
+30,732,1 //3carat Diamond
+30,733,1 //Cracked Diamond
+30,734,1 //Red Frame
+30,735,1 //Chung Jah
+30,736,1 //China
+30,737,1 //Black Ladle
+30,738,1 //Pencil Case
+30,739,1 //Rouge
+30,740,1 //Puppet
+30,741,1 //Poring Doll
+30,742,1 //Chonchon Doll
+30,743,1 //Spore Doll
+30,744,1 //Bouquet
+30,745,1 //Wedding Bouquet
+30,746,1 //Glass Bead
+30,747,1 //Crystal Mirror
+30,748,1 //Witherless Rose
+30,749,1 //Frozen Rose
+30,750,1 //Baphomet Doll
+30,751,1 //Osiris Doll
+30,752,1 //Grasshopper Doll
+30,753,1 //Yoyo Doll
+30,754,1 //Raccoon Doll
+30,706,1 //Four Leaf Clover
+30,4005,1 //Santa Poring Card
+30,7034,1 //Red Stocking
+30,501,1 //Red Potion
+30,502,1 //Orange Potion
+30,503,1 //Yellow Potion
+30,504,1 //White Potion
+30,505,1 //Blue Potion
+30,506,1 //Green Potion
+30,526,1 //Royal Jelly
+30,529,1 //Candy
+30,530,1 //Candy Cane
+30,537,1 //Pet Food
+30,538,1 //Well-baked Cookie
+30,539,1 //Piece of Cake
+30,603,1 //Old Blue Box
+30,617,1 //Old Purple Box
+30,644,19 //Gift Box
+30,1558,1 //Girl's Diary
+// GiftBox_4
+31,756,5 //Rough Oridecon
+31,757,2 //Rough Elunium
+31,984,2 //Oridecon
+31,985,1 //Elunium
+31,714,1 //Emperium
+31,999,1 //Steel
+31,1000,1 //Star Crumb
+31,994,1 //Flame Heart
+31,995,1 //Mystic Frozen
+31,996,1 //Rough Wind
+31,997,1 //Great Nature
+31,975,1 //Scarlet Dyestuff
+31,976,1 //Lemon Dyestuff
+31,978,1 //Cobaltblue Dyestuff
+31,979,1 //Darkgreen Dyestuff
+31,980,1 //Orange Dyestuff
+31,981,1 //Violet Dyestuff
+31,982,1 //White Dyestuff
+31,983,1 //Black Dyestuff
+31,969,1 //Gold
+31,718,1 //Garnet
+31,719,1 //Amethyst
+31,720,1 //Aquamarine
+31,721,1 //Emerald
+31,722,1 //Pearl
+31,723,1 //Ruby
+31,724,1 //Cursed Ruby
+31,725,1 //Sardonyx
+31,726,1 //Sapphire
+31,727,1 //Opal
+31,728,1 //Topaz
+31,729,1 //Zircon
+31,730,1 //1carat Diamond
+31,731,1 //2carat Diamond
+31,732,1 //3carat Diamond
+31,733,1 //Cracked Diamond
+31,734,1 //Red Frame
+31,735,1 //Chung Jah
+31,736,1 //China
+31,737,1 //Black Ladle
+31,738,1 //Pencil Case
+31,739,1 //Rouge
+31,740,1 //Puppet
+31,741,1 //Poring Doll
+31,742,1 //Chonchon Doll
+31,743,1 //Spore Doll
+31,744,1 //Bouquet
+31,745,1 //Wedding Bouquet
+31,746,1 //Glass Bead
+31,747,1 //Crystal Mirror
+31,748,1 //Witherless Rose
+31,749,1 //Frozen Rose
+31,750,1 //Baphomet Doll
+31,751,1 //Osiris Doll
+31,752,1 //Grasshopper Doll
+31,753,1 //Yoyo Doll
+31,754,1 //Raccoon Doll
+31,706,1 //Four Leaf Clover
+31,4005,1 //Santa Poring Card
+31,7034,1 //Red Stocking
+31,501,1 //Red Potion
+31,502,1 //Orange Potion
+31,503,1 //Yellow Potion
+31,504,1 //White Potion
+31,505,1 //Blue Potion
+31,506,1 //Green Potion
+31,526,1 //Royal Jelly
+31,529,1 //Candy
+31,530,1 //Candy Cane
+31,537,1 //Pet Food
+31,538,1 //Well-baked Cookie
+31,539,1 //Piece of Cake
+31,603,1 //Old Blue Box
+31,617,1 //Old Purple Box
+31,644,19 //Gift Box
+31,1558,1 //Girl's Diary
+// GiftBox_China
+34,501,1 //Red Potion
+34,502,1 //Orange Potion
+34,503,1 //Yellow Potion
+34,504,1 //White Potion
+34,505,1 //Blue Potion
+34,506,1 //Green Potion
+34,518,1 //Honey
+34,520,1 //Hinalle Leaflet
+34,521,1 //Aloe Leaflet
+34,521,1 //Aloe Leaflet
+34,525,1 //Panacea
+34,526,1 //Royal Jelly
+34,529,1 //Candy
+34,530,1 //Candy Cane
+34,603,40 //Old Blue Box
+34,604,9 //Dead Branch
+34,605,1 //Anodyne
+34,606,1 //Aloevera
+34,607,1 //Yggdrasil Berry
+34,608,1 //Yggdrasil Seed
+34,610,1 //Yggdrasil Leaf
+34,612,5 //Mini Furnace
+34,613,1 //Iron Hammer
+34,614,1 //Golden Hammer
+34,615,1 //Oridecon Hammer
+34,701,1 //Ora Ora
+34,702,1 //Animal Gore
+34,703,1 //Hinalle
+34,704,1 //Aloe
+34,706,1 //Four Leaf Clover
+34,707,1 //Singing Plant
+34,708,1 //Ment
+34,710,1 //Illusion Flower
+34,714,1 //Emperium
+34,715,1 //Yellow Gemstone
+34,716,1 //Red Gemstone
+34,717,1 //Blue Gemstone
+34,718,1 //Garnet
+34,719,1 //Amethyst
+34,720,1 //Aquamarine
+34,721,1 //Emerald
+34,722,1 //Pearl
+34,723,1 //Ruby
+34,724,1 //Cursed Ruby
+34,725,1 //Sardonyx
+34,726,1 //Sapphire
+34,727,1 //Opal
+34,728,1 //Topaz
+34,729,1 //Zircon
+34,730,1 //1carat Diamond
+34,731,1 //2carat Diamond
+34,732,1 //3carat Diamond
+34,733,1 //Cracked Diamond
+34,734,1 //Red Frame
+34,735,1 //Chung Jah
+34,736,1 //China
+34,737,1 //Black Ladle
+34,738,1 //Pencil Case
+34,740,1 //Puppet
+34,741,1 //Poring Doll
+34,742,1 //Chonchon Doll
+34,743,1 //Spore Doll
+34,745,1 //Wedding Bouquet
+34,747,1 //Crystal Mirror
+34,748,1 //Witherless Rose
+34,749,1 //Frozen Rose
+34,752,1 //Grasshopper Doll
+34,753,1 //Yoyo Doll
+34,754,1 //Raccoon Doll
+34,756,1 //Rough Oridecon
+34,757,1 //Rough Elunium
+34,909,1 //Jellopy
+34,910,1 //Garlet
+34,911,1 //Scell
+34,912,1 //Zargon
+34,931,1 //Orcish Voucher
+34,934,1 //Memento
+34,968,1 //Heroic Emblem
+34,969,1 //Gold
+34,970,1 //Alcohol
+34,971,1 //Detrimindexta
+34,972,1 //Karvodailnirol
+34,973,1 //Counteragent
+34,974,1 //Mixture
+34,975,1 //Scarlet Dyestuff
+34,976,1 //Lemon Dyestuff
+34,978,1 //Cobaltblue Dyestuff
+34,979,1 //Darkgreen Dyestuff
+34,980,1 //Orange Dyestuff
+34,981,1 //Violet Dyestuff
+34,982,1 //White Dyestuff
+34,983,1 //Black Dyestuff
+34,984,1 //Oridecon
+34,985,1 //Elunium
+34,986,1 //Anvil
+34,987,1 //Oridecon Anvil
+34,988,1 //Golden Anvil
+34,989,1 //Emperium Anvil
+34,990,1 //Red Blood
+34,991,1 //Crystal Blue
+34,992,1 //Wind of Verdure
+34,993,1 //Green Live
+34,994,1 //Flame Heart
+34,995,1 //Mystic Frozen
+34,996,1 //Rough Wind
+34,997,1 //Great Nature
+34,998,1 //Iron
+34,999,1 //Steel
+34,1000,1 //Star Crumb
+34,1001,1 //Star Dust
+34,1002,1 //Iron Ore
+34,1003,1 //Coal
+34,1004,1 //Chivalry Emblem
+34,1005,1 //Hammer of Blacksmith
+34,1006,1 //Old Magicbook
+34,1007,1 //Necklace of Wisdom
+34,1008,1 //Necklace of Oblivion
+34,1009,1 //Hand of God
+34,1010,1 //Phracon
+34,1011,1 //Emveretarcon
+34,1065,1 //Trap
+34,1102,1 //Sword
+34,1105,1 //Falchion
+34,1108,1 //Blade
+34,1111,1 //Rapier
+34,1114,1 //Scimitar
+34,1117,1 //Katana
+34,1120,1 //Tsurugi
+34,1125,1 //Ring Pommel Saber
+34,1127,1 //Saber
+34,1128,1 //Haedonggum
+34,1129,1 //Flamberge
+34,1152,1 //Slayer
+34,1155,1 //Bastard Sword
+34,1158,1 //Two-Handed Sword
+34,1162,1 //Broad Sword
+34,1163,1 //Claymore
+34,1202,1 //Knife
+34,1205,1 //Cutter
+34,1208,1 //Main Gauche
+34,1211,1 //Dirk
+34,1214,1 //Dagger
+34,1217,1 //Stiletto
+34,1220,1 //Gladius
+34,1226,1 //Damascus
+34,1251,1 //Jur
+34,1253,1 //Katar
+34,1255,1 //Jamadhar
+34,1302,1 //Axe
+34,1352,1 //Battle Axe
+34,1355,1 //Hammer
+34,1358,1 //Buster
+34,1361,1 //Two-Handed Axe
+34,1402,1 //Javelin
+34,1405,1 //Spear
+34,1408,1 //Pike
+34,1410,1 //Lance
+34,1452,1 //Guisarme
+34,1455,1 //Glaive
+34,1458,1 //Partizan
+34,1461,1 //Trident
+34,1464,1 //Halberd
+34,1502,1 //Club
+34,1505,1 //Mace
+34,1508,1 //Smasher
+34,1511,1 //Flail
+34,1514,1 //Morning Star
+34,1517,1 //Sword Mace
+34,1520,1 //Chain
+34,1550,1 //Book
+34,1551,1 //Bible
+34,1602,1 //Rod
+34,1605,1 //Wand
+34,1608,1 //Staff
+34,1611,1 //Arc Wand
+34,1613,1 //Mighty Staff
+34,1702,1 //Bow
+34,1705,1 //Composite Bow
+34,1711,1 //Crossbow
+34,1713,1 //Arbalest
+34,1714,1 //Gakkung Bow
+34,1718,1 //Hunter Bow
+34,1719,1 //Roguemaster's Bow
+34,2102,1 //Guard
+34,2104,1 //Buckler
+34,2106,1 //Shield
+34,2108,1 //Mirror Shield
+34,2207,1 //Fancy Flower
+34,2209,1 //Ribbon
+34,2213,1 //Kitty Band
+34,2215,1 //Flower Band
+34,2217,1 //Biretta
+34,2221,1 //Hat
+34,2223,1 //Turban
+34,2225,1 //Goggles
+34,2227,1 //Cap
+34,2229,1 //Helm
+34,2231,1 //Gemmed Sallet
+34,2233,1 //Circlet
+34,2236,1 //Santa Hat
+34,2244,1 //Big Ribbon
+34,2249,1 //Coronet
+34,2250,1 //Cute Ribbon
+34,2257,1 //Unicorn Horn
+34,2258,1 //Spiky Band
+34,2262,1 //Clown Nose
+34,2263,1 //Zorro Masque
+34,2265,1 //Gangster Mask
+34,2269,1 //Romantic Flower
+34,2270,1 //Romantic Leaf
+34,2271,1 //Jack be Dandy
+34,2272,1 //Stop Post
+34,2273,1 //Doctor Band
+34,2275,1 //Red Bandana
+34,2276,1 //Angled Glasses
+34,2279,1 //Bomb Wick
+34,2284,1 //Antlers
+34,2287,1 //Pirate Bandana
+34,2289,1 //Poo Poo Hat
+34,2290,1 //Funeral Hat
+34,2291,1 //Masquerade
+34,2293,1 //Pretend Murdered
+34,2294,1 //Stellar
+34,2295,1 //Blinker
+34,2296,1 //Binoculars
+34,2298,1 //Green Feeler
+34,2299,1 //Orc Helm
+34,2302,1 //Cotton Shirt
+34,2304,1 //Jacket
+34,2306,1 //Adventurer's Suit
+34,2308,1 //Mantle
+34,2310,1 //Coat
+34,2311,1 //Mink Coat
+34,2313,1 //Padded Armor
+34,2315,1 //Chain Mail
+34,2317,1 //Full Plate
+34,2322,1 //Silk Robe
+34,2324,1 //Scapulare
+34,2326,1 //Saint's Robe
+34,2329,1 //Wooden Mail
+34,2331,1 //Tights
+34,2333,1 //Silver Robe
+34,2336,1 //Thief Clothes
+34,2337,1 //Ninja Suit
+34,2338,1 //Wedding Dress
+34,2339,1 //Pantie
+34,2402,1 //Sandals
+34,2404,1 //Shoes
+34,2407,1 //Crystal Pumps
+34,2408,1 //Shackles
+34,2409,1 //High Heels
+34,2502,1 //Hood
+34,2504,1 //Muffler
+34,2506,1 //Manteau
+34,2507,1 //Ancient Cape
+34,2508,1 //Ragamuffin Manteau
+34,2601,1 //Ring
+34,2602,1 //Earring
+34,2603,1 //Necklace
+34,2604,1 //Glove
+34,2605,1 //Brooch
+34,2607,1 //Clip
+34,2608,1 //Rosary
+34,2609,1 //Skull Ring
+34,2610,1 //Gold Ring
+34,2611,1 //Silver Ring
+34,2612,1 //Flower Ring
+34,2613,1 //Diamond Ring
+34,5008,1 //Puppy Love
+34,5009,1 //Safety Helmet
+34,5010,1 //Indian Fillet
+34,5014,1 //Fin Helm
+34,5015,1 //Egg Shell
+
diff --git a/db/item_misc.txt b/db/item_misc.txt
index 179ae8c2f..d96ad31a1 100644
--- a/db/item_misc.txt
+++ b/db/item_misc.txt
@@ -1,12 +1,92 @@
//GroupID,ItemID,Rate
//
// Potions
-8,501,1
-8,502,1
-8,503,1
-8,504,1
-8,505,1
-8,506,1
+8,678,1 //Poison Bottle
+8,501,1 //Red Potion
+8,502,1 //Orange Potion
+8,503,1 //Yellow Potion
+8,12017,1 //Slow Potion
+8,504,1 //White Potion
+8,505,1 //Blue Potion
+8,506,1 //Green Potion
+8,545,1 //Condensed Red Potion
+8,546,1 //Condensed Yellow Potion
+8,547,1 //Condensed White Potion
+8,12020,1 //Cursed_Water
+8,645,1 //Concentration Potion
+8,656,1 //Awakening Potion
+8,657,1 //Berserk Potion
+8,569,1 //Novice Potion
+8,605,1 //Anodyne
+8,12016,1 //Speed Potion
+8,501,1 //Red Potion
+8,502,1 //Orange Potion
+8,503,1 //Yellow Potion
+8,12017,1 //Slow Potion
+8,504,1 //White Potion
+8,505,1 //Blue Potion
+8,506,1 //Green Potion
+8,545,1 //Condensed Red Potion
+8,546,1 //Condensed Yellow Potion
+8,547,1 //Condensed White Potion
+8,12020,1 //Cursed_Water
+8,645,1 //Concentration Potion
+8,656,1 //Awakening Potion
+8,657,1 //Berserk Potion
+8,569,1 //Novice Potion
+8,605,1 //Anodyne
+8,12016,1 //Speed Potion
+8,501,1 //Red Potion
+8,502,1 //Orange Potion
+8,503,1 //Yellow Potion
+8,12017,1 //Slow Potion
+8,504,1 //White Potion
+8,505,1 //Blue Potion
+8,506,1 //Green Potion
+8,545,1 //Condensed Red Potion
+8,546,1 //Condensed Yellow Potion
+8,547,1 //Condensed White Potion
+8,12020,1 //Cursed_Water
+8,645,1 //Concentration Potion
+8,656,1 //Awakening Potion
+8,657,1 //Berserk Potion
+8,569,1 //Novice Potion
+8,605,1 //Anodyne
+8,12016,1 //Speed Potion
+8,501,1 //Red Potion
+8,502,1 //Orange Potion
+8,503,1 //Yellow Potion
+8,12017,1 //Slow Potion
+8,504,1 //White Potion
+8,505,1 //Blue Potion
+8,506,1 //Green Potion
+8,545,1 //Condensed Red Potion
+8,546,1 //Condensed Yellow Potion
+8,547,1 //Condensed White Potion
+8,12020,1 //Cursed_Water
+8,645,1 //Concentration Potion
+8,656,1 //Awakening Potion
+8,657,1 //Berserk Potion
+8,569,1 //Novice Potion
+8,605,1 //Anodyne
+8,12016,1 //Speed Potion
+8,501,1 //Red Potion
+8,502,1 //Orange Potion
+8,503,1 //Yellow Potion
+8,12017,1 //Slow Potion
+8,504,1 //White Potion
+8,505,1 //Blue Potion
+8,506,1 //Green Potion
+8,545,1 //Condensed Red Potion
+8,546,1 //Condensed Yellow Potion
+8,547,1 //Condensed White Potion
+8,12020,1 //Cursed_Water
+8,645,1 //Concentration Potion
+8,656,1 //Awakening Potion
+8,657,1 //Berserk Potion
+8,569,1 //Novice Potion
+8,605,1 //Anodyne
+8,12016,1 //Speed Potion
// Herbs
9,507,1
9,508,1
@@ -102,110 +182,395 @@
21,1010,1
21,1011,1
// taming items
-22,619,1
-22,620,1
-22,621,1
-22,622,1
-22,623,1
-22,624,1
-22,625,1
-22,626,1
-22,627,1
-22,628,1
-22,629,1
-22,630,1
-22,631,1
-22,632,1
-22,633,1
-22,634,1
-22,635,1
-22,636,1
-22,637,1
-22,638,1
-22,639,1
-22,640,1
-22,641,1
-22,642,1
-22,659,1
-22,660,1
-22,661,1
+22,619,1 //Unripe Apple
+22,620,1 //Orange Juice
+22,621,1 //Bitter Herb
+22,622,1 //Rainbow Carrot
+22,623,1 //Earthworm the Dude
+22,624,1 //Rotten Fish
+22,625,1 //Rusty Iron
+22,626,1 //Monster Juice
+22,627,1 //Sweet Milk
+22,628,1 //Well-Dried Bone
+22,629,1 //Singing Flower
+22,630,1 //Dew Laden Moss
+22,631,1 //Deadly Noxious Herb
+22,632,1 //Fatty Chubby Earthworm
+22,633,1 //Sweet Potato
+22,634,1 //Tropical Banana
+22,635,1 //Orc Trophy
+22,636,1 //No Recipient
+22,637,1 //Old Broom
+22,638,1 //Silver Knife of Chastity
+22,639,1 //Armlet of Obedience
+22,640,1 //Shining Stone
+22,641,1 //Contracts in Shadow
+22,642,1 //Book of the Devil
+22,659,1 //Her Heart
+22,660,1 //Forbidden Red Candle
+22,661,1 //Soft Apron
+22,10001,1 //Skull Helm
+22,10002,1 //Monster Oxygen Mask
+22,10003,1 //Transparent Headgear
+22,10004,1 //Pacifier
+22,10005,1 //Wig
+22,10006,1 //Queen's Hair Ornament
+22,10007,1 //Silk Ribbon
+22,10008,1 //Punisher
+22,10009,1 //Wild Flower
+22,10010,1 //Battered Pot
+22,10011,1 //Stellar Hairpin
+22,10012,1 //Tiny Egg Shell
+22,10013,1 //Backpack
+22,10014,1 //Rocker Glasses
+22,10015,1 //Green Lace
+22,10016,1 //Golden Bell
+22,10017,1 //Bark Shorts
+22,10018,1 //Monkey Circlet
+22,10019,1 //Red Scarf
+22,10020,1 //Grave Keeper's Sword
//scrolls
-23,686,1
-23,687,1
-23,688,1
-23,689,1
-23,690,1
-23,691,1
-23,692,1
-23,693,1
-23,694,1
-23,695,1
-23,696,1
-23,697,1
-23,698,1
-23,699,1
-23,700,1
-23,12000,1
-23,12001,1
-23,12002,1
-23,12003,1
+23,686,1 //Level 3 Earth Spike
+23,687,1 //Level 5 Earth Spike
+23,688,1 //Level 3 Cold Bolt
+23,689,1 //Level 5 Cold Bolt
+23,690,1 //Level 3 Fire Bolt
+23,691,1 //Level 5 Fire Bolt
+23,692,1 //Level 3 Lightening Bolt
+23,693,1 //Level 5 Lightening Bolt
+23,694,1 //Level 3 Soul Strike
+23,695,1 //Level 5 Soul Strike
+23,696,1 //Level 1 Fire Ball
+23,697,1 //Level 5 Fire Ball
+23,698,1 //Level 1 Fire Wall
+23,699,1 //Level 5 Fire Wall
+23,700,1 //Level 1 Frost Diver
+23,12000,1 //Level 5 Frost Diver
+23,12001,1 //Level 3 Heal
+23,12002,1 //Level 5 Heal
//quivers
-24,12004,1
-24,12005,1
-24,12006,1
-24,12007,1
-24,12008,1
-24,12009,1
-24,12010,1
-24,12011,1
-24,12012,1
-24,12013,1
-24,12014,1
-24,12015,1
+24,12004,1 //Quiver
+24,12005,1 //Iron Arrow Quiver
+24,12006,1 //Steel Arrow Quiver
+24,12007,1 //Oridecon Arrow Quiver
+24,12008,1 //Fire Arrow Quiver
+24,12009,1 //Silver Arrow Quiver
+24,12010,1 //Wind Arrow Quiver
+24,12011,1 //Stone Arrow Quiver
+24,12012,1 //Crystal Arrow Quiver
+24,12013,1 //Shadow Arrow Quiver
+24,12014,1 //Immaterial Arrow Quiver
+24,12015,1 //Rusty Arrow Quiver
//masks
-25,2263,1
-25,2278,1
-25,2288,1
-25,2297,1
-25,5043,1
-25,5087,1
-25,5088,1
-25,5089,1
-25,5090,1
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,2278,1 //Mr. Smile
+25,2281,1 //Opera Masque
+25,2288,1 //Mr. Scream
+25,2292,1 //Welding Mask
+25,2297,1 //Goblin Mask
+25,5005,1 //Gas Mask
+25,5086,1 //Alarm Mask
+25,5087,1 //Poker Face
+25,5088,1 //Surprised Mask
+25,5089,1 //Annoyed Mask
+25,5090,1 //Goblin Leader Mask
+25,5121,1 //Zherlthsh Mask
//accessory
-26,2601,1
-26,2602,1
-26,2603,1
-26,2604,1
-26,2605,1
-26,2606,1
-26,2607,1
-26,2608,1
-26,2610,1
-26,2611,1
-26,2612,1
-26,2613,1
-26,2614,1
-26,2615,1
-26,2616,1
-26,2617,1
-26,2618,1
-26,2619,1
-26,2620,1
-26,2621,1
-26,2622,1
-26,2623,1
-26,2624,1
-26,2625,1
-26,2626,1
-26,2627,1
-26,2628,1
-26,2640,1
-26,2641,1
-26,2648,1
-26,2649,1
-26,2650,1
-26,2651,1
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2604,1 //Glove
+26,2610,1 //Gold Ring
+26,2617,1 //Celebrant's Mitten
+26,2612,1 //Flower Ring
+26,2603,1 //Necklace
+26,2623,1 //Necklace
+26,2628,1 //Novice Armlet
+26,2613,1 //Diamond Ring
+26,2609,1 //Skull Ring
+26,2619,1 //Bow Thimble
+26,2608,1 //Rosary
+26,2601,1 //Ring
+26,2618,1 //Matyr's Leash
+26,2627,1 //Belt
+26,2605,1 //Brooch
+26,2658,1 //Nile Rose
+26,2611,1 //Silver Ring
+26,2607,1 //Clip
+26,2602,1 //Earring
+26,2615,1 //Safety Ring
+26,2616,1 //Critical Ring
+26,2624,1 //Glove
+26,2621,1 //Ring
+26,2626,1 //Rosary
+26,2625,1 //Brooch
+26,2622,1 //Earring
// jewels
27,718,1
27,719,1
@@ -223,3 +588,21 @@
27,731,1
27,732,1
27,733,1
+// Egg Boy
+32,514,300 //Grape
+32,564,522 //Rice Ball
+32,660,20 //Forbidden Red Candle
+32,682,100 //Distilled Fighting Spirit
+32,683,50 //Herb of Incantation
+32,2235,2 //Crown
+32,2274,5 //Ghost Bandana
+32,5072,1 //Incubus Horn
+// Egg Girl
+33,514,300 //Grape
+33,564,522 //Rice Ball
+33,661,20 //Soft Apron
+33,682,100 //Distilled Fighting Spirit
+33,683,50 //Herb of Incantation
+33,2234,2 //Tiara
+33,5042,5 //Bao Bao
+33,5066,1 //Succubus Horn
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index cdb724ef3..796712af3 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -468,6 +468,13 @@ static void itemdb_read_itemgroup(void)
"Masks",
"Accesory",
"Jewels",
+ "Gift Box",
+ "Gift Box",
+ "Gift Box",
+ "Gift Box",
+ "Egg Boy",
+ "Egg Girl",
+ "Gift Box"
};
memset(&itemgroup_db, 0, sizeof(itemgroup_db));
snprintf(path, 255, "%s/item_group_db.txt", db_path);
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index c439782e7..4b0273910 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -88,6 +88,13 @@ enum {
IG_MASKS, //25
IG_ACCESORY, //26
IG_JEWELS, //27
+ IG_GIFTBOX_1, //28
+ IG_GIFTBOX_2, //29
+ IG_GIFTBOX_3, //30
+ IG_GIFTBOX_4, //31
+ IG_EGGBOY, //32
+ IG_EGGGIRL, //33
+ IG_GIFTBOXCHINA, //34
MAX_ITEMGROUP,
} item_group_list;
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-09 21:06:36 +0000