Merge branch 'master' of https://github.com/HerculesWS/Hercules

17 files changed, 3191 insertions, 749 deletions

diff --git a/db/item_delay.txt b/db/item_delay.txt
index afcb56f9e..c5bf0da7d 100644
--- a/db/item_delay.txt
+++ b/db/item_delay.txt
@@ -33,4 +33,5 @@
 12726,30000 // Runstone_Rhydo,Raido Rune
 12727,60000 // Runstone_Verkana,Berkana Rune
 12732,1000 // Runstone_Pertz,Wyrd Rune
+22540,60000 // Runstone_Luxanima,Lux Anima Rune
 
diff --git a/db/item_stack.txt b/db/item_stack.txt
index b2932b56b..262945c4c 100644
--- a/db/item_stack.txt
+++ b/db/item_stack.txt
@@ -22,6 +22,7 @@
 12731,20,1  // Thurisaz Rune
 12732,20,1  // Wyrd Rune
 12733,20,1  // Hagalaz Rune
+22540,20,1  // Lux Anima Rune
 
 // Arch Bishop
 12333,3,1  // Ancilla
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index c01d60b75..191cb0d86 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -6554,3 +6554,5 @@
 19505,T_Cigarette,T Cigarette,5,0,,0,,0,,0,0xFFFFFFFF,7,2,4096,,0,0,54,{},{},{}
 19506,T_Valkyrie_Feather_Band,T Valkyrie Feather Band,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,1,300,{},{},{}
 19507,Clear_Sun,Clear Sun,5,0,,0,,0,,0,0xFFFFFFFF,7,2,1024,,1,0,654,{},{},{}
+
+22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
\ No newline at end of file
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index b2f4b1ac4..a8beeca43 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -19,7 +19,7 @@
 */
 
 Old_Card_Album: (
-	("Poring_Card",8),
+	("Poring_Card",9),
 	("Fabre_Card",10),
 	("Pupa_Card",6),
 	("Drops_Card",11),
@@ -140,7 +140,6 @@ Old_Card_Album: (
 	"Baphomet__Card",
 	"Daydric_Card",
 	"Khalitzburg_Card",
-	"Joker_Card",
 	"Evil_Druid_Card",
 	"Gargoyle_Card",
 	"Goat_Card",
@@ -191,6 +190,7 @@ Old_Card_Album: (
 	"Mystcase_Card",
 	"Miyabi_Ningyo_Card",
 	"Violy_Card",
+	"Wander_Man_Card",
 	"Bon_Gun_Card",
 	"Brilight_Card",
 	"Bloody_Murderer_Card",
@@ -293,6 +293,7 @@ Old_Card_Album: (
 	"Hyegun_Card",
 	"Phendark_Card",
 	"Heater_Card",
+	"Antonio_Card",
 	"Agav_Card",
 	"Echio_Card",
 	"Vanberk_Card",
@@ -324,12 +325,6 @@ Old_Card_Album: (
 	"Necromancer_Card"
 )
 Gift_Box: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -387,24 +382,20 @@ Gift_Box: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_1: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -462,24 +453,20 @@ Gift_Box_1: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_2: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -537,24 +524,20 @@ Gift_Box_2: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_3: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -612,24 +595,20 @@ Gift_Box_3: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_4: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -687,13 +666,15 @@ Gift_Box_4: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
@@ -742,7 +723,6 @@ Old_Blue_Box: (
 	("Thief_Clothes",3),
 	("Thief_Clothes_",3),
 	("Ninja_Suit",3),
-	("Wedding_Dress",3),
 	("G_Strings",3),
 	("Novice_Breast",3),
 	("Full_Plate_Armor",3),
@@ -999,6 +979,7 @@ Old_Blue_Box: (
 	("Snowy_Horn",3),
 	("Mini_Propeller",3),
 	("Mini_Glasses",3),
+	("Prontera_Army_Cap",3),
 	("Pierrot_Nose",3),
 	("Gangster_Patch",3),
 	("Ganster_Mask",3),
@@ -1024,7 +1005,6 @@ Old_Blue_Box: (
 	("Viking_Helm",3),
 	("Joker_Jester",3),
 	("Machoman_Glasses",3),
-	("Puppy_Love",3),
 	("Safety_Helmet",3),
 	("Indian_Hair_Piece",3),
 	("Antenna",3),
@@ -1074,7 +1054,7 @@ Old_Blue_Box: (
 	("Illusion_Flower",12),
 	("Shoot",12),
 	("Flower",12),
-	("Emperium",12),
+	("Empty_Bottle",12),
 	("Yellow_Gemstone",12),
 	("Red_Gemstone",12),
 	("Blue_Gemstone",12),
@@ -1115,8 +1095,6 @@ Old_Blue_Box: (
 	("Grasshopper_Doll",12),
 	("Monkey_Doll",12),
 	("Raccoondog_Doll",12),
-	("Oridecon_Stone",12),
-	("Elunium_Stone",12),
 	("Danggie",12),
 	("Tree_Root",12),
 	("Reptile_Tongue",12),
@@ -1184,7 +1162,6 @@ Old_Blue_Box: (
 	("Turtle_Shell",12),
 	("Voucher_Of_Orcish_Hero",12),
 	("Gold",12),
-	("Alchol",12),
 	("Detrimindexta",12),
 	("Karvodailnirol",12),
 	("Counteragent",12),
@@ -1197,8 +1174,6 @@ Old_Blue_Box: (
 	("Violet_Dyestuffs",12),
 	("White_Dyestuffs",12),
 	("Black_Dyestuffs",12),
-	("Oridecon",12),
-	("Elunium",12),
 	("Anvil",12),
 	("Oridecon_Anvil",12),
 	("Golden_Anvil",12),
@@ -1243,7 +1218,6 @@ Old_Blue_Box: (
 	("Porcupine_Spike",12),
 	("Wild_Boar's_Mane",12),
 	("Tiger's_Skin",12),
-	("Tiger_Footskin",12),
 	("Limb_Of_Mantis",12),
 	("Blossom_Of_Maneater",12),
 	("Root_Of_Maneater",12),
@@ -1393,7 +1367,6 @@ Old_Blue_Box: (
 	("Mystery_Iron_Bit",12),
 	("Great_Wing",12),
 	("Taegeuk_Plate",12),
-	("Tuxedo",12),
 	("Leopard_Skin",12),
 	("Leopard_Talon",12),
 	("Packing_Ribbon",12),
@@ -1468,7 +1441,9 @@ Old_Blue_Box: (
 	("Red_Potion",12),
 	("Orange_Potion",12),
 	("Yellow_Potion",12),
-	("Green_Potion",11),
+	("White_Potion",12),
+	("Blue_Potion",12),
+	("Green_Potion",12),
 	("Red_Herb",12),
 	("Yellow_Herb",12),
 	("White_Herb",12),
@@ -1487,6 +1462,7 @@ Old_Blue_Box: (
 	("Fruit_Of_Mastela",12),
 	("Holy_Water",12),
 	("Panacea",12),
+	("Royal_Jelly",12),
 	("Monster's_Feed",12),
 	("Candy",12),
 	("Candy_Striper",12),
@@ -1511,8 +1487,9 @@ Old_Blue_Box: (
 	("Rice_Cake",12),
 	("Chocolate",12),
 	("White_Chocolate",12),
-	"Wing_Of_Butterfly",
-	("Old_Blue_Box",1173),
+	("Wing_Of_Fly",12),
+	("Wing_Of_Butterfly",12),
+	("Branch_Of_Dead_Tree",512),
 	("Anodyne",12),
 	("Aloebera",12),
 	("Yggdrasilberry",12),
@@ -1568,6 +1545,7 @@ Old_Blue_Box: (
 	"Angelic_Chain",
 	"Satanic_Chain",
 	"Sharp_Gear",
+	"Ghost_Bandana",
 	"Ring_",
 	"Earring_",
 	"Necklace_",
@@ -1674,14 +1652,14 @@ Old_Blue_Box: (
 	"Pot",
 	"Burnt_Parts",
 	"Pocket_Watch",
-	("Ice_Heart",21),
-	("Ice_Scale",22),
-	("Bloody_Rune",22),
-	("Rotten_Meat",22),
-	("Sticky_Poison",22),
+	("Ice_Heart",15),
+	("Ice_Scale",15),
+	("Bloody_Rune",15),
+	("Rotten_Meat",15),
+	("Sticky_Poison",15),
 	"Suspicious_Hat",
 	"White_Mask",
-	("Old_White_Cloth",33),
+	("Old_White_Cloth",34),
 	("Clattering_Skull",32),
 	("Broken_Farming_Utensil",34),
 	"Orleans_Server",
@@ -1750,7 +1728,6 @@ Old_Violet_Box: (
 	("Silver_Robe_",7),
 	("Thief_Clothes_",7),
 	("Ninja_Suit",7),
-	("Wedding_Dress",7),
 	("G_Strings",7),
 	("Novice_Breast",7),
 	("Novice_Plate",7),
@@ -1926,6 +1903,7 @@ Old_Violet_Box: (
 	("Snowy_Horn",7),
 	("Mini_Propeller",7),
 	("Mini_Glasses",7),
+	("Prontera_Army_Cap",7),
 	("Pierrot_Nose",7),
 	("Gangster_Patch",7),
 	("Ganster_Mask",7),
@@ -1951,7 +1929,6 @@ Old_Violet_Box: (
 	("Viking_Helm",7),
 	("Joker_Jester",7),
 	("Machoman_Glasses",7),
-	("Puppy_Love",7),
 	("Safety_Helmet",7),
 	("Indian_Hair_Piece",7),
 	("Antenna",7),
@@ -2001,7 +1978,7 @@ Old_Violet_Box: (
 	("Illusion_Flower",14),
 	("Shoot",14),
 	("Flower",14),
-	("Emperium",14),
+	("Empty_Bottle",14),
 	("Yellow_Gemstone",14),
 	("Red_Gemstone",14),
 	("Blue_Gemstone",14),
@@ -2042,8 +2019,6 @@ Old_Violet_Box: (
 	("Grasshopper_Doll",14),
 	("Monkey_Doll",14),
 	("Raccoondog_Doll",14),
-	("Oridecon_Stone",14),
-	("Elunium_Stone",14),
 	("Danggie",14),
 	("Tree_Root",14),
 	("Reptile_Tongue",14),
@@ -2111,7 +2086,6 @@ Old_Violet_Box: (
 	("Turtle_Shell",14),
 	("Voucher_Of_Orcish_Hero",14),
 	("Gold",14),
-	("Alchol",14),
 	("Detrimindexta",14),
 	("Karvodailnirol",14),
 	("Counteragent",14),
@@ -2124,9 +2098,7 @@ Old_Violet_Box: (
 	("Violet_Dyestuffs",14),
 	("White_Dyestuffs",14),
 	("Black_Dyestuffs",14),
-	("Oridecon",14),
-	("Elunium",14),
-	("Anvil",14),
+	("Anvil",13),
 	("Oridecon_Anvil",14),
 	("Golden_Anvil",14),
 	("Emperium_Anvil",14),
@@ -2170,7 +2142,6 @@ Old_Violet_Box: (
 	("Porcupine_Spike",14),
 	("Wild_Boar's_Mane",14),
 	("Tiger's_Skin",14),
-	("Tiger_Footskin",14),
 	("Limb_Of_Mantis",14),
 	("Blossom_Of_Maneater",14),
 	("Root_Of_Maneater",14),
@@ -2320,7 +2291,6 @@ Old_Violet_Box: (
 	("Mystery_Iron_Bit",14),
 	("Great_Wing",14),
 	("Taegeuk_Plate",14),
-	("Tuxedo",14),
 	("Leopard_Skin",14),
 	("Leopard_Talon",14),
 	("Packing_Ribbon",14),
@@ -2395,6 +2365,8 @@ Old_Violet_Box: (
 	("Red_Potion",14),
 	("Orange_Potion",14),
 	("Yellow_Potion",14),
+	("White_Potion",14),
+	("Blue_Potion",14),
 	("Green_Potion",14),
 	("Red_Herb",14),
 	("Yellow_Herb",14),
@@ -2414,6 +2386,7 @@ Old_Violet_Box: (
 	("Fruit_Of_Mastela",14),
 	("Holy_Water",14),
 	("Panacea",14),
+	("Royal_Jelly",14),
 	("Monster's_Feed",14),
 	("Candy",14),
 	("Candy_Striper",14),
@@ -2438,7 +2411,9 @@ Old_Violet_Box: (
 	("Rice_Cake",14),
 	("Chocolate",14),
 	("White_Chocolate",14),
-	("Old_Blue_Box",614),
+	("Wing_Of_Fly",14),
+	("Wing_Of_Butterfly",14),
+	("Branch_Of_Dead_Tree",214),
 	("Anodyne",14),
 	("Aloebera",14),
 	("Yggdrasilberry",14),
@@ -2490,12 +2465,11 @@ Old_Violet_Box: (
 	("Poison_Bottle",14),
 	("Gold_Pill",14),
 	("Guard_",6),
-	"Tiara",
-	"Crown",
 	"Coronet",
 	"Angelic_Chain",
 	"Satanic_Chain",
 	"Sharp_Gear",
+	"Ghost_Bandana",
 	"Elven_Ears",
 	"Holy_Robe",
 	"Mage_Coat",
@@ -2512,8 +2486,6 @@ Old_Violet_Box: (
 	"Pair_Of_Red_Ribbon",
 	"Loard_Circlet",
 	"Bone_Helm",
-	"Corsair",
-	"Assassin_Mask",
 	"Horn_Of_Succubus",
 	"Inccubus_Horn",
 	"Spinx_Helm",
@@ -2619,7 +2591,7 @@ Old_Violet_Box: (
 	"Suspicious_Hat",
 	"White_Mask",
 	("Old_Violet_Box",103),
-	("Old_White_Cloth",16),
+	("Old_White_Cloth",17),
 	("Clattering_Skull",16),
 	("Broken_Farming_Utensil",17),
 	"Inverse_Scale",
@@ -2747,13 +2719,13 @@ Accessory_Box: (
 	"Rosary_",
 	"Brooch_",
 	"Earring_",
+	("Vesper_Core01",2),
 	("Vesper_Core02",2),
 	("Vesper_Core03",2),
 	("Vesper_Core04",2),
 	"Thimble_Of_Archer_",
 	("Red_Silk_Seal",2),
 	"Orleans_Glove",
-	"Vesper_Core01",
 	"Spiritual_Ring",
 	"Shinobi's_Sash",
 	"Hyper_Changer",
@@ -2776,7 +2748,8 @@ Wrapped_Mask: (
 	("Goblin_Mask_03",10),
 	("Goblin_Mask_04",10),
 	("Mr_Smile",9),
-	"Zherlthsh_Mask"
+	"Zherlthsh_Mask",
+	("Hahoe_Mask",2)
 )
 Bundle_Of_Magic_Scroll: (
 	"Earth_Scroll_1_5",
@@ -2836,6 +2809,7 @@ Food_Package: (
 	"Leaflet_Of_Hinal",
 	"Leaflet_Of_Aloe",
 	"Fruit_Of_Mastela",
+	"Royal_Jelly",
 	"Milk",
 	"Lemon",
 	"Long_Rice_Cake",
@@ -2846,6 +2820,8 @@ First_Aid_Kit: (
 	("Orange_Potion",5),
 	("Yellow_Potion",5),
 	("Slow_Down_Potion",5),
+	("White_Potion",5),
+	("Blue_Potion",5),
 	("Green_Potion",5),
 	("Red_Slim_Potion",5),
 	("Yellow_Slim_Potion",5),
@@ -2876,14 +2852,19 @@ Cookie_Bag: (
 	"Chocolate_Drink",
 	("Candy",4)
 )
+Red_Box_: (
+	("Magic_Eyes",9),
+	("Hibiscus",10),
+	("Charming_Ribbon",10)
+)
 Egg_Boy: (
 	("Grape",299),
 	("Rice_Ball",522),
 	("Prohibition_Red_Candle",20),
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
-	("Crown",2),
-	"Inccubus_Horn"
+	("Ghost_Bandana",5),
+	("Inccubus_Horn",2)
 )
 Egg_Girl: (
 	("Grape",299),
@@ -2891,18 +2872,20 @@ Egg_Girl: (
 	("Sway_Apron",20),
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
-	("Tiara",2),
 	("Hair_Protector",5),
-	"Horn_Of_Succubus"
+	("Horn_Of_Succubus",2)
 )
 Giftbox_China: (
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
 	"Honey",
 	"Leaflet_Of_Hinal",
 	("Leaflet_Of_Aloe",2),
 	"Panacea",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	("Old_Blue_Box",40),
@@ -2924,7 +2907,6 @@ Giftbox_China: (
 	"Singing_Plant",
 	"Ment",
 	"Illusion_Flower",
-	"Emperium",
 	"Yellow_Gemstone",
 	"Red_Gemstone",
 	"Blue_Gemstone",
@@ -2960,8 +2942,6 @@ Giftbox_China: (
 	"Grasshopper_Doll",
 	"Monkey_Doll",
 	"Raccoondog_Doll",
-	"Oridecon_Stone",
-	"Elunium_Stone",
 	"Jellopy",
 	"Garlet",
 	"Scell",
@@ -2970,7 +2950,6 @@ Giftbox_China: (
 	"Mementos",
 	"Voucher_Of_Orcish_Hero",
 	"Gold",
-	"Alchol",
 	"Detrimindexta",
 	"Karvodailnirol",
 	"Counteragent",
@@ -2983,8 +2962,6 @@ Giftbox_China: (
 	"Violet_Dyestuffs",
 	"White_Dyestuffs",
 	"Black_Dyestuffs",
-	"Oridecon",
-	"Elunium",
 	"Anvil",
 	"Oridecon_Anvil",
 	"Golden_Anvil",
@@ -3135,7 +3112,6 @@ Giftbox_China: (
 	"Silver_Robe_",
 	"Thief_Clothes_",
 	"Ninja_Suit",
-	"Wedding_Dress",
 	"G_Strings",
 	"Sandals_",
 	"Shoes_",
@@ -3159,48 +3135,51 @@ Giftbox_China: (
 	"Silver_Ring",
 	"Flower_Ring",
 	"Diamond_Ring",
-	"Puppy_Love",
 	"Safety_Helmet",
 	"Indian_Hair_Piece",
 	"Fin_Helm",
-	"Egg_Shell"
-)
-Old_Bleu_Box: (
-	("Cold_Scroll_1_5",2),
-	("Fire_Scroll_1_5",2),
-	("Wind_Scroll_1_5",2),
-	("Fire_Scroll_2_5",2),
-	("Fire_Scroll_3_5",2),
-	("Holy_Scroll_1_5",2),
-	("Cold_Scroll_2_5",2),
-	("Gift_Box",2),
-	("Milk",2),
-	("Well_Baked_Cookie",2)
+	("Egg_Shell",2)
 )
-Holy_Egg_2: (
-	("Oridecon",3),
-	("Elunium",10),
-	("White_Slim_Potion",30),
-	("Blue_Potion",30),
-	("Yggdrasilberry",3),
-	("Seed_Of_Yggdrasil",2),
-	("Leaf_Of_Yggdrasil",15),
-	("Old_Card_Album",5),
-	"Drooping_Bunny"
+Red_Box: (
+	("Twin_Ribbon",9),
+	("Helm_Of_Darkness",11),
+	"Puppy_Hat",
+	("Geographer_Band",11),
+	("Laurel_Wreath",11),
+	("Bird_Nest_Hat",11),
+	("Alice_Doll",11),
+	("Hibiscus",11),
+	("Magic_Eyes",11),
+	("Charming_Ribbon",11),
+	"Chinese_Crown",
+	("Crescent_Helm",11),
+	("Kabuki_Mask",12),
+	"Cat_Hat"
 )
-Red_Box_: (
-	("Magic_Eyes",9),
-	("Hibiscus",10),
-	("Charming_Ribbon",10)
+Green_Box: (
+	("Str_Dish10",99),
+	("Int_Dish10",100),
+	("Vit_Dish10",100),
+	("Agi_Dish10",100),
+	("Dex_Dish10",100),
+	("Luk_Dish10",100),
+	("Yggdrasilberry",99),
+	("Seed_Of_Yggdrasil",100),
+	("Fire_Cracker",100),
+	("Chocolate_Drink",100),
+	"Puppy_Hat"
 )
-Hometown_Gift: (
-	"Hearty_Rice_Cake",
-	"Salty_Rice_Cake",
-	"Lucky_Rice_Cake",
-	"Sesame_Pastry",
-	"Honey_Pastry",
-	"Rainbow_Cake",
-	"Korea_Rice_Cake"
+Old_Bleu_Box: (
+	"Cold_Scroll_1_5",
+	"Fire_Scroll_1_5",
+	"Wind_Scroll_1_5",
+	"Fire_Scroll_2_5",
+	"Fire_Scroll_3_5",
+	"Holy_Scroll_1_5",
+	"Cold_Scroll_2_5",
+	"Gift_Box",
+	"Milk",
+	"Well_Baked_Cookie"
 )
 Old_Yellow_Box: (
 	"Cookie_Hat",
@@ -3213,6 +3192,8 @@ Old_Gift_Box: (
 	("Fallen_Leaves_",45)
 )
 Magic_Card_Album: (
+	"Angeling_Card",
+	"Gryphon_Card",
 	"Dark_Illusion_Card",
 	"Deviling_Card",
 	("Dragon_Fly_Card",10),
@@ -3248,30 +3229,21 @@ Masquerade_Ball_Box: (
 	("Marvelous_Wig_",10),
 	("Ati_Atihan_Hat_",10)
 )
-Louise_Costume_Box: (
-	("Red_Bag",16),
-	("Cool_Summer_Outfit",2)
-)
-Xmas_Gift: (
-	("Fire_Cracker_Love",6),
-	("Gift_Box",66),
-	("Old_Bleu_Box",36),
-	("Set_Of_Taiming_Item",6),
-	("Wrapped_Mask",6),
-	("Old_Blue_Box",24),
-	("Bundle_Of_Magic_Scroll",12),
-	("Buche_De_Noel",24),
-	("Speed_Up_Potion",12),
-	("Slow_Down_Potion",12),
-	("Cookie_Bag",12),
-	("Red_Bag",6),
-	("First_Aid_Kit",12),
-	("Crystal_Jewel__",12),
-	("HandMade_Chocolate",18),
-	("HandMade_Chocolate_",18),
-	("Chocolate_Drink",18),
-	("Santa's_Hat_",12),
-	("Fire_Cracker_Xmas",4)
+Easter_Scroll: (
+	("Silver_Knife_Of_Chaste",109),
+	("Heart_Of_Her",110),
+	("No_Recipient",110),
+	("Old_Broom",110),
+	("Armlet_Of_Obedience",110),
+	("Shining_Stone",110),
+	("Contracts_In_Shadow",110),
+	("Book_Of_Devil",110),
+	("Pet_Incubator",205),
+	"Munak_Turban",
+	"Bongun_Hat",
+	"Munak_Turban_",
+	"Bongun_Hat_",
+	"Ghost_Bandana"
 )
 Tresure_Box_WoE: (
 	("Wind_Arrow_Container",23),
@@ -3301,6 +3273,31 @@ Masquerade_Ball_Box2: (
 	("Cap_Of_Blindness",10),
 	"Dress_Hat"
 )
+Louise_Costume_Box: (
+	("Red_Bag",16),
+	("Cool_Summer_Outfit",2)
+)
+Xmas_Gift: (
+	("Fire_Cracker_Love",6),
+	("Gift_Box",66),
+	("Old_Bleu_Box",36),
+	("Set_Of_Taiming_Item",6),
+	("Wrapped_Mask",6),
+	("Old_Blue_Box",24),
+	("Bundle_Of_Magic_Scroll",12),
+	("Buche_De_Noel",24),
+	("Speed_Up_Potion",12),
+	("Slow_Down_Potion",12),
+	("Cookie_Bag",12),
+	("Red_Bag",6),
+	("First_Aid_Kit",12),
+	("Crystal_Jewel__",12),
+	("HandMade_Chocolate",18),
+	("HandMade_Chocolate_",18),
+	("Chocolate_Drink",18),
+	("Santa's_Hat_",12),
+	("Fire_Cracker_Xmas",4)
+)
 Pierre_Treasurebox: (
 	("Scarlet_Dyestuffs",3),
 	("Lemon_Dyestuffs",3),
@@ -3342,35 +3339,1352 @@ Cherish_Box_Ori: (
 	("Ragnarok_Limited_Ed",3)
 )
 Splendid_Box: (
-	//not yet supported/not in pre-re "Imperial_Guard",
+//unknown/unsupported - 	("2153",2),
+	("Bone_Plate",2),
+//unknown/unsupported - 	("15014",2),
+	("Krasnaya",2),
+//unknown/unsupported - 	("1191",2),
+//unknown/unsupported - 	("1196",2),
+	("Krishna",2),
+	("Cakram",2),
+//unknown/unsupported - 	("1287",2),
+	("Vecer_Axe",2),
+	("Giant_Axe",2),
+//unknown/unsupported - 	("1433",2),
+//unknown/unsupported - 	("1649",2),
+	("Falken_Blitz",2),
+//unknown/unsupported - 	("1746",2),
+//unknown/unsupported - 	("1930",2),
+//unknown/unsupported - 	("1984",2),
+	("Krieg",2),
+	("Weihna",2),
+//unknown/unsupported - 	("13061",2),
+	("Ruber",2),
+	("Erde",2),
+	("Red_Square_Bag",2)
+//unknown/unsupported - 	("16003",2),
+//unknown/unsupported - 	("16010",2),
+//unknown/unsupported - 	("18103",2)
+)
+/* currently unsupported or unknown ('Old_C_Album_Armor')
+Old_C_Album_Armor: (
+	("Pupa_Card",2),
+	("Picky_Card",2),
+	("Picky__Card",2),
+	("Roda_Frog_Card",2),
+	("Thief_Bug_Card",2),
+	("Rocker_Card",2),
+	("Desert_Wolf_Babe_Card",2),
+	("Pecopeco_Card",2),
+	("Steel_Chonchon_Card",2),
+	("Cornutus_Card",2),
+	("Savage_Card",2),
+	("Sword_Fish_Card",2),
+	("Dokebi_Card",2),
+	("Pasana_Card",2),
+	("Sand_Man_Card",2),
+	("Marc_Card",2),
+	("Argiope_Card",2),
+	("Bathory_Card",2),
+	("Evil_Druid_Card",2),
+	("Goat_Card",2),
+	("Flying_Deleter_Card",2),
+	("Grizzly_Card",2),
+	("Nightmare_Terror_Card",2),
+	("Dark_Frame_Card",2),
+	("Demon_Pungus_Card",2),
+	("Disguise_Card",2),
+	("Wraith_Dead_Card",2),
+	("Loli_Ruri_Card",2),
+	("Rybio_Card",2),
+	("Majoruros_Card",2),
+	("Brilight_Card",2),
+	("Sasquatch_Card",2),
+	("Succubus_Card",2),
+	("Solider_Card",2),
+	("Skel_Prisoner_Card",2),
+	("Baby_Leopard_Card",2),
+	("Anolian_Card",2),
+	("Apocalips_Card",2),
+	("Antonio_Card",2),
+	("Wooden_Golem_Card",2),
+	("Giant_Spider_Card",2),
+	("Deleter_Card",2),
+	("Geographer_Card",2),
+	("Karakasa_Card",2),
+	("Kraben_Card",2),
+	("Cremy_Fear_Card",2),
+	("Clock_Card",2),
+	("Chimera_Card",2),
+	("Killer_Mantis_Card",2),
+	("Pest_Card",2),
+	("Waste_Stove_Card",2),
+	("Venomous_Card",2),
+	("Porcellio_Card",2),
+	("Obsidian_Card",2),
+	("Mineral_Card",2),
+	("Ygnizem_Card",2),
+	("Removal_Card",2),
+	("Venatu_Card",2),
+	("Dimik_Card",2),
+	("Archdam_Card",2),
+	("Novus__Card",2),
+	("Novus_Card",2),
+	("Ancient_Mimic_Card",2),
+	("Observation_Card",2),
+	("Shelter_Card",2),
+	("Aliza_Card",2),
+	("Alicel_Card",2),
+	("Skogul_Card",2),
+	("Frus_Card",2),
+	("Agav_Card",2),
+	("Echio_Card",2),
+	("Byorgue_Card",2),
+	("Banshee_Master_Card",2),
+//unknown/unsupported - 	"4462"
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Helm')
+Old_C_Album_Helm: (
+	("Stainer_Card",2),
+	("Coco_Card",2),
+	("Martin_Card",2),
+	("Elder_Wilow_Card",2),
+	("Giearth_Card",2),
+	("Ghoul_Card",2),
+	("Marduk_Card",2),
+	("Deviruchi_Card",2),
+	("Nightmare_Card",2),
+	("Grand_Peco_Card",2),
+	("Dark_Illusion_Card",2),
+	("Dryad_Card",2),
+	("Rideword_Card",2),
+	("Leib_Olmai_Card",2),
+	("Leaf_Cat_Card",2),
+	("Mystcase_Card",2),
+	("Stalactic_Golem_Card",2),
+	("C_Tower_Manager_Card",2),
+	("Archangeling_Card",2),
+	("Wicked_Nymph_Card",2),
+	("Wootan_Shooter_Card",2),
+	("Wootan_Fighter_Card",2),
+	("Incubus_Card",2),
+	("Giant_Honet_Card",2),
+	("Gibbet_Card",2),
+	("Carat_Card",2),
+	("Cramp_Card",2),
+	("Permeter_Card",2),
+	("Ungoliant_Card",2),
+	("Mole_Card",2),
+	("Gemini_Card",2),
+	("Seyren_Card",2),
+	("Magaleta_Card",2),
+	("Katrinn_Card",2),
+	("Acidus__Card",2),
+	("Vanberk_Card",2),
+	("Isilla_Card",2),
+	("Knocker_Card",2),
+	("Banshee_Card",2),
+//unknown/unsupported - 	"4458",
+//unknown/unsupported - 	"4459",
+//unknown/unsupported - 	"4460",
+//unknown/unsupported - 	"4461",
+//unknown/unsupported - 	"4468"
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Acc')
+Old_C_Album_Acc: (
+	("Kukre_Card",2),
+	("Tarou_Card",2),
+	("Poporing_Card",2),
+	("Worm_Tail_Card",2),
+	("Muka_Card",2),
+	("Creamy_Card",2),
+	("Smokie_Card",2),
+	("Poison_Spore_Card",2),
+	("Yoyo_Card",2),
+	("Vitata_Card",2),
+	("Zerom_Card",2),
+	("Pirate_Skel_Card",2),
+	("Phen_Card",2),
+	("Mantis_Card",2),
+	("Marine_Sphere_Card",2),
+	("Kobold_Card",2),
+	("Obeaune_Card",2),
+	("Horong_Card",2),
+	("Joker_Card",2),
+	("Gargoyle_Card",2),
+	("Galapago_Card",2),
+	("Rice_Cake_Boy_Card",2),
+	("Poison_Toad_Card",2),
+	("Raydric_Archer_Card",2),
+	("Wraith_Card",2),
+	("Lude_Card",2),
+	("Marin_Card",2),
+	("Mimic_Card",2),
+	("Violy_Card",2),
+	("Bon_Gun_Card",2),
+	("Blazzer_Card",2),
+	("Sageworm_Card",2),
+	("Stem_Worm_Card",2),
+	("Spring_Rabbit_Card",2),
+	("Sleeper_Card",2),
+	("Shinobi_Card",2),
+	("Wild_Ginseng_Card",2),
+	("Owl_Duke_Card",2),
+	("Owl_Baron_Card",2),
+	("Alligator_Card",2),
+	("Orc_Archer_Card",2),
+	("Evil_Cloud_Hermit_Card",2),
+	("Wind_Ghost_Card",2),
+	("Li_Me_Mang_Ryang_Card",2),
+	("Dancing_Dragon_Card",2),
+	("Tengu_Card",2),
+	("Greatest_General_Card",2),
+	("Cookie_Card",2),
+	("Quve_Card",2),
+	("Hylozoist_Card",2),
+	("See_Otter_Card",2),
+	("Blood_Butterfly_Card",2),
+	("Heater_Card",2),
+	("Anopheles_Card",2),
+	("Armaia_Card",2),
+	("Whikebain_Card",2),
+	("Erend_Card",2),
+	("Gremlin_Card",2),
+	("Beholder_Card",2),
+	("Green_Iguana_Card",2),
+	("Hydro_Card",2),
+	("Dragon_Egg_Card",2),
+	("Plasma_Card",2),
+	("Retribution_Card",2),
+	("Snowier_Card",2),
+	("Siroma_Card",2),
+	("Gazeti_Card",2),
+	("Galion_Card",2),
+	("Stapo_Card",2),
+	("Imp_Card",2),
+	("Ragged_Zombie_Card",2),
+	("Hell_Poodle_Card",2)
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Shoes')
+Old_C_Album_Shoes: (
+	("Zombie_Card",2),
+	("Thief_Bug_Male_Card",2),
+	("Eggyra_Card",2),
+	("Matyr_Card",2),
+	("Sohee_Card",2),
+	("Verit_Card",2),
+	("Gajomart_Card",2),
+	("Antique_Firelock_Card",2),
+	("Gullinbursti_Card",2),
+	("Raggler_Card",2),
+	("Merman_Card",2),
+	("Megalith_Card",2),
+	("Mini_Demon_Card",2),
+	("Miyabi_Ningyo_Card",2),
+	("Skeleton_General_Card",2),
+	("Cookie_XMAS_Card",2),
+	("Iron_Fist_Card",2),
+	("Alarm_Card",2),
+	("Am_Mut_Card",2),
+	("Ancient_Worm_Card",2),
+	("Wild_Rose_Card",2),
+	("Explosion_Card",2),
+	("Zombie_Prisoner_Card",2),
+	("Cat_O_Nine_Tail_Card",2),
+	("Freezer_Card",2),
+	("Acidus_Card",2),
+	("Ferus__Card",2),
+	("Tha_Odium_Card",2),
+	("Ice_Titan_Card",2),
+	("Zombie_Slaughter_Card",2),
+//unknown/unsupported - 	"4467"
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Shield')
+Old_C_Album_Shield: (
+	("Andre_Egg_Card",2),
+	("Ambernite_Card",2),
+	("Horn_Card",2),
+	("Thara_Frog_Card",2),
+	("Orc_Warrior_Card",2),
+	("Megalodon_Card",2),
+	("BigFoot_Card",2),
+	("Argos_Card",2),
+	("Rafflesia_Card",2),
+	("Munak_Card",2),
+	("Petit__Card",2),
+	("Medusa_Card",2),
+	("Khalitzburg_Card",2),
+	("Anubis_Card",2),
+	("Mysteltainn_Card",2),
+	("Live_Peach_Tree_Card",2),
+	("Sting_Card",2),
+	("Increase_Soil_Card",2),
+	("Arclouse_Card",2),
+	("Ancient_Mummy_Card",2),
+	("Executioner_Card",2),
+	("Alice_Card",2),
+	("Tirfing_Card",2),
+	("Zherlthsh_Card",2),
+	("Tamruan_Card",2),
+	("Parasite_Card",2),
+	("Penomena_Card",2),
+	("High_Orc_Card",2),
+	("Teddy_Bear_Card",2),
+	("Tha_Despero_Card",2),
+	("Hodremlin_Card",2),
+	("Seeker_Card",2),
+	("Muscipular_Card",2),
+	("Flame_Skull_Card",2),
+	("Tatacho_Card",2),
+	("Aqua_Elemental_Card",2),
+	("Draco_Card",2),
+	("Luciola_Vespa_Card",2),
+	("Centipede_Card",2),
+	("Cornus_Card",2),
+	("Dark_Shadow_Card",2)
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Garment')
+Old_C_Album_Garment: (
+	("Dustiness_Card",2),
+	("Orc_Zombie_Card",2),
+	("Hode_Card",2),
+	("Frilldora_Card",2),
+	("Marse_Card",2),
+	("Whisper_Card",2),
+	("Myst_Card",2),
+	("Jakk_Card",2),
+	("Marionette_Card",2),
+	("Isis_Card",2),
+	("Baphomet__Card",2),
+	("Daydric_Card",2),
+	("Nine_Tail_Card",2),
+	("Deviling_Card",2),
+	("Dragon_Tail_Card",2),
+	("Dragon_Fly_Card",2),
+	("Vagabond_Wolf_Card",2),
+	("Mastering_Card",2),
+	("Wander_Man_Card",2),
+	("Vocal_Card",2),
+	("Eclipse_Card",2),
+	("Choco_Card",2),
+	("Kapha_Card",2),
+	("Whisper_Boss_Card",2),
+	("Toad_Card",2),
+	("Punk_Card",2),
+	("Harpy_Card",2),
+	("Hyegun_Card",2),
+	("Noxious_Card",2),
+	("Kavac_Card",2),
+	("Chung_E_Card",2),
+	("Orc_Baby_Card",2),
+	("Aliot_Card",2),
+	("Roween_Card",2),
+	("Salamander_Card",2),
+	("Kasa_Card",2),
+	("Magmaring_Card",2)
+)
+*/
+/* currently unsupported or unknown ('Old_C_Album_Weapon')
+Old_C_Album_Weapon: (
+	("Drops_Card",2),
+	("Poring__Card",2),
+	("Lunatic_Card",2),
+	("Pecopeco_Egg_Card",2),
+	("Savage_Babe_Card",2),
+	("Andre_Larva_Card",2),
+	("Hornet_Card",2),
+	("Farmiliar_Card",2),
+	("Plankton_Card",2),
+	("Skeleton_Card",2),
+	("Thief_Bug_Female_Card",2),
+	("Wolf_Card",2),
+	("Mandragora_Card",2),
+	("Hydra_Card",2),
+	("Snake_Card",2),
+	("Andre_Card",2),
+	("Vadon_Card",2),
+	("Marina_Card",2),
+	("Metaller_Card",2),
+	("Goblin_Card",2),
+	("Anacondaq_Card",2),
+	("Caramel_Card",2),
+	("Kaho_Card",2),
+	("Scorpion_Card",2),
+	("Drainliar_Card",2),
+	("Golem_Card",2),
+	("Magnolia_Card",2),
+	("Flora_Card",2),
+	("Desert_Wolf_Card",2),
+	("Orc_Skeleton_Card",2),
+	("Soldier_Skeleton_Card",2),
+	("Skel_Worker_Card",2),
+	("Archer_Skeleton_Card",2),
+	("Zenorc_Card",2),
+	("Requiem_Card",2),
+	("Mummy_Card",2),
+	("Strouf_Card",2),
+	("Hunter_Fly_Card",2),
+	("Side_Winder_Card",2),
+	("Petit_Card",2),
+	("Deviace_Card",2),
+	("Minorous_Card",2),
+	("Scorpion_King_Card",2),
+	("Knight_Of_Abyss_Card",2),
+	("Crab_Card",2),
+	("Goblin_Leader_Card",2),
+	("Steam_Goblin_Card",2),
+	("Goblin_Archer_Card",2),
+	("Gryphon_Card",2),
+	("Gig_Card",2),
+	("Neraid_Card",2),
+	("Dark_Priest_Card",2),
+	("The_Paper_Card",2),
+	("Dullahan_Card",2),
+	("Driller_Card",2),
+	("Diabolic_Card",2),
+	("Lava_Golem_Card",2),
+	("Rotar_Zairo_Card",2),
+	("Civil_Servant_Card",2),
+	("Mutant_Dragon_Card",2),
+	("Bloody_Murderer_Card",2),
+	("Stone_Shooter_Card",2),
+	("Assulter_Card",2),
+	("Aster_Card",2),
+	("Elder_Card",2),
+	("Orc_Lady_Card",2),
+	("Injustice_Card",2),
+	("Shellfish_Card",2),
+	("Zombie_Master_Card",2),
+	("Zipper_Bear_Card",2),
+	("Chepet_Card",2),
+	("Caterpillar_Card",2),
+	("Kobold_Leader_Card",2),
+	("Kobold_Archer_Card",2),
+	("Cruiser_Card",2),
+	("Kind_Of_Beetle_Card",2),
+	("Tri_Joint_Card",2),
+	("Panzer_Goblin_Card",2),
+	("Fur_Seal_Card",2),
+	("Fake_Angel_Card",2),
+	("Mobster_Card",2),
+	("Garm_Baby_Card",2),
+	("Phendark_Card",2),
+	("Pitman_Card",2),
+	("Metaling_Card",2),
+	("Hill_Wind_Card",2),
+	("Rawrel_Card",2),
+	("Eremes_Card",2),
+	("Harword_Card",2),
+	("Shecil_Card",2),
+	("Ferus_Card",2),
+	("Deathword_Card",2),
+	("Breeze_Card",2),
+	("Solace_Card",2),
+	("Tha_Maero_Card",2),
+	("Tha_Dolor_Card",2),
+	("Skeggiold_Card",2),
+	("Drosera_Card",2),
+	("Sword_Guardian_Card",2),
+	("Bow_Guardian_Card",2),
+	("Necromancer_Card",2),
+	("Centipede_Larva_Card",2),
+	("Hilsrion_Card",2),
+	("Bloody_Knight_Card",2),
+//unknown/unsupported - 	"4463",
+//unknown/unsupported - 	"4464",
+//unknown/unsupported - 	"4465",
+//unknown/unsupported - 	"4466",
+//unknown/unsupported - 	"4469",
+//unknown/unsupported - 	"4470",
+//unknown/unsupported - 	"4471",
+//unknown/unsupported - 	"4472",
+//unknown/unsupported - 	"4473",
+//unknown/unsupported - 	"4474",
+//unknown/unsupported - 	"4475",
+//unknown/unsupported - 	"4476",
+//unknown/unsupported - 	"4477"
+)
+*/
+/* currently unsupported or unknown ('Splendid_Box2')
+Splendid_Box2: (
+//unknown/unsupported - 	"2153",
 	"Bone_Plate",
-	//not yet supported/not in pre-re "Ebone_Armor",
+//unknown/unsupported - 	"15014",
 	"Krasnaya",
-	//not yet supported/not in pre-re "Alca_Bringer",
-	//not yet supported/not in pre-re "Chrome_Twohand_Sword",
+//unknown/unsupported - 	"1191",
+//unknown/unsupported - 	"1196",
 	"Krishna",
 	"Cakram",
-	//not yet supported/not in pre-re "Durga",
+//unknown/unsupported - 	"1287",
 	"Vecer_Axe",
 	"Giant_Axe",
-	//not yet supported/not in pre-re "Imperial_Spear",
-	//not yet supported/not in pre-re "Rafini_Staff",
+//unknown/unsupported - 	"1433",
+//unknown/unsupported - 	"1649",
 	"Falken_Blitz",
-	//not yet supported/not in pre-re "Elven_Bow",
-	//not yet supported/not in pre-re "Green_Whistle",
-	//not yet supported/not in pre-re "Stem_Whip",
+//unknown/unsupported - 	"1746",
+//unknown/unsupported - 	"1930",
+//unknown/unsupported - 	"1984",
 	"Krieg",
 	"Weihna",
-	//not yet supported/not in pre-re "Black_Wing",
+//unknown/unsupported - 	"13061",
 	"Ruber",
 	"Erde",
-	"Red_Square_Bag"
-	//not yet supported/not in pre-re "Carga_Mace",
-	//not yet supported/not in pre-re "Red_Ether_Bag",
-	//not yet supported/not in pre-re "Mystic_Bow"
+	"Red_Square_Bag",
+//unknown/unsupported - 	"16003",
+//unknown/unsupported - 	"16010",
+//unknown/unsupported - 	"18103",
+	"Hunting_Spear",
+	"Piece_Of_Angent_Skin",
+	"Diabolus_Robe",
+	"Diabolus_Armor",
+	"Diabolus_Boots",
+	"Diabolus_Manteau",
+	"Bison_Horn",
+	"Dragon_Vest",
+	"Dragon_Manteau",
+	"Elven_Ears",
+	"Tidal_Shoes",
+	"Black_Leather_Boots",
+	"Black_Leather_Boots_",
+	"Variant_Shoes",
+	"Twin_Edge_B",
+	"Twin_Edge_R"
+)
+*/
+/* currently unsupported or unknown ('Mysterious_Egg')
+Mysterious_Egg: (
+	("Lucky_Egg2",3),
+	("Lucky_Egg_C3",3),
+	("Lucky_Egg_C4",3),
+	("Lucky_Egg_C5",3),
+	("Lucky_Egg_C6",3),
+	("Lucky_Egg_C",2)
+)
+*/
+/* currently unsupported or unknown ('High_Weapon_Box')
+High_Weapon_Box: (
+	("Mail_Breaker",5),
+	("Weeder_Knife",5),
+	("Mama's_Knife",5),
+	("Assasin_Dagger",5),
+	("Exercise",5),
+	("Azoth",5),
+	("Sucsamad",5),
+	("Grimtooth_",5),
+	("Princess_Knife",5),
+	("Cursed_Dagger",5),
+	("Counter_Dagger",5),
+	("Holy_Dagger",5),
+	("Krieg",5),
+	("Weihna",5),
+//unknown/unsupported - 	("13061",5),
+	("Blood_Tears",5),
+	("Unholy_Touch",5),
+	("Drill_Katar",5),
+	("Krishna",5),
+	("Cakram",5),
+	("Cleaver",5),
+	("Great_Axe",5),
+	("Sabbath",5),
+	("Bradium_Stonehammer",5),
+	("Slaughter",5),
+	("Tomahawk",5),
+	("Vecer_Axe",5),
+	("Ice_Falchon",7),
+	("Fire_Brand",7),
+	("Scissores_Sword",7),
+	("Cutlas",7),
+	("Solar_Sword",7),
+	("Mysteltainn_",7),
+	("Tale_Fing_",7),
+	("Byeorrun_Gum",7),
+	("Immaterial_Sword",7),
+	("Star_Dust_Blade",7),
+	("Muramasa",7),
+	("Dragon_Slayer",7),
+	("Schweizersabel",7),
+	("Zweihander",7),
+	("Katzbalger",7),
+	("Zweihander_",7),
+	("Muscle_Cutter",7),
+	("Schweizersabel_",7),
+	("Dragon_Slayer_",7),
+	("Tae_Goo_Lyeon",7),
+	("Bloody_Eater",7),
+	("Veteran_Sword",7),
+	("Ruber",5),
+	("Krasnaya",5),
+	("Gungnir",5),
+	("Gelerdria",5),
+	("Tjungkuletti",5),
+	("Gungnir_",5),
+	("Crescent_Scythe",5),
+	("Bill_Guisarme",5),
+	("Zephyrus",5),
+	("Longinus's_Spear",5),
+	("Brionac",5),
+	("Hell_Fire",5),
+	("Gae_Bolg",5),
+	("Crescent_Scythe_",5),
+	("Spectral_Spear",5),
+	("Ahlspiess",5),
+	("Spectral_Spear_",5),
+	("Gae_Bolg_",5),
+	("Zephyrus_",5),
+	("Wizardy_Staff",5),
+	("Staff_Of_Wing",5),
+	("Walking_Stick",5),
+	("Holy_Stick",5),
+	("Dead_Tree_Cane",5),
+	("Kronos",5),
+	("Dea_Staff",5),
+	("Divine_Cross",5),
+	("Golden_Mace",5),
+	("Long_Mace",5),
+	("Quadrille",5),
+	("Golden_Mace_",5),
+	("Nemesis",5),
+	("Erde",5),
+	("Red_Square_Bag",5),
+//unknown/unsupported - 	("16010",5),
+	("Book_Of_The_Apocalypse",5),
+	("Girl's_Diary",5),
+	("Legacy_Of_Dragon",5),
+	("Hardback",5),
+	("Bible_Of_Battlefield",5),
+	("Kaiser_Knuckle",5),
+	("Claw_Of_Garm",5),
+	("Dragon_Wing",5),
+	("Bow_Of_Minstrel",5),
+	("Ixion_Wing",5),
+	("Nepenthes_Bow",5),
+	("Cursed_Lyre",5),
+	("Falken_Blitz",5),
+//unknown/unsupported - 	("18103",5),
+	("Electronic_Guitar",5),
+	("Oriental_Lute",5),
+	("Oriental_Lute_",5),
+	("Harp_Of_Nepenthes",5),
+	("Lariat",5),
+	("Rapture_Rose",5),
+	("Chemeti",5),
+	("Bladed_Whip",5),
+	("Electric_Eel",5),
+	("Sea_Witch_Foot",5),
+	("Queen's_Whip",5),
+	("Carrot_Whip",5),
+	("Queen's_Whip_",5),
+	("Stem_Of_Nepenthes",5),
+	"Thorn_Staff",
+	"Eraser",
+	"Destruction_Rod",
+	"Infiltrator",
+	"Infiltrator_",
+	"Heart_Breaker",
+	"Hurricane_Fury",
+	"Right_Epsilon",
+	"Doom_Slayer",
+	("Sword_Breaker",4),
+//unknown/unsupported - 	("13431",2),
+//unknown/unsupported - 	("1196",2),
+	("Excalibur",2),
+	("Masamune",2),
+	("Nagan",2),
+	("Executioner_",2),
+	("Executioner__",2),
+	("Altas_Weapon",2),
+	("Giant_Axe",2),
+	("Guillotine",2),
+	("Brood_Axe",2),
+	("Wild_Beast_Claw",2),
+	("Inverse_Scale",2),
+	("Bloody_Roar",2),
+	("Cardo",2),
+//unknown/unsupported - 	("1433",2),
+	("Skewer",2),
+	("Battle_Hook",2),
+//unknown/unsupported - 	("1654",2),
+	"Doom_Slayer_",
+	"Hunting_Spear",
+	"Edge",
+	"Violet_Fear",
+	"Death_Guidance",
+	"House_Auger",
+	"Bazerald",
+//unknown/unsupported - 	"13062",
+	"Grand_Cross",
+	"Grand_Cross_",
+	"Death_Note",
+	"Berserk",
+	"Berserk_",
+	"Berserk_Guitar",
+//unknown/unsupported - 	"1985",
+	("Forturn_Sword",2),
+	("Combat_Knife",2),
+	("Moonlight_Sword",2),
+	("Spike",2),
+	("Spike_",2),
+	("Slash",2),
+//unknown/unsupported - 	("1830",2),
+	("Bow_Of_Roguemaster",2),
+	("Balistar",2),
+	("Balistar_",2),
+	("Bow_Of_Rudra",2),
+//unknown/unsupported - 	("1930",2),
+//unknown/unsupported - 	("1984",2),
+//unknown/unsupported - 	"1290",
+//unknown/unsupported - 	"1291",
+//unknown/unsupported - 	"1392",
+//unknown/unsupported - 	"1393",
+//unknown/unsupported - 	"1435",
+//unknown/unsupported - 	"1584",
+//unknown/unsupported - 	"1659",
+//unknown/unsupported - 	"13069",
+//unknown/unsupported - 	"13070",
+//unknown/unsupported - 	"16017",
+//unknown/unsupported - 	"18109",
+//unknown/unsupported - 	"18110",
+//unknown/unsupported - 	"18111"
+)
+*/
+/* currently unsupported or unknown ('Ink_Ball')
+Ink_Ball: (
+	("Jellopy",39),
+	("Large_Jellopy",20),
+	("Gift_Box",20),
+	("Food_Package",10),
+	("Treasure_Box",6),
+	("Blue_Gemstone",10),
+	("First_Aid_Kit",5),
+	"Old_Blue_Box",
+	"Old_Violet_Box",
+	("Hometown_Gift",14),
+	"Accessory_Box",
+	"Wrapped_Mask",
+	"Old_Card_Album",
+	("Crystal_Blue",20)
+)
+*/
+/* currently unsupported or unknown ('God_Material_Box')
+God_Material_Box: (
+	"Iron_Glove",
+	"Iron_Maiden",
+	"Mystery_Wheel",
+	"Silver_Fancy",
+	"Anger_Of_Valkurye",
+	"Feather_Of_Angel",
+	"Foot_Step_Of_Cat",
+	"Beard_Of_Women",
+	"Root_Of_Stone",
+	"Soul_Of_Fish",
+	"Saliva_Of_Bird",
+	"Tendon_Of_Bear",
+	"Symbol_Of_Sun",
+	"Breath_Of_Soul",
+	"Crystal_Of_Snow",
+	"Indication_Of_Tempest",
+	"Slilince_Wave",
+	"Rough_Billows",
+	"Air_Stream"
+)
+*/
+/* currently unsupported or unknown ('Sg_Weapon_Supply_Box')
+Sg_Weapon_Supply_Box: (
+//unknown/unsupported - 	"1294",
+//unknown/unsupported - 	"1395",
+//unknown/unsupported - 	("1492",8),
+//unknown/unsupported - 	("2016",8),
+//unknown/unsupported - 	("21001",8),
+//unknown/unsupported - 	"21002",
+//unknown/unsupported - 	("18113",3),
+//unknown/unsupported - 	("18114",8),
+//unknown/unsupported - 	("1586",8),
+//unknown/unsupported - 	("1587",8),
+//unknown/unsupported - 	("1832",3),
+//unknown/unsupported - 	("13072",3),
+//unknown/unsupported - 	("16020",3),
+//unknown/unsupported - 	("16021",3),
+//unknown/unsupported - 	("1396",8),
+//unknown/unsupported - 	("1436",8),
+//unknown/unsupported - 	("12677",13),
+//unknown/unsupported - 	("12678",13),
+//unknown/unsupported - 	("1293",2)
 )
-//unknown carrier / unsupported
-/*Candy_Holder: (
+*/
+/* currently unsupported or unknown ('Old_Card_Album_')
+Old_Card_Album_: (
+	("Poring_Card",14),
+	("Fabre_Card",17),
+	("Pupa_Card",6),
+	("Drops_Card",18),
+	("Poring__Card",2),
+	("Lunatic_Card",14),
+	("Pecopeco_Egg_Card",4),
+	("Picky_Card",17),
+	("Chonchon_Card",17),
+	("Wilow_Card",17),
+	("Picky__Card",17),
+	("Thief_Bug_Egg_Card",19),
+	("Andre_Egg_Card",12),
+	("Roda_Frog_Card",5),
+	("Condor_Card",12),
+	("Thief_Bug_Card",12),
+	("Savage_Babe_Card",5),
+	("Hornet_Card",10),
+	("Farmiliar_Card",10),
+	("Rocker_Card",10),
+	("Spore_Card",10),
+	("Desert_Wolf_Babe_Card",5),
+	("Plankton_Card",5),
+	("Skeleton_Card",5),
+	("Thief_Bug_Female_Card",9),
+	("Kukre_Card",3),
+	("Tarou_Card",9),
+	("Wolf_Card",9),
+	("Mandragora_Card",9),
+	("Pecopeco_Card",3),
+	("Ambernite_Card",6),
+	("Poporing_Card",6),
+	("Worm_Tail_Card",6),
+	("Hydra_Card",3),
+	("Muka_Card",3),
+	("Snake_Card",3),
+	("Zombie_Card",3),
+	("Stainer_Card",3),
+	("Creamy_Card",3),
+	("Coco_Card",3),
+	("Steel_Chonchon_Card",3),
+	("Andre_Card",3),
+	("Smokie_Card",3),
+	("Horn_Card",3),
+	("Martin_Card",3),
+	"Ghostring_Card",
+	("Poison_Spore_Card",3),
+	("Vadon_Card",3),
+	("Thief_Bug_Male_Card",3),
+	("Yoyo_Card",3),
+	("Elder_Wilow_Card",3),
+	"Vitata_Card",
+	"Angeling_Card",
+	("Marina_Card",3),
+	("Dustiness_Card",3),
+	("Metaller_Card",2),
+	("Thara_Frog_Card",2),
+	("Goblin_Card",2),
+	("Cornutus_Card",2),
+	("Anacondaq_Card",2),
+	("Caramel_Card",2),
+	("Zerom_Card",2),
+	("Kaho_Card",2),
+	("Orc_Warrior_Card",2),
+	("Megalodon_Card",2),
+	("Scorpion_Card",2),
+	("Drainliar_Card",2),
+	("Eggyra_Card",2),
+	("Orc_Zombie_Card",2),
+	("Golem_Card",2),
+	("Pirate_Skel_Card",2),
+	("BigFoot_Card",2),
+	("Argos_Card",2),
+	("Magnolia_Card",2),
+	("Phen_Card",2),
+	("Savage_Card",2),
+	("Mantis_Card",2),
+	("Flora_Card",2),
+	("Hode_Card",2),
+	"Desert_Wolf_Card",
+	"Rafflesia_Card",
+	"Marine_Sphere_Card",
+	"Orc_Skeleton_Card",
+	"Soldier_Skeleton_Card",
+	"Giearth_Card",
+	"Frilldora_Card",
+	"Sword_Fish_Card",
+	"Munak_Card",
+	"Kobold_Card",
+	"Skel_Worker_Card",
+	"Obeaune_Card",
+	"Archer_Skeleton_Card",
+	"Marse_Card",
+	"Zenorc_Card",
+	"Matyr_Card",
+	"Dokebi_Card",
+	"Pasana_Card",
+	"Sohee_Card",
+	"Sand_Man_Card",
+	"Whisper_Card",
+	"Horong_Card",
+	"Requiem_Card",
+	"Marc_Card",
+	"Mummy_Card",
+	"Verit_Card",
+	"Myst_Card",
+	"Jakk_Card",
+	"Ghoul_Card",
+	"Strouf_Card",
+	"Marduk_Card",
+	"Marionette_Card",
+	"Argiope_Card",
+	"Hunter_Fly_Card",
+	"Isis_Card",
+	"Side_Winder_Card",
+	"Petit_Card",
+	"Bathory_Card",
+	"Petit__Card",
+	"Deviruchi_Card",
+	"Deviace_Card",
+	"Nightmare_Card",
+	"Baphomet__Card",
+	"Daydric_Card",
+	"Khalitzburg_Card",
+	"Joker_Card",
+	"Evil_Druid_Card",
+	"Gargoyle_Card",
+	"Goat_Card",
+	"Gajomart_Card",
+	"Galapago_Card",
+	"Crab_Card",
+	"Rice_Cake_Boy_Card",
+	"Steam_Goblin_Card",
+	"Goblin_Archer_Card",
+	"Flying_Deleter_Card",
+	"Nine_Tail_Card",
+	"Antique_Firelock_Card",
+	"Grand_Peco_Card",
+	"Grizzly_Card",
+	"Gullinbursti_Card",
+	"Gig_Card",
+	"Nightmare_Terror_Card",
+	"Neraid_Card",
+	"Dark_Frame_Card",
+	"The_Paper_Card",
+	"Demon_Pungus_Card",
+	"Poison_Toad_Card",
+	"Dullahan_Card",
+	"Dryad_Card",
+	"Dragon_Tail_Card",
+	"Driller_Card",
+	"Disguise_Card",
+	"Diabolic_Card",
+	"Lava_Golem_Card",
+	"Rideword_Card",
+	"Raggler_Card",
+	"Raydric_Archer_Card",
+	"Leib_Olmai_Card",
+	"Wraith_Dead_Card",
+	"Wraith_Card",
+	"Loli_Ruri_Card",
+	"Rotar_Zairo_Card",
+	"Lude_Card",
+	"Rybio_Card",
+	"Leaf_Cat_Card",
+	"Marin_Card",
+	"Merman_Card",
+	"Megalith_Card",
+	"Majoruros_Card",
+	"Civil_Servant_Card",
+	"Mini_Demon_Card",
+	"Mimic_Card",
+	"Mystcase_Card",
+	"Miyabi_Ningyo_Card",
+	"Violy_Card",
+	"Wander_Man_Card",
+	"Bon_Gun_Card",
+	"Brilight_Card",
+	"Bloody_Murderer_Card",
+	"Blazzer_Card",
+	"Sasquatch_Card",
+	"Live_Peach_Tree_Card",
+	"Succubus_Card",
+	"Sageworm_Card",
+	"Solider_Card",
+	"Skeleton_General_Card",
+	"Skel_Prisoner_Card",
+	"Stalactic_Golem_Card",
+	"Stem_Worm_Card",
+	"Stone_Shooter_Card",
+	"Sting_Card",
+	"Spring_Rabbit_Card",
+	"Sleeper_Card",
+	"C_Tower_Manager_Card",
+	"Shinobi_Card",
+	"Increase_Soil_Card",
+	"Wild_Ginseng_Card",
+	"Baby_Leopard_Card",
+	"Anolian_Card",
+	"Cookie_XMAS_Card",
+	"Owl_Duke_Card",
+	"Owl_Baron_Card",
+	"Iron_Fist_Card",
+	"Arclouse_Card",
+	"Apocalips_Card",
+	"Antonio_Card",
+	"Alarm_Card",
+	"Am_Mut_Card",
+	"Assulter_Card",
+	"Aster_Card",
+	"Ancient_Mummy_Card",
+	"Ancient_Worm_Card",
+	"Elder_Card",
+	"Alligator_Card",
+	"Alice_Card",
+	"Orc_Lady_Card",
+	"Orc_Archer_Card",
+	"Wild_Rose_Card",
+	"Wicked_Nymph_Card",
+	"Wooden_Golem_Card",
+	"Wootan_Shooter_Card",
+	"Wootan_Fighter_Card",
+	"Evil_Cloud_Hermit_Card",
+	"Wind_Ghost_Card",
+	"Li_Me_Mang_Ryang_Card",
+	"Explosion_Card",
+	"Injustice_Card",
+	"Incubus_Card",
+	"Giant_Spider_Card",
+	"Giant_Honet_Card",
+	"Dancing_Dragon_Card",
+	"Shellfish_Card",
+	"Zombie_Master_Card",
+	"Zombie_Prisoner_Card",
+	"Zherlthsh_Card",
+	"Gibbet_Card",
+	"Deleter_Card",
+	"Geographer_Card",
+	"Zipper_Bear_Card",
+	"Tengu_Card",
+	"Greatest_General_Card",
+	"Chepet_Card",
+	"Choco_Card",
+	"Karakasa_Card",
+	"Kapha_Card",
+	"Carat_Card",
+	"Caterpillar_Card",
+	"Cat_O_Nine_Tail_Card",
+	"Kobold_Archer_Card",
+	"Cookie_Card",
+	"Quve_Card",
+	"Kraben_Card",
+	"Cramp_Card",
+	"Cruiser_Card",
+	"Cremy_Fear_Card",
+	"Clock_Card",
+	"Chimera_Card",
+	"Killer_Mantis_Card",
+	"Tamruan_Card",
+	"Kind_Of_Beetle_Card",
+	"Tri_Joint_Card",
+	"Parasite_Card",
+	"Panzer_Goblin_Card",
+	"Permeter_Card",
+	"Fur_Seal_Card",
+	"Punk_Card",
+	"Penomena_Card",
+	"Pest_Card",
+	"Fake_Angel_Card",
+	"Freezer_Card",
+	"Hylozoist_Card",
+	"High_Orc_Card",
+	"Garm_Baby_Card",
+	"Harpy_Card",
+	"See_Otter_Card",
+	"Blood_Butterfly_Card",
+	"Hyegun_Card",
+	"Phendark_Card",
+	"Heater_Card",
+	"Waste_Stove_Card",
+	("Venomous_Card",3),
+	"Noxious_Card",
+	("Pitman_Card",3),
+	"Ungoliant_Card",
+	"Porcellio_Card",
+	"Obsidian_Card",
+	"Mineral_Card",
+	"Teddy_Bear_Card",
+	"Metaling_Card",
+	"Mole_Card",
+	("Anopheles_Card",3),
+	("Hill_Wind_Card",3),
+	"Ygnizem_Card",
+	("Armaia_Card",3),
+	"Whikebain_Card",
+	"Erend_Card",
+	("Rawrel_Card",3),
+	"Kavac_Card",
+	"Removal_Card",
+	"Gemini_Card",
+	("Gremlin_Card",3),
+	"Beholder_Card",
+	"Seyren_Card",
+	("Eremes_Card",3),
+	"Harword_Card",
+	"Katrinn_Card",
+	"Shecil_Card",
+	"Venatu_Card",
+	"Dimik_Card",
+	"Archdam_Card",
+	"Chung_E_Card",
+	"Orc_Baby_Card",
+	("Green_Iguana_Card",3),
+	"Acidus_Card",
+	"Acidus__Card",
+	("Ferus_Card",3),
+	"Ferus__Card",
+	"Novus__Card",
+	("Novus_Card",3),
+	"Hydro_Card",
+	("Dragon_Egg_Card",3),
+	"Ancient_Mimic_Card",
+	("Deathword_Card",3),
+	"Plasma_Card",
+	"Breeze_Card",
+	("Retribution_Card",3),
+	"Observation_Card",
+	"Shelter_Card",
+	"Solace_Card",
+	"Tha_Maero_Card",
+	"Tha_Odium_Card",
+	"Tha_Despero_Card",
+	"Aliza_Card",
+	"Alicel_Card",
+	"Aliot_Card",
+	"Skogul_Card",
+	"Frus_Card",
+	"Agav_Card",
+	"Echio_Card",
+	"Vanberk_Card",
+	"Isilla_Card",
+	"Hodremlin_Card",
+	"Seeker_Card",
+	("Snowier_Card",2),
+	"Siroma_Card",
+	"Ice_Titan_Card",
+	"Gazeti_Card",
+	"Muscipular_Card",
+	("Drosera_Card",2),
+	"Roween_Card",
+	"Galion_Card",
+	("Stapo_Card",3),
+	"Byorgue_Card",
+	"Sword_Guardian_Card",
+	"Bow_Guardian_Card",
+	"Salamander_Card",
+	"Kasa_Card",
+	("Magmaring_Card",2),
+	"Imp_Card",
+	"Knocker_Card",
+	"Zombie_Slaughter_Card",
+	("Ragged_Zombie_Card",2),
+	("Hell_Poodle_Card",2),
+	("Banshee_Card",2),
+	"Flame_Skull_Card",
+	"Necromancer_Card"
+)
+*/
+/* currently unsupported or unknown ('High_Weapon_Box_')
+High_Weapon_Box_: (
+	("Mail_Breaker",5),
+	("Weeder_Knife",5),
+	("Mama's_Knife",5),
+	("Assasin_Dagger",5),
+	("Exercise",5),
+	("Azoth",5),
+	("Sucsamad",5),
+	("Grimtooth_",5),
+	("Princess_Knife",5),
+	("Cursed_Dagger",5),
+	("Counter_Dagger",5),
+	("Holy_Dagger",5),
+	("Krieg",5),
+	("Weihna",5),
+//unknown/unsupported - 	("13061",5),
+	("Blood_Tears",5),
+	("Unholy_Touch",5),
+	("Drill_Katar",5),
+	("Krishna",5),
+	("Cakram",5),
+	("Cleaver",5),
+	("Great_Axe",5),
+	("Sabbath",5),
+	("Bradium_Stonehammer",5),
+	("Slaughter",5),
+	("Tomahawk",5),
+	("Vecer_Axe",5),
+	("Ice_Falchon",7),
+	("Fire_Brand",7),
+	("Scissores_Sword",7),
+	("Cutlas",7),
+	("Solar_Sword",7),
+	("Mysteltainn_",7),
+	("Tale_Fing_",7),
+	("Byeorrun_Gum",7),
+	("Immaterial_Sword",7),
+	("Star_Dust_Blade",7),
+	("Muramasa",7),
+	("Dragon_Slayer",7),
+	("Schweizersabel",7),
+	("Zweihander",7),
+	("Katzbalger",7),
+	("Zweihander_",7),
+	("Muscle_Cutter",7),
+	("Schweizersabel_",7),
+	("Dragon_Slayer_",7),
+	("Tae_Goo_Lyeon",7),
+	("Bloody_Eater",7),
+	("Veteran_Sword",7),
+	("Ruber",5),
+	("Krasnaya",5),
+	("Gungnir",5),
+	("Gelerdria",5),
+	("Tjungkuletti",5),
+	("Gungnir_",5),
+	("Crescent_Scythe",5),
+	("Bill_Guisarme",5),
+	("Zephyrus",5),
+	("Longinus's_Spear",5),
+	("Brionac",5),
+	("Hell_Fire",5),
+	("Gae_Bolg",5),
+	("Crescent_Scythe_",5),
+	("Spectral_Spear",5),
+	("Ahlspiess",5),
+	("Spectral_Spear_",5),
+	("Gae_Bolg_",5),
+	("Zephyrus_",5),
+	("Wizardy_Staff",5),
+	("Staff_Of_Wing",5),
+	("Walking_Stick",5),
+	("Holy_Stick",5),
+	("Dead_Tree_Cane",5),
+	("Kronos",5),
+	("Dea_Staff",5),
+	("Divine_Cross",5),
+	("Golden_Mace",5),
+	("Long_Mace",5),
+	("Quadrille",5),
+	("Golden_Mace_",5),
+	("Nemesis",5),
+	("Erde",5),
+	("Red_Square_Bag",5),
+//unknown/unsupported - 	("16010",5),
+	("Book_Of_The_Apocalypse",5),
+	("Girl's_Diary",5),
+	("Legacy_Of_Dragon",5),
+	("Hardback",5),
+	("Bible_Of_Battlefield",5),
+	("Kaiser_Knuckle",5),
+	("Claw_Of_Garm",5),
+	("Dragon_Wing",5),
+	("Bow_Of_Minstrel",5),
+	("Ixion_Wing",5),
+	("Nepenthes_Bow",5),
+	("Cursed_Lyre",5),
+	("Falken_Blitz",5),
+//unknown/unsupported - 	("18103",5),
+	("Electronic_Guitar",5),
+	("Oriental_Lute",5),
+	("Oriental_Lute_",5),
+	("Harp_Of_Nepenthes",5),
+	("Lariat",5),
+	("Rapture_Rose",5),
+	("Chemeti",5),
+	("Bladed_Whip",5),
+	("Electric_Eel",5),
+	("Sea_Witch_Foot",5),
+	("Queen's_Whip",5),
+	("Carrot_Whip",5),
+	("Queen's_Whip_",5),
+	("Stem_Of_Nepenthes",5),
+	"Thorn_Staff",
+	"Eraser",
+	"Destruction_Rod",
+	"Infiltrator",
+	"Infiltrator_",
+	"Heart_Breaker",
+	"Hurricane_Fury",
+	"Right_Epsilon",
+	"Doom_Slayer",
+	("Sword_Breaker",4),
+//unknown/unsupported - 	("13431",2),
+//unknown/unsupported - 	("1196",2),
+	("Excalibur",2),
+	("Masamune",2),
+	("Nagan",2),
+	("Executioner_",2),
+	("Executioner__",2),
+	("Altas_Weapon",2),
+	("Giant_Axe",2),
+	("Guillotine",2),
+	("Brood_Axe",2),
+	("Wild_Beast_Claw",2),
+	("Inverse_Scale",2),
+	("Bloody_Roar",2),
+	("Cardo",2),
+//unknown/unsupported - 	("1433",2),
+	("Skewer",2),
+	("Battle_Hook",2),
+//unknown/unsupported - 	("1654",2),
+	"Doom_Slayer_",
+	"Hunting_Spear",
+	"Edge",
+	"Violet_Fear",
+	"Death_Guidance",
+	"House_Auger",
+	"Bazerald",
+//unknown/unsupported - 	"13062",
+	"Grand_Cross",
+	"Grand_Cross_",
+	"Death_Note",
+	"Berserk",
+	"Berserk_",
+	"Berserk_Guitar",
+//unknown/unsupported - 	"1985",
+	("Forturn_Sword",2),
+	("Combat_Knife",2),
+	("Moonlight_Sword",2),
+	("Spike",2),
+	("Spike_",2),
+	("Slash",2),
+//unknown/unsupported - 	("1830",2),
+	("Bow_Of_Roguemaster",2),
+	("Balistar",2),
+	("Balistar_",2),
+	("Bow_Of_Rudra",2),
+//unknown/unsupported - 	("1930",2),
+//unknown/unsupported - 	("1984",2),
+//unknown/unsupported - 	"1290",
+//unknown/unsupported - 	"1291",
+//unknown/unsupported - 	"1392",
+//unknown/unsupported - 	"1393",
+//unknown/unsupported - 	"1435",
+//unknown/unsupported - 	"1584",
+//unknown/unsupported - 	"1659",
+//unknown/unsupported - 	"13069",
+//unknown/unsupported - 	"13070",
+//unknown/unsupported - 	"16017",
+//unknown/unsupported - 	"18109",
+//unknown/unsupported - 	"18110",
+//unknown/unsupported - 	"18111"
+)
+*/
+Holy_Egg_2: (
+	("Oridecon",3),
+	("Elunium",10),
+	("White_Slim_Potion",30),
+	("Blue_Potion",30),
+	("Yggdrasilberry",3),
+	("Seed_Of_Yggdrasil",2),
+	("Leaf_Of_Yggdrasil",15),
+	("Old_Card_Album",5),
+	"Drooping_Bunny"
+)
+/* currently unsupported or unknown ('Candy_Holder')
+Candy_Holder: (
 	("Honey",9),
 	("Candy",20),
 	("Well_Baked_Cookie",15),
@@ -3382,6 +4696,66 @@ Splendid_Box: (
 	"Old_Violet_Box",
 	"Contracts_In_Shadow",
 	("Niflheim_Ticket",10),
-	("Pumpkin_Cake",5),
+//unknown/unsupported - 	("11550",5),
 	("Pumpkin_Pie",5)
-)*/
\ No newline at end of file
+)
+*/
+Lotto_Box01: (
+	"Lotto02",
+	"Lotto03",
+	"Lotto04",
+	"Lotto05",
+	"Lotto06",
+	"Lotto07",
+	"Lotto08",
+	"Lotto09"
+)
+Lotto_Box02: (
+	"Lotto11",
+	"Lotto12",
+	"Lotto13",
+	"Lotto14",
+	"Lotto15",
+	"Lotto16",
+	"Lotto17",
+	"Lotto18"
+)
+Lotto_Box03: (
+	"Lotto20",
+	"Lotto21",
+	"Lotto22",
+	"Lotto23",
+	"Lotto24",
+	"Lotto25",
+	"Lotto26",
+	"Lotto27"
+)
+Lotto_Box04: (
+	"Lotto29",
+	"Lotto30",
+	"Lotto31",
+	"Lotto32",
+	"Lotto33",
+	"Lotto34",
+	"Lotto35",
+	"Lotto36"
+)
+Lotto_Box05: (
+	"Lotto38",
+	"Lotto39",
+	"Lotto40",
+	"Lotto41",
+	"Lotto42",
+	"Lotto43",
+	"Lotto44",
+	"Lotto45"
+)
+/* currently unsupported or unknown ('Lucky_Bag')
+Lucky_Bag: (
+	("Fire_Cracker",7),
+	("Korea_Rice_Cake",6),
+	("Handsei",2),
+//unknown/unsupported - 	("7647",3),
+//unknown/unsupported - 	"7649"
+)
+*/
\ No newline at end of file
diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt
index abcda323b..38347f931 100644
--- a/db/pre-re/skill_cast_db.txt
+++ b/db/pre-re/skill_cast_db.txt
@@ -1110,6 +1110,8 @@
 2019,0,0,0,180000,0,0
 //-- RK_DRAGONBREATH_WATER
 5004,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,40000,0,0
+//-- RK_LUXANIMA
+5005,0,0,0,60000,0,0
 //========================================== 
 
 //===== Gillotine Cross ==================== 
@@ -1147,7 +1149,7 @@
 //-- GC_CROSSRIPPERSLASHER 
 2037,0,1000,0,0,0,0
 //-- GC_DARKCROW
-5001,0,1500,0,5000,0,0
+5001,0,1500,0,5000,0,60000
 //========================================== 
 
 //===== Arch Bishop ======================== 
@@ -1381,6 +1383,8 @@
 2303,2000,2000,0,10000:20000:30000,0,180000
 //-- SC_FEINTBOMB 
 2304,1000,0,0,1000,0,5000
+//-- SC_ESCAPE
+5010,0,0,0,1000,0,15000
 //========================================== 
 
 //==== Royal Guard skills ================== 
@@ -1589,6 +1593,8 @@
 2467,1000,0,0,60000,0,60000
 //-- SO_EARTH_INSIGNIA 
 2468,1000,0,0,60000,0,60000
+//-- SO_ELEMENTAL_SHIELD
+5008,1000,0,0,0,0,10000
 //========================================== 
 
 //==== Genetic skills ====================== 
@@ -1631,6 +1637,8 @@
 
 //-- GN_SLINGITEM_RANGEMELEEATK 
 2498,0,0,0,3000,0,0
+//-- GN_ILLUSIONDOPING
+5003,0,0,0,10000,0,10000
 //========================================== 
 
 //===== Extra 3rd Class Skills ============= 
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index 26030c867..54b891c51 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -1067,16 +1067,16 @@
 3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		ECLAGE_RECALL,Return To Eclage
 
 // EP 14.3 Part 2 3rd Job Skills
-5001,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	GC_DARKCROW,Dark Claw
+5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0,	GC_DARKCROW,Dark Claw
 5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RA_UNLIMIT,Unlimited
-//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,	GN_ILLUSIONDOPING,Illusion Doping
+5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,	GN_ILLUSIONDOPING,Illusion Doping
 5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0,	RK_DRAGONBREATH_WATER,Dragon Breath - Water
-//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,		RK_LUXANIMA,Lux Anima
+5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,		RK_LUXANIMA,Lux Anima
 5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,		NC_MAGMA_ERUPTION,Magma Eruption
 5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,	WM_FRIGG_SONG,Frigg's Song
-//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,	SO_ELEMENTAL_SHIELD,Elemental Shield
+5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,	SO_ELEMENTAL_SHIELD,Elemental Shield
 5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,		SR_FLASHCOMBO,Flash Combo
-//5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SC_ESCAPE,Emergency Escape
 5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		AB_OFFERTORIUM,Offertorium
 5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		WL_TELEKINESIS_INTENSE,Intense Telekinesis
 5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0,		LG_KINGS_GRACE,King's Grace
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index 96568de53..5b04d5f6a 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -467,7 +467,7 @@
 2008,0,0,30:35:40:45:50:55:60:65:70:75,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DRAGONBREATH#Dragon Breath#
 2009,0,0,70,0,0,0,99,0,0,dragon,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_DRAGONHOWLING#Dragon Howling#
 2011,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_MILLENNIUMSHIELD#Millenium Shield#
-2012,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_CRUSHSTRIKE#Crush Strike#
+2012,0,0,1,0,0,0,1:2:3:4:5:6:7:8,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_CRUSHSTRIKE#Crush Strike#
 2013,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_REFRESH#Refresh#
 2014,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_GIANTGROWTH#Giant Growth#
 2015,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RK_STONEHARDSKIN#Stone Hard Skin#
@@ -650,7 +650,7 @@
 2314,0,0,150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_RAGEBURST#Rage Burst#
 2315,0,0,50,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_SHIELDSPELL#Shield Spell#
 2316,0,0,24:28:32:36:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_EXEEDBREAK#Exceed Break#
-2317,0,0,42:44:46:48:50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_OVERBRAND#Over Brand#
+2317,0,0,42:44:46:48:50,0,0,0,4:5,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_OVERBRAND#Over Brand#
 2318,0,0,75:80:85:90:95,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_PRESTIGE#Prestige#
 2319,0,0,30:36:42:48:54,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_BANDING#Banding#
 2320,0,0,20:24:28:32:36,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_MOONSLASHER#Moon Slasher#
@@ -659,6 +659,7 @@
 2323,0,0,52:60:68:76:84,0,0,0,99,0,0,shield,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_EARTHDRIVE#Earth Drive#
 2324,0,0,80:90:100:110:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_HESPERUSLIT#Hesperus Lit#
 2325,0,0,100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//LG_INSPIRATION#Inspiration#
+
 //****
 // SR Sura
 2326,0,0,3:4:5:6:7:8:9:10:11:12,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//SR_DRAGONCOMBO#Dragon Combo#
@@ -779,6 +780,7 @@
 2497,0,0,12,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GN_S_PHARMACY#Special Pharmacy#
 2498,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//GN_SLINGITEM_RANGEMELEEATK#Sling Item Attack#
 
+
 //2533,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ALL_ODINS_RECALL#Odin's Recall#
 2534,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//RETURN_TO_ELDICASTES#Return To Eldicastes#
 2535,0,0,1,0,0,0,99,0,0,none,0,6377,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//ALL_BUYING_STORE#Open Buying Store
@@ -815,7 +817,7 @@
 3022,0,0,70:75:80:85:90,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KO_IZAYOI#Izayoi#
 3023,0,0,60:65:70:75:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KG_KAGEHUMI#Kagehumi#
 3024,0,0,50,0,0,0,99,0,0,none,0,7524,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KG_KYOMU#Kyomu#
-3025,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,6499,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KG_KAGEMUSYA#Kagemusha#
+3025,0,0,25:30:35:40:45,0,0,0,99,0,0,none,0,7524,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//KG_KAGEMUSYA#Kagemusha#
 3026,0,0,60:70:80:90:100 ,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//OB_ZANGETSU#Zangetsu#
 3027,0,0,55:60:65:70:75 ,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//OB_OBOROGENSOU#Oboro Gensou#
 3029,0,0,20:30:40:50:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//OB_AKAITSUKI#Akaitsuki#
@@ -828,9 +830,9 @@
 5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0        //RK_LUXANIMA#Lux Anima#
 5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  //NC_MAGMA_ERUPTION#Magma Eruption#
 5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //WM_FRIGG_SONG#Frigg's Song#
-5008,0,0,120:120:120:120:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //SO_ELEMENTAL_SHIELD#Elemental Shield#
+5008,0,0,120:120:120:120:120,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //SO_ELEMENTAL_SHIELD#Elemental Shield#
 5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SR_FLASHCOMBO#Flash Combo#
-5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SC_ESCAPE#Emergency Escape#
+5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SC_ESCAPE#Emergency Escape#
 5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
 5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
 5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //LG_KINGS_GRACE#King's Grace#
@@ -868,7 +870,7 @@
 8025,0,0,90:100:110:120:130,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_XENO_SLASHER#Xeno Slasher#
 8026,0,0,45:54:63:72:81,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_SILENT_BREEZE#Silent Breeze#
 8027,0,0,35,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_STYLE_CHANGE#Style Change#
-8028,0,0,20:25:30:35:40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_SONIC_CRAW#Sonic Claw#
+8028,0,0,20:25:30:35:40,0,0,0,99,0,0,mh_fighting,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_SONIC_CRAW#Sonic Claw#
 8029,0,0,10:15:20:25:30,0,0,0,99,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_SILVERVEIN_RUSH#Silver Bain Rush#
 8030,0,0,8:16:24:32:40,0,0,0,99,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_MIDNIGHT_FRENZY#Midnight Frenzy#
 8031,0,0,40:45:50:55:60,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_STAHL_HORN#Steel Horn#
@@ -876,8 +878,8 @@
 8033,0,0,80:90:100:110:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_STEINWAND#Stone Wall#
 8034,0,0,60:68:76:84:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_HEILIGE_STANGE#Holy Pole#
 8035,0,0,60:65:70:75:80,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_ANGRIFFS_MODUS#Attack Mode#
-8036,0,0,20:25:30:35:40,0,0,0,99,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_TINDER_BREAKER#Tinder Breaker#
-8037,0,0,10:20:30:40:50,0,0,0,99,0,0,none,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_CBC#Continual Break Combo#
+8036,0,0,20:25:30:35:40,0,0,0,99,0,0,mh_grappling,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_TINDER_BREAKER#Tinder Breaker#
+8037,0,0,10:20:30:40:50,0,0,0,99,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_CBC#Continual Break Combo#
 8038,0,0,24:28:32:36:40,0,0,0,99,0,0,none,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_EQC#Eternal Quick Combo#
 8039,0,0,34:38:42:46:50,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_MAGMA_FLOW#Magma Flow#
 8040,0,0,54:58:62:66:70,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0	//MH_GRANITIC_ARMOR#Granitic Armor#
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 659c331de..a6eb10626 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -2980,6 +2980,10 @@ Sorcerer: {
 			MaxLevel: 3
 			SO_SUMMON_TERA: 3
 		}
+		SO_ELEMENTAL_SHIELD: {
+			MaxLevel: 5
+			SO_EL_CONTROL: 3
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }
@@ -3384,10 +3388,10 @@ Genetic: {
 			GN_MIX_COOKING: 1
 		}
 		GN_S_PHARMACY: 10
-//		GN_ILLUSIONDOOPING: {
-//			MaxLevel: 5
-//			GN_S_PHARMACY: 1
-//		}
+		GN_ILLUSIONDOPING: {
+			MaxLevel: 5
+			GN_S_PHARMACY: 1
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }
@@ -3485,10 +3489,10 @@ Shadow_Chaser: {
 			MaxLevel: 3
 			SC_DIMENSIONDOOR: 3
 		}
-//		SC_SCAPE: {
-//			MaxLevel: 5
-//			SC_TRIANGLESHOT: 2
-//		}
+		SC_ESCAPE: {
+			MaxLevel: 5
+			SC_TRIANGLESHOT: 2
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }
diff --git a/db/produce_db.txt b/db/produce_db.txt
index caf653090..9588edb14 100644
--- a/db/produce_db.txt
+++ b/db/produce_db.txt
@@ -420,6 +420,8 @@
 12732,24,2010,3,1035,1,7221,1,7938,1,7939,1
 //-- Runstone Hagalas <-- RK_RUNEMASTERY Lv4, 1 Round Shell, 1 Dragon's Skin, 1 Elder Branch
 12733,24,2010,4,1096,1,7123,1,7939,1
+//-- Runstone Lux Anima <-- RK_RUNEMASTERY Lv10, 3 Gold, 3 Light Granule
+22540,24,2010,10,969,3,7938,3
 //==============================================
 
 //===== Guillotine Cross Poisons === ItemLv=25 =
diff --git a/db/quest_db.txt b/db/quest_db.txt
index 6b4108ad6..c6c306070 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -31,7 +31,6 @@
 1115,0,0,0,0,0,0,0,"Ropewa & Yuridi - Song of the Abyss"
 1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song"
 1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
-// Ropewa Clue Quest
 1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues"
 1119,82800,0,0,0,0,0,0,"Neighborhood Knight - Cooldown"
 
@@ -46,7 +45,6 @@
 1153,0,0,0,0,0,0,0,"Help the poor cat"
 1154,0,2197,20,0,0,0,0,"Help the poor cat"
 1155,0,0,0,0,0,0,0,"Help the poor cat"
-
 1174,0,0,0,0,0,0,0,"Rumor, Time and Legend"
 1175,0,0,0,0,0,0,0,"Rumor, Time and Legend"
 1176,0,0,0,0,0,0,0,"Rumor, Time and Legend"
@@ -68,6 +66,23 @@
 1192,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
 1193,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
 
+// Find Professor Worm's Memory
+1214,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1215,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1216,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1217,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1218,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1219,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1220,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1221,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1222,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1223,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1224,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1225,0,2367,15,0,0,0,0,"Getting back Professor Worm's memory"
+1226,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1227,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+1228,0,0,0,0,0,0,0,"Getting back Professor Worm's memory"
+
 2000,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2001,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2002,0,0,0,0,0,0,0,"Job Change to Blacksmith"
@@ -263,6 +278,25 @@
 2222,0,0,0,0,0,0,0,"Wanderer Job Change Quest"
 2223,0,1428,100,0,0,0,0,"Generic Job Change Quest"
 
+// Secret in the Woods
+2271,0,0,0,0,0,0,0,"Secret in the Woods"
+2272,0,0,0,0,0,0,0,"Secret in the Woods"
+2273,0,0,0,0,0,0,0,"Secret in the Woods"
+2274,0,0,0,0,0,0,0,"Secret in the Woods"
+2275,0,0,0,0,0,0,0,"Secret in the Woods"
+2276,0,0,0,0,0,0,0,"Secret in the Woods"
+2277,0,0,0,0,0,0,0,"Secret in the Woods"
+2278,0,0,0,0,0,0,0,"Secret in the Woods"
+2279,0,0,0,0,0,0,0,"Secret in the Woods"
+2280,0,0,0,0,0,0,0,"Secret in the Woods"
+2281,0,2319,1,0,0,0,0,"Get Rid of Buwaya"
+
+// Pyramid (Nightmare)
+2289,0,2355,20,0,0,0,0,"Verit Hunting (Nightmare)"
+2290,82800,0,0,0,0,0,0,"Verit Hunting - Cooldown"
+2291,82800,0,0,0,0,0,0,"Mummy Hunting - Cooldown"
+2292,0,2354,20,0,0,0,0,"Mummy Hunting (Nightmare)"
+
 // New Novice Ground
 2299,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
 2300,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer"
@@ -474,6 +508,13 @@
 4159,0,0,0,0,0,0,0,"Homunculus S Mutation Mission - 5"
 4160,0,0,0,0,0,0,0,"Homunculus S Mutation Mission - 6"
 
+4161,0,0,0,0,0,0,0,"Siege Expert"
+4162,0,0,0,0,0,0,0,"Party Recruiting Expert"
+4163,0,0,0,0,0,0,0,"Battleground Expert"
+4164,0,0,0,0,0,0,0,"Memorial Dungeon Expert"
+4165,0,0,0,0,0,0,0,"Map Expert"
+4166,0,0,0,0,0,0,0,"Passing Grades"
+
 // Paradise 86 - 90 [Chilly]
 4167,0,1321,30,0,0,0,0,"Paradise: Dragon Tail Handling"
 4168,0,1322,30,0,0,0,0,"Paradise: Spring Rabbit Handling"
@@ -508,7 +549,54 @@
 4195,0,1255,30,0,0,0,0,"Paradise: Neraid Handling"
 4196,0,1506,30,0,0,0,0,"Paradise: Disguise Handling"
 
-4229,0,0,0,0,0,0,0,"Devil in the Cave"
+4197,10800,0,0,0,0,0,0,"Octopus"
+
+// Paradise Cooldowns
+4198,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4199,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4200,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4201,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4202,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4203,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4204,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4205,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4206,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4207,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4208,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4209,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4210,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4211,10800,0,0,0,0,0,0,"86-90 Mission Board Timer"
+4212,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4213,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4214,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4215,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4216,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4217,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4218,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4219,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4220,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4221,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4222,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4223,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4224,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4225,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4226,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+4227,10800,0,0,0,0,0,0,"91-99 Mission Board Timer"
+
+4229,86400,0,0,0,0,0,0,"Devil in the Cave"
+
+4254,0,0,0,0,0,0,0,"Fairy with a stomache"
+4255,0,0,0,0,0,0,0,"Revenge!"
+4256,0,0,0,0,0,0,0,"An accomplice?"
+4257,0,0,0,0,0,0,0,"Conspiracy"
+4258,0,0,0,0,0,0,0,"Eirinn"
+4259,0,0,0,0,0,0,0,"Bourbon"
+4260,0,0,0,0,0,0,0,"Bee"
+4261,0,0,0,0,0,0,0,"Counterattack (1)"
+4262,0,0,0,0,0,0,0,"Counterattack (2)"
+4263,0,0,0,0,0,0,0,"Counteroffensive (1)"
+4264,0,0,0,0,0,0,0,"Counteroffensive (2)"
+4265,0,0,0,0,0,0,0,"Bookshelf use"
 
 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7"
 
@@ -527,7 +615,6 @@
 5027,0,0,0,0,0,0,0,"Northern Pool Research"
 5028,43200,0,0,0,0,0,0,"Inspection of the Sample"
 5029,3600,0,0,0,0,0,0,"Unidentified Creature"
-
 5030,0,0,0,0,0,0,0,"The creature's family"
 5031,0,0,0,0,0,0,0,"The creature's family"
 5032,0,0,0,0,0,0,0,"The creature's family"
@@ -617,7 +704,7 @@
 5124,0,0,0,0,0,0,0,"[Rest] Clown"
 5125,0,0,0,0,0,0,0,"[Rest] Gypsy"
 
-// Kagerou/Oboro Job Quests
+// Kagerou/Oboro Job Quest
 5131,0,0,0,0,0,0,0,"Strange Conversation"
 5132,0,0,0,0,0,0,0,"Family Business-(1)"
 5133,0,0,0,0,0,0,0,"Family Business-(2)"
@@ -833,8 +920,10 @@
 7178,0,0,0,0,0,0,0,"Destination of Deception, Delusion and Gaiety"
 7179,0,0,0,0,0,0,0,"Vicente, you dare!"
 7180,0,0,0,0,0,0,0,"Message from Doomk"
+
 7181,0,0,0,0,0,0,0,"Karakas's ring"
-// El Dicastes [Euphy]
+
+// El Dicastes
 7182,0,0,0,0,0,0,0,"Sapha's Visit"
 7183,0,0,0,0,0,0,0,"Invitation from Sapha"
 7184,0,0,0,0,0,0,0,"To El Dicastes!"
@@ -857,7 +946,6 @@
 7201,0,0,0,0,0,0,0,"Removing traces"
 7202,0,0,0,0,0,0,0,"Secret order from Doha - Collect proof"
 7203,0,0,0,0,0,0,0,"Secret order from Doha - Final Report"
-// New Sapha's Honor Quest
 7206,0,0,0,0,0,0,0,"New Day for Cheshire"
 7207,0,0,0,0,0,0,0,"Cheshire's Box"
 7208,86400,0,0,0,0,0,0,"Wait for Cheshire?"
@@ -866,6 +954,7 @@
 7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
 7212,0,0,0,0,0,0,0,"Loki's Search"
 7213,0,0,0,0,0,0,0,"Wandering Protector"
+
 // Paradise Gear Advanced Quests [Chilly]
 7214,0,0,0,0,0,0,0,"Paradise Advanced: Romeo Training"
 7215,0,1278,3,0,0,0,0,"Paradise Advanced: Romeo Hunt 1"
@@ -1016,7 +1105,6 @@
 7362,0,0,0,0,0,0,0,"Deliver Holy Item to Merchant"
 7363,0,0,0,0,0,0,0,"Deliver Holy Item to Little Kid"
 7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
-// Hunting Quests
 7365,0,0,0,0,0,0,0,"Better than My Old Button-2"
 7366,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-1"
 7367,0,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
@@ -1064,6 +1152,55 @@
 7409,0,0,0,0,0,0,0,"Cannot Meet Eyes with Him!"
 7410,0,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
 
+// Eclage
+7411,0,0,0,0,0,0,0,"The traveler, Fome's story"
+7412,0,0,0,0,0,0,0,"The traveler, Litrip's story"
+7413,0,0,0,0,0,0,0,"The traveler, Chiba's story"
+7414,0,0,0,0,0,0,0,"Eclage guard's message"
+7415,0,0,0,0,0,0,0,"Laphine's Chief of Staff"
+7416,600,0,0,0,0,0,0,"Waiting to meet"
+7417,0,0,0,0,0,0,0,"Kardui's request"
+7418,0,0,0,0,0,0,0,"For Eclage 1"
+7419,0,0,0,0,0,0,0,"For Eclage 2"
+7420,0,0,0,0,0,0,0,"For Eclage 3"
+7421,0,0,0,0,0,0,0,"That's enough"
+7422,0,0,0,0,0,0,0,"Kardui's gift"
+7423,0,0,0,0,0,0,0,"A rumor about the King 1"
+7424,0,0,0,0,0,0,0,"A rumor about the King 2"
+7425,0,0,0,0,0,0,0,"A rumor about the King 3"
+7426,0,0,0,0,0,0,0,"A rumor about the King 4"
+7427,0,0,0,0,0,0,0,"At times like this, face it straight on!"
+7428,0,0,0,0,0,0,0,"Yai of the wild"
+7429,0,0,0,0,0,0,0,"Wild recent trend!"
+7430,0,0,0,0,0,0,0,"Deliveryman that runs through space"
+7431,0,0,0,0,0,0,0,"A mailman never rests!"
+7432,0,0,0,0,0,0,0,"The troublemakers in the land of blooming flowers"
+7433,0,0,0,0,0,0,0,"Need constant guidance"
+
+// Twins and Scholar of Magics
+7434,0,0,0,0,0,0,0,"Kardui's big brother"
+7435,0,0,0,0,0,0,0,"Time for reading the letter"
+7436,0,0,0,0,0,0,0,"Avant the Scholar of Magics"
+7437,0,0,0,0,0,0,0,"Shenime's favor"
+7438,0,0,0,0,0,0,0,"Secret sponsorship"
+7439,0,0,0,0,0,0,0,"The scholar of magics sponsored by Shenime"
+7440,0,0,0,0,0,0,0,"Minuel's witness"
+7441,0,0,0,0,0,0,0,"Mail is here!"
+7442,0,0,0,0,0,0,0,"The identity of the scholar of magics"
+7443,0,0,0,0,0,0,0,"Interfere with the research!"
+7444,0,0,0,0,0,0,0,"What Avant was researching"
+
+// Orb
+7445,0,0,0,0,0,0,0,"Avant's back"
+7446,0,0,0,0,0,0,0,"Unfruitful conversation"
+7447,0,0,0,0,0,0,0,"Dilemma surrounding the Orb"
+7448,0,0,0,0,0,0,0,"Something's not right"
+7449,0,0,0,0,0,0,0,"Temptation toward the Orb"
+7450,0,0,0,0,0,0,0,"Orb's lighting room"
+7451,0,0,0,0,0,0,0,"Betrayal"
+7452,0,0,0,0,0,0,0,"Find the chief of staff!"
+7453,0,0,0,0,0,0,0,"The last of the chief of staff"
+
 8000,0,0,0,0,0,0,0,"Quitting Job Change"
 8001,0,0,0,0,0,0,0,"Job Change to Assassin"
 8002,0,0,0,0,0,0,0,"Job Change to Assassin"
@@ -1389,10 +1526,56 @@
 9164,0,0,0,0,0,0,0,"Delivery of Good News(4)"
 9165,0,0,0,0,0,0,0,"Reward from Paiko for success of Jaty Crown"
 
+9167,0,0,0,0,0,0,0,"Tutorial - Mercenary for Hire"
+9168,0,0,0,0,0,0,0,"Quest Window Check"
+9169,0,0,0,0,0,0,0,"Window Shopper Catalogue"
+9170,0,0,0,0,0,0,0,"Window Shopper Catalogue"
+9171,0,0,0,0,0,0,0,"Enchanting Items"
+9172,0,0,0,0,0,0,0,"Enchanted Items"
+9173,72000,0,0,0,0,0,0,"Tutorial Timer Cooldown"
+
 9222,0,0,0,0,0,0,0,"Get Rid of Bangungot from Hospital 2F"
 9223,0,0,0,0,0,0,0,"Will there be Peace at the Hospital?"
 9224,0,0,0,0,0,0,0,"Explore Hospital 2F"
 
+9225,0,0,0,0,0,0,0,"Mystery Robbery Incident 1"
+9226,0,0,0,0,0,0,0,"Mystery Robbery Incident 2"
+9227,0,0,0,0,0,0,0,"Mystery Robbery Incident 3"
+9228,0,0,0,0,0,0,0,"Mystery Robbery Incident 4"
+9229,0,0,0,0,0,0,0,"Mystery Robbery Incident 5"
+9230,0,0,0,0,0,0,0,"Mystery Robbery Incident 6"
+9231,0,0,0,0,0,0,0,"Mystery Robbery Incident 7"
+9232,0,0,0,0,0,0,0,"Mystery Robbery Incident 8"
+9233,0,0,0,0,0,0,0,"Mystery Robbery Incident 9"
+9234,0,0,0,0,0,0,0,"Mystery Robbery Incident 10"
+9235,0,0,0,0,0,0,0,"Mystery Robbery Incident 11"
+9236,0,0,0,0,0,0,0,"Mystery Robbery Incident 12"
+9237,0,0,0,0,0,0,0,"Mystery Robbery Incident 13"
+9238,0,0,0,0,0,0,0,"Mystery Robbery Incident 14"
+9239,0,0,0,0,0,0,0,"Mystery Robbery Incident 15"
+9240,0,0,0,0,0,0,0,"Luen's statement notes"
+9241,0,0,0,0,0,0,0,"Luen's statement notes"
+9242,0,0,0,0,0,0,0,"Luen's statement notes"
+9243,0,0,0,0,0,0,0,"Luen's statement notes"
+9244,0,0,0,0,0,0,0,"Dames's statement notes"
+9245,0,0,0,0,0,0,0,"Dames's statement notes"
+9246,0,0,0,0,0,0,0,"Dames's statement notes"
+9247,0,0,0,0,0,0,0,"Dames's statement notes"
+9248,0,0,0,0,0,0,0,"Rosa's statement notes"
+9249,0,0,0,0,0,0,0,"Rosa's statement notes"
+9250,0,0,0,0,0,0,0,"Rosa's statement notes"
+9251,0,0,0,0,0,0,0,"Rosa's statement notes"
+9252,0,0,0,0,0,0,0,"Observing Poppy"
+9253,0,0,0,0,0,0,0,"Examining a messy bookshelf"
+9254,0,0,0,0,0,0,0,"Examining a damaged book"
+9255,0,0,0,0,0,0,0,"Examining a container for soda cans"
+9256,0,0,0,0,0,0,0,"Examining a messed up table"
+9257,0,0,0,0,0,0,0,"Examining a foreign object"
+9258,0,0,0,0,0,0,0,"Field examination results"
+9259,0,0,0,0,0,0,0,"Confirming Cruyan's statements"
+9260,0,0,0,0,0,0,0,"Survey investigation notes"
+9262,0,0,0,0,0,0,0,"Mystery Robbery Incident 16"
+
 10000,0,0,0,0,0,0,0,"To the Prontera Royal Court"
 10001,0,0,0,0,0,0,0,"Qualification Test"
 10002,0,0,0,0,0,0,0,"Qualification Review"
@@ -1513,7 +1696,7 @@
 10115,0,1386,20,0,0,0,0,"Juno - sleeper"
 10116,0,1372,20,0,0,0,0,"Juno - Goat"
 10117,0,1376,20,0,0,0,0,"Juno - Harpy"
-10118,0,1269,10,0,0,0,0,"clock tower - Clock"
+10118,0,1269,15,0,0,0,0,"clock tower - Clock"
 10119,0,1199,15,0,0,0,0,"clock tower - Punk"
 10120,0,1195,15,0,0,0,0,"clock tower - Rideword"
 10121,0,1883,15,0,0,0,0,"Localizing - Uzhas"
@@ -1677,12 +1860,12 @@
 11162,0,0,0,0,0,0,0,"Story of Rose"
 11163,0,0,0,0,0,0,0,"Story of Bain"
 11164,0,0,0,0,0,0,0,"Story of Lash"
-11165,0,0,0,0,0,0,0,"Delivered to Brian"
-11166,0,0,0,0,0,0,0,"Delivered to John"
-11167,0,0,0,0,0,0,0,"Delivered to Tyler"
-11168,0,0,0,0,0,0,0,"Delivered to Rose"
-11169,0,0,0,0,0,0,0,"Delivered to Bain"
-11170,0,0,0,0,0,0,0,"Delivered to Lash"
+11165,0,0,0,0,0,0,0,"Delivery to Brian"
+11166,0,0,0,0,0,0,0,"Delivery to John"
+11167,0,0,0,0,0,0,0,"Delivery to Tyler"
+11168,0,0,0,0,0,0,0,"Delivery to Rose"
+11169,0,0,0,0,0,0,0,"Delivery to Bain"
+11170,0,0,0,0,0,0,0,"Delivery to Lash"
 11171,0,0,0,0,0,0,0,"Request from Frede"
 11172,0,0,0,0,0,0,0,"Request from Frede"
 11173,0,0,0,0,0,0,0,"Request from Frede"
@@ -1690,11 +1873,9 @@
 11175,7200,0,0,0,0,0,0,"Supply Shortage"
 11176,0,0,0,0,0,0,0,"For my friends"
 
-//Mora Quests
-// == Roast Beef Quest
+// Mora
 11182,60,0,0,0,0,0,0,"Theore's Report"
 11183,0,0,0,0,0,0,0,"Theore's Favor"
-// == Theo
 11184,0,0,0,0,0,0,0,"Runaway Laphine"
 11185,0,0,0,0,0,0,0,"Pouch"
 11186,0,0,0,0,0,0,0,"Pouch"
@@ -1703,28 +1884,23 @@
 11189,0,0,0,0,0,0,0,"Roast Beef"
 11190,0,0,0,0,0,0,0,"Roast Beef"
 11191,0,0,0,0,0,0,0,"Shortage of Roast Beef"
-
-11198,0,0,0,0,0,0,0,"Mora Village..."
-11199,0,0,0,0,0,0,0,"Theo's Friend"
-// == Sonya
 11192,0,0,0,0,0,0,0,"Mora Village..."
 11193,0,0,0,0,0,0,0,"Sonya's Friend"
-
 11194,0,0,0,0,0,0,0,"Runaway Laphine"
 11195,0,0,0,0,0,0,0,"Pouch"
 11196,0,0,0,0,0,0,0,"Pouch"
 11197,0,0,0,0,0,0,0,"Pouch"
-//
+11198,0,0,0,0,0,0,0,"Mora Village..."
+11199,0,0,0,0,0,0,0,"Theo's Friend"
 11200,0,0,0,0,0,0,0,"Pouch"
 11201,0,0,0,0,0,0,0,"Roast Beef"
 11202,0,0,0,0,0,0,0,"Roast Beef"
 11203,0,0,0,0,0,0,0,"Shortage of Roast Beef"
-
 11206,0,0,0,0,0,0,0,"Quick Delivery Yoneseu"
 11207,0,0,0,0,0,0,0,"A Very Heavy Burden"
 11208,0,0,0,0,0,0,0,"Daphne"
 
-//Malangdo Quests
+// Malangdo
 11209,0,0,0,0,0,0,0,"Hardships of Thomas"
 11210,0,0,0,0,0,0,0,"Malangdo Reunion"
 11211,0,0,0,0,0,0,0,"Malangdo Reunion"
@@ -1790,6 +1966,35 @@
 11308,0,0,0,0,0,0,0,"Nurse at Port Malaya-25"
 11309,0,0,0,0,0,0,0,"Nurse at Port Malaya-26"
 
+11310,0,0,0,0,0,0,0,"Eclage's Entrance"
+11311,0,0,0,0,0,0,0,"Eclage's Entrance"
+11312,0,0,0,0,0,0,0,"Goliath"
+11313,0,0,0,0,0,0,0,"Goliath"
+11314,0,0,0,0,0,0,0,"Goliath"
+11315,0,0,0,0,0,0,0,"And time keeps on flowing"
+11316,0,0,0,0,0,0,0,"And time keeps on flowing"
+11317,0,0,0,0,0,0,0,"And time keeps on flowing"
+11318,0,0,0,0,0,0,0,"And time keeps on flowing"
+11319,0,0,0,0,0,0,0,"And time keeps on flowing"
+11320,0,0,0,0,0,0,0,"And time keeps on flowing"
+11321,0,0,0,0,0,0,0,"And time keeps on flowing"
+11322,0,0,0,0,0,0,0,"And time keeps on flowing"
+11323,0,0,0,0,0,0,0,"And time keeps on flowing"
+11324,0,0,0,0,0,0,0,"And time keeps on flowing"
+11325,0,0,0,0,0,0,0,"The chicken or the egg"
+11326,0,0,0,0,0,0,0,"The chicken or the egg"
+11327,0,0,0,0,0,0,0,"The chicken or the egg"
+11328,0,0,0,0,0,0,0,"The chicken or the egg"
+11329,0,0,0,0,0,0,0,"The chicken or the egg"
+11330,0,0,0,0,0,0,0,"The chicken or the egg"
+11331,0,0,0,0,0,0,0,"The chicken or the egg"
+11332,0,0,0,0,0,0,0,"The chicken or the egg"
+11333,0,0,0,0,0,0,0,"Red seed and green seed"
+11334,0,0,0,0,0,0,0,"Red seed and green seed"
+11335,0,0,0,0,0,0,0,"Dreaming boy"
+11336,0,0,0,0,0,0,0,"Dreaming boy"
+11337,0,0,0,0,0,0,0,"Dreaming boy"
+
 12000,0,0,0,0,0,0,0,"An old friend"
 12001,0,0,0,0,0,0,0,"Digotz, Maku's old friend"
 12002,0,0,0,0,0,0,0,"Messenger of Friendship"
@@ -2020,6 +2225,7 @@
 12240,0,0,0,0,0,0,0,"Sticky Mucus Collecting"
 12241,82800,0,0,0,0,0,0,"Mora Item Request 1"
 12242,82800,0,0,0,0,0,0,"Mora Item Request 2"
+
 // Missing Person Quests
 12243,0,0,0,0,0,0,0,"Missing Information on Tajareu"
 12244,0,0,0,0,0,0,0,"Missing Information on Tokenizer"
@@ -2056,8 +2262,73 @@
 12273,579600,0,0,0,0,0,0,"In progress general culvert weekly service"
 12274,579600,0,0,0,0,0,0,"In progress hard culvert weekly service"
 
-12278,0,0,0,0,0,0,0,"Towards Bakonawa Lake..."
-12279,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+12278,604800,0,0,0,0,0,0,"Towards Bakonawa Lake..."
+12279,0,2322,1,0,0,0,0,"Get Rid of Bakonawa"
+
+12280,0,0,0,0,0,0,0,"A suspicious prisoner"
+12281,0,0,0,0,0,0,0,"An unwanted favor"
+12282,0,0,0,0,0,0,0,"Gossip king Clever"
+12283,0,0,0,0,0,0,0,"The rift researcher"
+12284,0,0,0,0,0,0,0,"A cat merchant's source of information"
+12285,0,0,0,0,0,0,0,"A way to calm down a cat"
+12286,0,0,0,0,0,0,0,"Information traded for some canned foods"
+12287,0,0,0,0,0,0,0,"A weird experience"
+12288,0,0,0,0,0,0,0,"A successful experience"
+12289,0,0,0,0,0,0,0,"Another visitation"
+12290,0,0,0,0,0,0,0,"Clever's historical documents"
+12291,0,0,0,0,0,0,0,"Hidden historical documents (?)"
+12292,0,0,0,0,0,0,0,"The unknown ones"
+12293,0,0,0,0,0,0,0,"Figures in history"
+12294,0,0,0,0,0,0,0,"Tour of Eclage"
+12295,0,0,0,0,0,0,0,"Error"
+12296,0,0,0,0,0,0,0,"Fun times with the reactor"
+12297,0,0,0,0,0,0,0,"Encountering Etran"
+12298,0,0,0,0,0,0,0,"Two wishes"
+12299,0,0,0,0,0,0,0,"Revisiting Robert"
+12300,0,0,0,0,0,0,0,"Revisiting Etran"
+12301,0,0,0,0,0,0,0,"Two remaining friends"
+
+13000,0,0,0,0,0,0,0,"RWC2011Card Gathering"
+13001,82800,0,0,0,0,0,0,"RWC2011Card Gathering - Hold"
+
+13050,0,0,0,0,0,0,0,"The Laphine that loves the land"
+13051,0,0,0,0,0,0,0,"The singing Laphine"
+13052,0,0,0,0,0,0,0,"The watering Laphine"
+13053,0,0,0,0,0,0,0,"The dancing Laphine"
+13054,0,0,0,0,0,0,0,"The smiling Laphine"
+13055,0,0,0,0,0,0,0,"See if all the adventurers are safe"
+13056,0,0,0,0,0,0,0,"Reporter Rossi"
+13057,0,0,0,0,0,0,0,"Adventurer Euncheong"
+13058,0,0,0,0,0,0,0,"Troublemaker New Oz"
+13059,86400,0,0,0,0,0,0,"End of project"
+13060,86400,0,0,0,0,0,0,"Safety confirmation complete!"
+13061,0,0,0,0,0,0,0,"Food support"
+13062,86400,0,0,0,0,0,0,"Food support - complete"
+13063,0,0,0,0,0,0,0,"Dusting off"
+13064,86400,0,0,0,0,0,0,"Dusting off - complete"
+13065,0,0,0,0,0,0,0,"Collecting a souvenir"
+13066,86400,0,0,0,0,0,0,"This is enough for souvenirs"
+
+14118,0,0,0,0,0,0,0,"Wuhari's concern"
+14119,0,0,0,0,0,0,0,"Test of patience"
+14120,0,0,0,0,0,0,0,"Test of patience 2"
+14121,0,0,0,0,0,0,0,"Test of patience 3"
+14122,0,0,0,0,0,0,0,"Time for two"
+14123,0,0,0,0,0,0,0,"Wuharu's favor"
+14125,0,0,0,0,0,0,0,"Surveying the area"
+14126,0,0,0,0,0,0,0,"Searching for Ms. Goatie"
+14127,0,0,0,0,0,0,0,"Searching for Ms. Goatie's husband"
+14128,0,0,0,0,0,0,0,"Obtaining the research report"
+14131,0,0,0,0,0,0,0,"Analysis time"
+14133,0,0,0,0,0,0,0,"Another favor"
+14134,0,0,0,0,0,0,0,"Sharp Ms. Goatie"
+14135,0,0,0,0,0,0,0,"Searching for Mr. Pompe"
+14136,0,0,0,0,0,0,0,"A terrible scene in the field"
+14137,0,0,0,0,0,0,0,"An interesting proposition"
+14138,0,0,0,0,0,0,0,"The big corpse"
+14139,0,0,0,0,0,0,0,"To Wuhuru"
+14140,0,0,0,0,0,0,0,"To Wuhari"
+14141,0,0,0,0,0,0,0,"Ingredients for research"
 
 16000,0,0,0,0,0,0,0,"Metz Brayde's Notice"
 16001,0,0,0,0,0,0,0,"First examination"
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 98dd24ea6..e42443d73 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -8051,3 +8051,4 @@
 21003,Muramasa_,Muramasa ,4,20,,1000,155,,1,2,0x00004082,7,2,34,4,48,1,3,{},{},{}
 21004,Alca_Bringer_,Alca Bringer ,4,20,,3400,280,,2,2,125,7,2,34,3,100,1,3,{},{},{}
 21005,Metal_Two_Hand_Sword,Metal Two Hand Sword,4,20,,0,95,,1,1,0x00004082,7,2,34,3,1,1,3,{},{},{}
+22540,Runstone_Luxanima,Lux Anima Rune,11,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "RK_LUXANIMA",1; },{},{}
\ No newline at end of file
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index e392ae2b6..a58b88e91 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -19,7 +19,7 @@
 */
 
 Old_Card_Album: (
-	("Poring_Card",8),
+	("Poring_Card",9),
 	("Fabre_Card",10),
 	("Pupa_Card",6),
 	("Drops_Card",11),
@@ -140,7 +140,6 @@ Old_Card_Album: (
 	"Baphomet__Card",
 	"Daydric_Card",
 	"Khalitzburg_Card",
-	"Joker_Card",
 	"Evil_Druid_Card",
 	"Gargoyle_Card",
 	"Goat_Card",
@@ -191,6 +190,7 @@ Old_Card_Album: (
 	"Mystcase_Card",
 	"Miyabi_Ningyo_Card",
 	"Violy_Card",
+	"Wander_Man_Card",
 	"Bon_Gun_Card",
 	"Brilight_Card",
 	"Bloody_Murderer_Card",
@@ -293,6 +293,7 @@ Old_Card_Album: (
 	"Hyegun_Card",
 	"Phendark_Card",
 	"Heater_Card",
+	"Antonio_Card",
 	"Agav_Card",
 	"Echio_Card",
 	"Vanberk_Card",
@@ -324,12 +325,6 @@ Old_Card_Album: (
 	"Necromancer_Card"
 )
 Gift_Box: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -387,24 +382,20 @@ Gift_Box: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_1: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -462,24 +453,20 @@ Gift_Box_1: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_2: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -537,24 +524,20 @@ Gift_Box_2: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_3: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -612,24 +595,20 @@ Gift_Box_3: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
 )
 Gift_Box_4: (
-	("Oridecon_Stone",4),
-	("Elunium_Stone",2),
-	("Oridecon",2),
-	"Elunium",
-	"Emperium",
-	"Steel",
 	"Star_Crumb",
 	"Flame_Heart",
 	"Mistic_Frozen",
@@ -687,13 +666,15 @@ Gift_Box_4: (
 	"Red_Potion",
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	"Pet_Food",
 	"Well_Baked_Cookie",
 	"Piece_Of_Cake",
-	"Old_Blue_Box",
 	"Old_Violet_Box",
 	("Gift_Box",19),
 	"Girl's_Diary"
@@ -742,7 +723,6 @@ Old_Blue_Box: (
 	("Thief_Clothes",3),
 	("Thief_Clothes_",3),
 	("Ninja_Suit",3),
-	("Wedding_Dress",3),
 	("G_Strings",3),
 	("Novice_Breast",3),
 	("Full_Plate_Armor",3),
@@ -999,6 +979,7 @@ Old_Blue_Box: (
 	("Snowy_Horn",3),
 	("Mini_Propeller",3),
 	("Mini_Glasses",3),
+	("Prontera_Army_Cap",3),
 	("Pierrot_Nose",3),
 	("Gangster_Patch",3),
 	("Ganster_Mask",3),
@@ -1024,7 +1005,6 @@ Old_Blue_Box: (
 	("Viking_Helm",3),
 	("Joker_Jester",3),
 	("Machoman_Glasses",3),
-	("Puppy_Love",3),
 	("Safety_Helmet",3),
 	("Indian_Hair_Piece",3),
 	("Antenna",3),
@@ -1074,7 +1054,7 @@ Old_Blue_Box: (
 	("Illusion_Flower",12),
 	("Shoot",12),
 	("Flower",12),
-	("Emperium",12),
+	("Empty_Bottle",12),
 	("Yellow_Gemstone",12),
 	("Red_Gemstone",12),
 	("Blue_Gemstone",12),
@@ -1115,8 +1095,6 @@ Old_Blue_Box: (
 	("Grasshopper_Doll",12),
 	("Monkey_Doll",12),
 	("Raccoondog_Doll",12),
-	("Oridecon_Stone",12),
-	("Elunium_Stone",12),
 	("Danggie",12),
 	("Tree_Root",12),
 	("Reptile_Tongue",12),
@@ -1184,7 +1162,6 @@ Old_Blue_Box: (
 	("Turtle_Shell",12),
 	("Voucher_Of_Orcish_Hero",12),
 	("Gold",12),
-	("Alchol",12),
 	("Detrimindexta",12),
 	("Karvodailnirol",12),
 	("Counteragent",12),
@@ -1197,8 +1174,6 @@ Old_Blue_Box: (
 	("Violet_Dyestuffs",12),
 	("White_Dyestuffs",12),
 	("Black_Dyestuffs",12),
-	("Oridecon",12),
-	("Elunium",12),
 	("Anvil",12),
 	("Oridecon_Anvil",12),
 	("Golden_Anvil",12),
@@ -1243,7 +1218,6 @@ Old_Blue_Box: (
 	("Porcupine_Spike",12),
 	("Wild_Boar's_Mane",12),
 	("Tiger's_Skin",12),
-	("Tiger_Footskin",12),
 	("Limb_Of_Mantis",12),
 	("Blossom_Of_Maneater",12),
 	("Root_Of_Maneater",12),
@@ -1393,7 +1367,6 @@ Old_Blue_Box: (
 	("Mystery_Iron_Bit",12),
 	("Great_Wing",12),
 	("Taegeuk_Plate",12),
-	("Tuxedo",12),
 	("Leopard_Skin",12),
 	("Leopard_Talon",12),
 	("Packing_Ribbon",12),
@@ -1468,7 +1441,9 @@ Old_Blue_Box: (
 	("Red_Potion",12),
 	("Orange_Potion",12),
 	("Yellow_Potion",12),
-	("Green_Potion",11),
+	("White_Potion",12),
+	("Blue_Potion",12),
+	("Green_Potion",12),
 	("Red_Herb",12),
 	("Yellow_Herb",12),
 	("White_Herb",12),
@@ -1487,6 +1462,7 @@ Old_Blue_Box: (
 	("Fruit_Of_Mastela",12),
 	("Holy_Water",12),
 	("Panacea",12),
+	("Royal_Jelly",12),
 	("Monster's_Feed",12),
 	("Candy",12),
 	("Candy_Striper",12),
@@ -1511,8 +1487,9 @@ Old_Blue_Box: (
 	("Rice_Cake",12),
 	("Chocolate",12),
 	("White_Chocolate",12),
-	"Wing_Of_Butterfly",
-	("Old_Blue_Box",1173),
+	("Wing_Of_Fly",12),
+	("Wing_Of_Butterfly",12),
+	("Branch_Of_Dead_Tree",512),
 	("Anodyne",12),
 	("Aloebera",12),
 	("Yggdrasilberry",12),
@@ -1568,6 +1545,7 @@ Old_Blue_Box: (
 	"Angelic_Chain",
 	"Satanic_Chain",
 	"Sharp_Gear",
+	"Ghost_Bandana",
 	"Ring_",
 	"Earring_",
 	"Necklace_",
@@ -1674,14 +1652,14 @@ Old_Blue_Box: (
 	"Pot",
 	"Burnt_Parts",
 	"Pocket_Watch",
-	("Ice_Heart",21),
-	("Ice_Scale",22),
-	("Bloody_Rune",22),
-	("Rotten_Meat",22),
-	("Sticky_Poison",22),
+	("Ice_Heart",15),
+	("Ice_Scale",15),
+	("Bloody_Rune",15),
+	("Rotten_Meat",15),
+	("Sticky_Poison",15),
 	"Suspicious_Hat",
 	"White_Mask",
-	("Old_White_Cloth",33),
+	("Old_White_Cloth",34),
 	("Clattering_Skull",32),
 	("Broken_Farming_Utensil",34),
 	"Orleans_Server",
@@ -1750,7 +1728,6 @@ Old_Violet_Box: (
 	("Silver_Robe_",7),
 	("Thief_Clothes_",7),
 	("Ninja_Suit",7),
-	("Wedding_Dress",7),
 	("G_Strings",7),
 	("Novice_Breast",7),
 	("Novice_Plate",7),
@@ -1926,6 +1903,7 @@ Old_Violet_Box: (
 	("Snowy_Horn",7),
 	("Mini_Propeller",7),
 	("Mini_Glasses",7),
+	("Prontera_Army_Cap",7),
 	("Pierrot_Nose",7),
 	("Gangster_Patch",7),
 	("Ganster_Mask",7),
@@ -1951,7 +1929,6 @@ Old_Violet_Box: (
 	("Viking_Helm",7),
 	("Joker_Jester",7),
 	("Machoman_Glasses",7),
-	("Puppy_Love",7),
 	("Safety_Helmet",7),
 	("Indian_Hair_Piece",7),
 	("Antenna",7),
@@ -2001,7 +1978,7 @@ Old_Violet_Box: (
 	("Illusion_Flower",14),
 	("Shoot",14),
 	("Flower",14),
-	("Emperium",14),
+	("Empty_Bottle",14),
 	("Yellow_Gemstone",14),
 	("Red_Gemstone",14),
 	("Blue_Gemstone",14),
@@ -2042,8 +2019,6 @@ Old_Violet_Box: (
 	("Grasshopper_Doll",14),
 	("Monkey_Doll",14),
 	("Raccoondog_Doll",14),
-	("Oridecon_Stone",14),
-	("Elunium_Stone",14),
 	("Danggie",14),
 	("Tree_Root",14),
 	("Reptile_Tongue",14),
@@ -2111,7 +2086,6 @@ Old_Violet_Box: (
 	("Turtle_Shell",14),
 	("Voucher_Of_Orcish_Hero",14),
 	("Gold",14),
-	("Alchol",14),
 	("Detrimindexta",14),
 	("Karvodailnirol",14),
 	("Counteragent",14),
@@ -2124,9 +2098,7 @@ Old_Violet_Box: (
 	("Violet_Dyestuffs",14),
 	("White_Dyestuffs",14),
 	("Black_Dyestuffs",14),
-	("Oridecon",14),
-	("Elunium",14),
-	("Anvil",14),
+	("Anvil",13),
 	("Oridecon_Anvil",14),
 	("Golden_Anvil",14),
 	("Emperium_Anvil",14),
@@ -2170,7 +2142,6 @@ Old_Violet_Box: (
 	("Porcupine_Spike",14),
 	("Wild_Boar's_Mane",14),
 	("Tiger's_Skin",14),
-	("Tiger_Footskin",14),
 	("Limb_Of_Mantis",14),
 	("Blossom_Of_Maneater",14),
 	("Root_Of_Maneater",14),
@@ -2320,7 +2291,6 @@ Old_Violet_Box: (
 	("Mystery_Iron_Bit",14),
 	("Great_Wing",14),
 	("Taegeuk_Plate",14),
-	("Tuxedo",14),
 	("Leopard_Skin",14),
 	("Leopard_Talon",14),
 	("Packing_Ribbon",14),
@@ -2395,6 +2365,8 @@ Old_Violet_Box: (
 	("Red_Potion",14),
 	("Orange_Potion",14),
 	("Yellow_Potion",14),
+	("White_Potion",14),
+	("Blue_Potion",14),
 	("Green_Potion",14),
 	("Red_Herb",14),
 	("Yellow_Herb",14),
@@ -2414,6 +2386,7 @@ Old_Violet_Box: (
 	("Fruit_Of_Mastela",14),
 	("Holy_Water",14),
 	("Panacea",14),
+	("Royal_Jelly",14),
 	("Monster's_Feed",14),
 	("Candy",14),
 	("Candy_Striper",14),
@@ -2438,7 +2411,9 @@ Old_Violet_Box: (
 	("Rice_Cake",14),
 	("Chocolate",14),
 	("White_Chocolate",14),
-	("Old_Blue_Box",614),
+	("Wing_Of_Fly",14),
+	("Wing_Of_Butterfly",14),
+	("Branch_Of_Dead_Tree",214),
 	("Anodyne",14),
 	("Aloebera",14),
 	("Yggdrasilberry",14),
@@ -2490,12 +2465,11 @@ Old_Violet_Box: (
 	("Poison_Bottle",14),
 	("Gold_Pill",14),
 	("Guard_",6),
-	"Tiara",
-	"Crown",
 	"Coronet",
 	"Angelic_Chain",
 	"Satanic_Chain",
 	"Sharp_Gear",
+	"Ghost_Bandana",
 	"Elven_Ears",
 	"Holy_Robe",
 	"Mage_Coat",
@@ -2512,8 +2486,6 @@ Old_Violet_Box: (
 	"Pair_Of_Red_Ribbon",
 	"Loard_Circlet",
 	"Bone_Helm",
-	"Corsair",
-	"Assassin_Mask",
 	"Horn_Of_Succubus",
 	"Inccubus_Horn",
 	"Spinx_Helm",
@@ -2619,7 +2591,7 @@ Old_Violet_Box: (
 	"Suspicious_Hat",
 	"White_Mask",
 	("Old_Violet_Box",103),
-	("Old_White_Cloth",16),
+	("Old_White_Cloth",17),
 	("Clattering_Skull",16),
 	("Broken_Farming_Utensil",17),
 	"Inverse_Scale",
@@ -2747,13 +2719,13 @@ Accessory_Box: (
 	"Rosary_",
 	"Brooch_",
 	"Earring_",
+	("Vesper_Core01",2),
 	("Vesper_Core02",2),
 	("Vesper_Core03",2),
 	("Vesper_Core04",2),
 	"Thimble_Of_Archer_",
 	("Red_Silk_Seal",2),
 	"Orleans_Glove",
-	"Vesper_Core01",
 	"Spiritual_Ring",
 	"Shinobi's_Sash",
 	"Hyper_Changer",
@@ -2776,7 +2748,8 @@ Wrapped_Mask: (
 	("Goblin_Mask_03",10),
 	("Goblin_Mask_04",10),
 	("Mr_Smile",9),
-	"Zherlthsh_Mask"
+	"Zherlthsh_Mask",
+	("Hahoe_Mask",2)
 )
 Bundle_Of_Magic_Scroll: (
 	"Earth_Scroll_1_5",
@@ -2836,6 +2809,7 @@ Food_Package: (
 	"Leaflet_Of_Hinal",
 	"Leaflet_Of_Aloe",
 	"Fruit_Of_Mastela",
+	"Royal_Jelly",
 	"Milk",
 	"Lemon",
 	"Long_Rice_Cake",
@@ -2846,6 +2820,8 @@ First_Aid_Kit: (
 	("Orange_Potion",5),
 	("Yellow_Potion",5),
 	("Slow_Down_Potion",5),
+	("White_Potion",5),
+	("Blue_Potion",5),
 	("Green_Potion",5),
 	("Red_Slim_Potion",5),
 	("Yellow_Slim_Potion",5),
@@ -2876,14 +2852,19 @@ Cookie_Bag: (
 	"Chocolate_Drink",
 	("Candy",4)
 )
+Red_Box_: (
+	("Magic_Eyes",9),
+	("Hibiscus",10),
+	("Charming_Ribbon",10)
+)
 Egg_Boy: (
 	("Grape",299),
 	("Rice_Ball",522),
 	("Prohibition_Red_Candle",20),
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
-	("Crown",2),
-	"Inccubus_Horn"
+	("Ghost_Bandana",5),
+	("Inccubus_Horn",2)
 )
 Egg_Girl: (
 	("Grape",299),
@@ -2891,18 +2872,20 @@ Egg_Girl: (
 	("Sway_Apron",20),
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
-	("Tiara",2),
 	("Hair_Protector",5),
-	"Horn_Of_Succubus"
+	("Horn_Of_Succubus",2)
 )
 Giftbox_China: (
 	"Orange_Potion",
 	"Yellow_Potion",
+	"White_Potion",
+	"Blue_Potion",
 	"Green_Potion",
 	"Honey",
 	"Leaflet_Of_Hinal",
 	("Leaflet_Of_Aloe",2),
 	"Panacea",
+	"Royal_Jelly",
 	"Candy",
 	"Candy_Striper",
 	("Old_Blue_Box",40),
@@ -2924,7 +2907,6 @@ Giftbox_China: (
 	"Singing_Plant",
 	"Ment",
 	"Illusion_Flower",
-	"Emperium",
 	"Yellow_Gemstone",
 	"Red_Gemstone",
 	"Blue_Gemstone",
@@ -2960,8 +2942,6 @@ Giftbox_China: (
 	"Grasshopper_Doll",
 	"Monkey_Doll",
 	"Raccoondog_Doll",
-	"Oridecon_Stone",
-	"Elunium_Stone",
 	"Jellopy",
 	"Garlet",
 	"Scell",
@@ -2970,7 +2950,6 @@ Giftbox_China: (
 	"Mementos",
 	"Voucher_Of_Orcish_Hero",
 	"Gold",
-	"Alchol",
 	"Detrimindexta",
 	"Karvodailnirol",
 	"Counteragent",
@@ -2983,8 +2962,6 @@ Giftbox_China: (
 	"Violet_Dyestuffs",
 	"White_Dyestuffs",
 	"Black_Dyestuffs",
-	"Oridecon",
-	"Elunium",
 	"Anvil",
 	"Oridecon_Anvil",
 	"Golden_Anvil",
@@ -3135,7 +3112,6 @@ Giftbox_China: (
 	"Silver_Robe_",
 	"Thief_Clothes_",
 	"Ninja_Suit",
-	"Wedding_Dress",
 	"G_Strings",
 	"Sandals_",
 	"Shoes_",
@@ -3159,48 +3135,51 @@ Giftbox_China: (
 	"Silver_Ring",
 	"Flower_Ring",
 	"Diamond_Ring",
-	"Puppy_Love",
 	"Safety_Helmet",
 	"Indian_Hair_Piece",
 	"Fin_Helm",
-	"Egg_Shell"
+	("Egg_Shell",2)
 )
-Old_Bleu_Box: (
-	("Cold_Scroll_1_5",2),
-	("Fire_Scroll_1_5",2),
-	("Wind_Scroll_1_5",2),
-	("Fire_Scroll_2_5",2),
-	("Fire_Scroll_3_5",2),
-	("Holy_Scroll_1_5",2),
-	("Cold_Scroll_2_5",2),
-	("Gift_Box",2),
-	("Milk",2),
-	("Well_Baked_Cookie",2)
+Red_Box: (
+	("Twin_Ribbon",9),
+	("Helm_Of_Darkness",11),
+	"Puppy_Hat",
+	("Geographer_Band",11),
+	("Laurel_Wreath",11),
+	("Bird_Nest_Hat",11),
+	("Alice_Doll",11),
+	("Hibiscus",11),
+	("Magic_Eyes",11),
+	("Charming_Ribbon",11),
+	"Chinese_Crown",
+	("Crescent_Helm",11),
+	("Kabuki_Mask",12),
+	"Cat_Hat"
 )
-Holy_Egg_2: (
-	("Oridecon",3),
-	("Elunium",10),
-	("White_Slim_Potion",30),
-	("Blue_Potion",30),
-	("Yggdrasilberry",3),
-	("Seed_Of_Yggdrasil",2),
-	("Leaf_Of_Yggdrasil",15),
-	("Old_Card_Album",5),
-	"Drooping_Bunny"
+Green_Box: (
+	("Str_Dish10",99),
+	("Int_Dish10",100),
+	("Vit_Dish10",100),
+	("Agi_Dish10",100),
+	("Dex_Dish10",100),
+	("Luk_Dish10",100),
+	("Yggdrasilberry",99),
+	("Seed_Of_Yggdrasil",100),
+	("Fire_Cracker",100),
+	("Chocolate_Drink",100),
+	"Puppy_Hat"
 )
-Red_Box_: (
-	("Magic_Eyes",9),
-	("Hibiscus",10),
-	("Charming_Ribbon",10)
-)
-Hometown_Gift: (
-	"Hearty_Rice_Cake",
-	"Salty_Rice_Cake",
-	"Lucky_Rice_Cake",
-	"Sesame_Pastry",
-	"Honey_Pastry",
-	"Rainbow_Cake",
-	"Korea_Rice_Cake"
+Old_Bleu_Box: (
+	"Cold_Scroll_1_5",
+	"Fire_Scroll_1_5",
+	"Wind_Scroll_1_5",
+	"Fire_Scroll_2_5",
+	"Fire_Scroll_3_5",
+	"Holy_Scroll_1_5",
+	"Cold_Scroll_2_5",
+	"Gift_Box",
+	"Milk",
+	"Well_Baked_Cookie"
 )
 Old_Yellow_Box: (
 	"Cookie_Hat",
@@ -3213,6 +3192,8 @@ Old_Gift_Box: (
 	("Fallen_Leaves_",45)
 )
 Magic_Card_Album: (
+	"Angeling_Card",
+	"Gryphon_Card",
 	"Dark_Illusion_Card",
 	"Deviling_Card",
 	("Dragon_Fly_Card",10),
@@ -3248,30 +3229,21 @@ Masquerade_Ball_Box: (
 	("Marvelous_Wig_",10),
 	("Ati_Atihan_Hat_",10)
 )
-Louise_Costume_Box: (
-	("Red_Bag",16),
-	("Cool_Summer_Outfit",2)
-)
-Xmas_Gift: (
-	("Fire_Cracker_Love",6),
-	("Gift_Box",66),
-	("Old_Bleu_Box",36),
-	("Set_Of_Taiming_Item",6),
-	("Wrapped_Mask",6),
-	("Old_Blue_Box",24),
-	("Bundle_Of_Magic_Scroll",12),
-	("Buche_De_Noel",24),
-	("Speed_Up_Potion",12),
-	("Slow_Down_Potion",12),
-	("Cookie_Bag",12),
-	("Red_Bag",6),
-	("First_Aid_Kit",12),
-	("Crystal_Jewel__",12),
-	("HandMade_Chocolate",18),
-	("HandMade_Chocolate_",18),
-	("Chocolate_Drink",18),
-	("Santa's_Hat_",12),
-	("Fire_Cracker_Xmas",4)
+Easter_Scroll: (
+	("Silver_Knife_Of_Chaste",109),
+	("Heart_Of_Her",110),
+	("No_Recipient",110),
+	("Old_Broom",110),
+	("Armlet_Of_Obedience",110),
+	("Shining_Stone",110),
+	("Contracts_In_Shadow",110),
+	("Book_Of_Devil",110),
+	("Pet_Incubator",205),
+	"Munak_Turban",
+	"Bongun_Hat",
+	"Munak_Turban_",
+	"Bongun_Hat_",
+	"Ghost_Bandana"
 )
 Tresure_Box_WoE: (
 	("Wind_Arrow_Container",23),
@@ -3301,6 +3273,31 @@ Masquerade_Ball_Box2: (
 	("Cap_Of_Blindness",10),
 	"Dress_Hat"
 )
+Louise_Costume_Box: (
+	("Red_Bag",16),
+	("Cool_Summer_Outfit",2)
+)
+Xmas_Gift: (
+	("Fire_Cracker_Love",6),
+	("Gift_Box",66),
+	("Old_Bleu_Box",36),
+	("Set_Of_Taiming_Item",6),
+	("Wrapped_Mask",6),
+	("Old_Blue_Box",24),
+	("Bundle_Of_Magic_Scroll",12),
+	("Buche_De_Noel",24),
+	("Speed_Up_Potion",12),
+	("Slow_Down_Potion",12),
+	("Cookie_Bag",12),
+	("Red_Bag",6),
+	("First_Aid_Kit",12),
+	("Crystal_Jewel__",12),
+	("HandMade_Chocolate",18),
+	("HandMade_Chocolate_",18),
+	("Chocolate_Drink",18),
+	("Santa's_Hat_",12),
+	("Fire_Cracker_Xmas",4)
+)
 Pierre_Treasurebox: (
 	("Scarlet_Dyestuffs",3),
 	("Lemon_Dyestuffs",3),
@@ -3342,6 +3339,465 @@ Cherish_Box_Ori: (
 	("Ragnarok_Limited_Ed",3)
 )
 Splendid_Box: (
+	("Imperial_Guard",2),
+	("Bone_Plate",2),
+	("Ebone_Armor",2),
+	("Krasnaya",2),
+	("Alca_Bringer",2),
+	("Chrome_Twohand_Sword",2),
+	("Krishna",2),
+	("Cakram",2),
+	("Durga",2),
+	("Vecer_Axe",2),
+	("Giant_Axe",2),
+	("Imperial_Spear",2),
+	("Rafini_Staff",2),
+	("Falken_Blitz",2),
+	("Elven_Bow",2),
+	("Green_Whistle",2),
+	("Stem_Whip",2),
+	("Krieg",2),
+	("Weihna",2),
+	("Black_Wing",2),
+	("Ruber",2),
+	("Erde",2),
+	("Red_Square_Bag",2),
+	("Carga_Mace",2),
+	("Red_Ether_Bag",2),
+	("Mystic_Bow",2)
+)
+Old_C_Album_Armor: (
+	("Pupa_Card",2),
+	("Picky_Card",2),
+	("Picky__Card",2),
+	("Roda_Frog_Card",2),
+	("Thief_Bug_Card",2),
+	("Rocker_Card",2),
+	("Desert_Wolf_Babe_Card",2),
+	("Pecopeco_Card",2),
+	("Steel_Chonchon_Card",2),
+	("Cornutus_Card",2),
+	("Savage_Card",2),
+	("Sword_Fish_Card",2),
+	("Dokebi_Card",2),
+	("Pasana_Card",2),
+	("Sand_Man_Card",2),
+	("Marc_Card",2),
+	("Argiope_Card",2),
+	("Bathory_Card",2),
+	("Evil_Druid_Card",2),
+	("Goat_Card",2),
+	("Flying_Deleter_Card",2),
+	("Grizzly_Card",2),
+	("Nightmare_Terror_Card",2),
+	("Dark_Frame_Card",2),
+	("Demon_Pungus_Card",2),
+	("Disguise_Card",2),
+	("Wraith_Dead_Card",2),
+	("Loli_Ruri_Card",2),
+	("Rybio_Card",2),
+	("Majoruros_Card",2),
+	("Brilight_Card",2),
+	("Sasquatch_Card",2),
+	("Succubus_Card",2),
+	("Solider_Card",2),
+	("Skel_Prisoner_Card",2),
+	("Baby_Leopard_Card",2),
+	("Anolian_Card",2),
+	("Apocalips_Card",2),
+	("Antonio_Card",2),
+	("Wooden_Golem_Card",2),
+	("Giant_Spider_Card",2),
+	("Deleter_Card",2),
+	("Geographer_Card",2),
+	("Karakasa_Card",2),
+	("Kraben_Card",2),
+	("Cremy_Fear_Card",2),
+	("Clock_Card",2),
+	("Chimera_Card",2),
+	("Killer_Mantis_Card",2),
+	("Pest_Card",2),
+	("Waste_Stove_Card",2),
+	("Venomous_Card",2),
+	("Porcellio_Card",2),
+	("Obsidian_Card",2),
+	("Mineral_Card",2),
+	("Ygnizem_Card",2),
+	("Removal_Card",2),
+	("Venatu_Card",2),
+	("Dimik_Card",2),
+	("Archdam_Card",2),
+	("Novus__Card",2),
+	("Novus_Card",2),
+	("Ancient_Mimic_Card",2),
+	("Observation_Card",2),
+	("Shelter_Card",2),
+	("Aliza_Card",2),
+	("Alicel_Card",2),
+	("Skogul_Card",2),
+	("Frus_Card",2),
+	("Agav_Card",2),
+	("Echio_Card",2),
+	("Byorgue_Card",2),
+	("Banshee_Master_Card",2),
+	"Hardrock_Mammoth_Card"
+)
+Old_C_Album_Helm: (
+	("Stainer_Card",2),
+	("Coco_Card",2),
+	("Martin_Card",2),
+	("Elder_Wilow_Card",2),
+	("Giearth_Card",2),
+	("Ghoul_Card",2),
+	("Marduk_Card",2),
+	("Deviruchi_Card",2),
+	("Nightmare_Card",2),
+	("Grand_Peco_Card",2),
+	("Dark_Illusion_Card",2),
+	("Dryad_Card",2),
+	("Rideword_Card",2),
+	("Leib_Olmai_Card",2),
+	("Leaf_Cat_Card",2),
+	("Mystcase_Card",2),
+	("Stalactic_Golem_Card",2),
+	("C_Tower_Manager_Card",2),
+	("Archangeling_Card",2),
+	("Wicked_Nymph_Card",2),
+	("Wootan_Shooter_Card",2),
+	("Wootan_Fighter_Card",2),
+	("Incubus_Card",2),
+	("Giant_Honet_Card",2),
+	("Gibbet_Card",2),
+	("Carat_Card",2),
+	("Cramp_Card",2),
+	("Permeter_Card",2),
+	("Ungoliant_Card",2),
+	("Mole_Card",2),
+	("Gemini_Card",2),
+	("Seyren_Card",2),
+	("Magaleta_Card",2),
+	("Katrinn_Card",2),
+	("Acidus__Card",2),
+	("Vanberk_Card",2),
+	("Isilla_Card",2),
+	("Knocker_Card",2),
+	("Banshee_Card",2),
+	"Duneyrr_Card",
+	"Rata_Card",
+	"Rhyncho_Card",
+	"Phylla_Card",
+	"Dark_Pinguicula_Card"
+)
+Old_C_Album_Acc: (
+	("Kukre_Card",2),
+	("Tarou_Card",2),
+	("Poporing_Card",2),
+	("Worm_Tail_Card",2),
+	("Muka_Card",2),
+	("Creamy_Card",2),
+	("Smokie_Card",2),
+	("Poison_Spore_Card",2),
+	("Yoyo_Card",2),
+	("Vitata_Card",2),
+	("Zerom_Card",2),
+	("Pirate_Skel_Card",2),
+	("Phen_Card",2),
+	("Mantis_Card",2),
+	("Marine_Sphere_Card",2),
+	("Kobold_Card",2),
+	("Obeaune_Card",2),
+	("Horong_Card",2),
+	("Joker_Card",2),
+	("Gargoyle_Card",2),
+	("Galapago_Card",2),
+	("Rice_Cake_Boy_Card",2),
+	("Poison_Toad_Card",2),
+	("Raydric_Archer_Card",2),
+	("Wraith_Card",2),
+	("Lude_Card",2),
+	("Marin_Card",2),
+	("Mimic_Card",2),
+	("Violy_Card",2),
+	("Bon_Gun_Card",2),
+	("Blazzer_Card",2),
+	("Sageworm_Card",2),
+	("Stem_Worm_Card",2),
+	("Spring_Rabbit_Card",2),
+	("Sleeper_Card",2),
+	("Shinobi_Card",2),
+	("Wild_Ginseng_Card",2),
+	("Owl_Duke_Card",2),
+	("Owl_Baron_Card",2),
+	("Alligator_Card",2),
+	("Orc_Archer_Card",2),
+	("Evil_Cloud_Hermit_Card",2),
+	("Wind_Ghost_Card",2),
+	("Li_Me_Mang_Ryang_Card",2),
+	("Dancing_Dragon_Card",2),
+	("Tengu_Card",2),
+	("Greatest_General_Card",2),
+	("Cookie_Card",2),
+	("Quve_Card",2),
+	("Hylozoist_Card",2),
+	("See_Otter_Card",2),
+	("Blood_Butterfly_Card",2),
+	("Heater_Card",2),
+	("Anopheles_Card",2),
+	("Armaia_Card",2),
+	("Whikebain_Card",2),
+	("Erend_Card",2),
+	("Gremlin_Card",2),
+	("Beholder_Card",2),
+	("Green_Iguana_Card",2),
+	("Hydro_Card",2),
+	("Dragon_Egg_Card",2),
+	("Plasma_Card",2),
+	("Retribution_Card",2),
+	("Snowier_Card",2),
+	("Siroma_Card",2),
+	("Gazeti_Card",2),
+	("Galion_Card",2),
+	("Stapo_Card",2),
+	("Imp_Card",2),
+	("Ragged_Zombie_Card",2),
+	("Hell_Poodle_Card",2)
+)
+Old_C_Album_Shoes: (
+	("Zombie_Card",2),
+	("Thief_Bug_Male_Card",2),
+	("Eggyra_Card",2),
+	("Matyr_Card",2),
+	("Sohee_Card",2),
+	("Verit_Card",2),
+	("Gajomart_Card",2),
+	("Antique_Firelock_Card",2),
+	("Gullinbursti_Card",2),
+	("Raggler_Card",2),
+	("Merman_Card",2),
+	("Megalith_Card",2),
+	("Mini_Demon_Card",2),
+	("Miyabi_Ningyo_Card",2),
+	("Skeleton_General_Card",2),
+	("Cookie_XMAS_Card",2),
+	("Iron_Fist_Card",2),
+	("Alarm_Card",2),
+	("Am_Mut_Card",2),
+	("Ancient_Worm_Card",2),
+	("Wild_Rose_Card",2),
+	("Explosion_Card",2),
+	("Zombie_Prisoner_Card",2),
+	("Cat_O_Nine_Tail_Card",2),
+	("Freezer_Card",2),
+	("Acidus_Card",2),
+	("Ferus__Card",2),
+	("Tha_Odium_Card",2),
+	("Ice_Titan_Card",2),
+	("Zombie_Slaughter_Card",2),
+	"Heavy_Metaling_Card"
+)
+Old_C_Album_Shield: (
+	("Andre_Egg_Card",2),
+	("Ambernite_Card",2),
+	("Horn_Card",2),
+	("Thara_Frog_Card",2),
+	("Orc_Warrior_Card",2),
+	("Megalodon_Card",2),
+	("BigFoot_Card",2),
+	("Argos_Card",2),
+	("Rafflesia_Card",2),
+	("Munak_Card",2),
+	("Petit__Card",2),
+	("Medusa_Card",2),
+	("Khalitzburg_Card",2),
+	("Anubis_Card",2),
+	("Mysteltainn_Card",2),
+	("Live_Peach_Tree_Card",2),
+	("Sting_Card",2),
+	("Increase_Soil_Card",2),
+	("Arclouse_Card",2),
+	("Ancient_Mummy_Card",2),
+	("Executioner_Card",2),
+	("Alice_Card",2),
+	("Tirfing_Card",2),
+	("Zherlthsh_Card",2),
+	("Tamruan_Card",2),
+	("Parasite_Card",2),
+	("Penomena_Card",2),
+	("High_Orc_Card",2),
+	("Teddy_Bear_Card",2),
+	("Tha_Despero_Card",2),
+	("Hodremlin_Card",2),
+	("Seeker_Card",2),
+	("Muscipular_Card",2),
+	("Flame_Skull_Card",2),
+	("Tatacho_Card",2),
+	("Aqua_Elemental_Card",2),
+	("Draco_Card",2),
+	("Luciola_Vespa_Card",2),
+	("Centipede_Card",2),
+	("Cornus_Card",2),
+	("Dark_Shadow_Card",2)
+)
+Old_C_Album_Garment: (
+	("Dustiness_Card",2),
+	("Orc_Zombie_Card",2),
+	("Hode_Card",2),
+	("Frilldora_Card",2),
+	("Marse_Card",2),
+	("Whisper_Card",2),
+	("Myst_Card",2),
+	("Jakk_Card",2),
+	("Marionette_Card",2),
+	("Isis_Card",2),
+	("Baphomet__Card",2),
+	("Daydric_Card",2),
+	("Nine_Tail_Card",2),
+	("Deviling_Card",2),
+	("Dragon_Tail_Card",2),
+	("Dragon_Fly_Card",2),
+	("Vagabond_Wolf_Card",2),
+	("Mastering_Card",2),
+	("Wander_Man_Card",2),
+	("Vocal_Card",2),
+	("Eclipse_Card",2),
+	("Choco_Card",2),
+	("Kapha_Card",2),
+	("Whisper_Boss_Card",2),
+	("Toad_Card",2),
+	("Punk_Card",2),
+	("Harpy_Card",2),
+	("Hyegun_Card",2),
+	("Noxious_Card",2),
+	("Kavac_Card",2),
+	("Chung_E_Card",2),
+	("Orc_Baby_Card",2),
+	("Aliot_Card",2),
+	("Roween_Card",2),
+	("Salamander_Card",2),
+	("Kasa_Card",2),
+	("Magmaring_Card",2)
+)
+Old_C_Album_Weapon: (
+	("Drops_Card",2),
+	("Poring__Card",2),
+	("Lunatic_Card",2),
+	("Pecopeco_Egg_Card",2),
+	("Savage_Babe_Card",2),
+	("Andre_Larva_Card",2),
+	("Hornet_Card",2),
+	("Farmiliar_Card",2),
+	("Plankton_Card",2),
+	("Skeleton_Card",2),
+	("Thief_Bug_Female_Card",2),
+	("Wolf_Card",2),
+	("Mandragora_Card",2),
+	("Hydra_Card",2),
+	("Snake_Card",2),
+	("Andre_Card",2),
+	("Vadon_Card",2),
+	("Marina_Card",2),
+	("Metaller_Card",2),
+	("Goblin_Card",2),
+	("Anacondaq_Card",2),
+	("Caramel_Card",2),
+	("Kaho_Card",2),
+	("Scorpion_Card",2),
+	("Drainliar_Card",2),
+	("Golem_Card",2),
+	("Magnolia_Card",2),
+	("Flora_Card",2),
+	("Desert_Wolf_Card",2),
+	("Orc_Skeleton_Card",2),
+	("Soldier_Skeleton_Card",2),
+	("Skel_Worker_Card",2),
+	("Archer_Skeleton_Card",2),
+	("Zenorc_Card",2),
+	("Requiem_Card",2),
+	("Mummy_Card",2),
+	("Strouf_Card",2),
+	("Hunter_Fly_Card",2),
+	("Side_Winder_Card",2),
+	("Petit_Card",2),
+	("Deviace_Card",2),
+	("Minorous_Card",2),
+	("Scorpion_King_Card",2),
+	("Knight_Of_Abyss_Card",2),
+	("Crab_Card",2),
+	("Goblin_Leader_Card",2),
+	("Steam_Goblin_Card",2),
+	("Goblin_Archer_Card",2),
+	("Gryphon_Card",2),
+	("Gig_Card",2),
+	("Neraid_Card",2),
+	("Dark_Priest_Card",2),
+	("The_Paper_Card",2),
+	("Dullahan_Card",2),
+	("Driller_Card",2),
+	("Diabolic_Card",2),
+	("Lava_Golem_Card",2),
+	("Rotar_Zairo_Card",2),
+	("Civil_Servant_Card",2),
+	("Mutant_Dragon_Card",2),
+	("Bloody_Murderer_Card",2),
+	("Stone_Shooter_Card",2),
+	("Assulter_Card",2),
+	("Aster_Card",2),
+	("Elder_Card",2),
+	("Orc_Lady_Card",2),
+	("Injustice_Card",2),
+	("Shellfish_Card",2),
+	("Zombie_Master_Card",2),
+	("Zipper_Bear_Card",2),
+	("Chepet_Card",2),
+	("Caterpillar_Card",2),
+	("Kobold_Leader_Card",2),
+	("Kobold_Archer_Card",2),
+	("Cruiser_Card",2),
+	("Kind_Of_Beetle_Card",2),
+	("Tri_Joint_Card",2),
+	("Panzer_Goblin_Card",2),
+	("Fur_Seal_Card",2),
+	("Fake_Angel_Card",2),
+	("Mobster_Card",2),
+	("Garm_Baby_Card",2),
+	("Phendark_Card",2),
+	("Pitman_Card",2),
+	("Metaling_Card",2),
+	("Hill_Wind_Card",2),
+	("Rawrel_Card",2),
+	("Eremes_Card",2),
+	("Harword_Card",2),
+	("Shecil_Card",2),
+	("Ferus_Card",2),
+	("Deathword_Card",2),
+	("Breeze_Card",2),
+	("Solace_Card",2),
+	("Tha_Maero_Card",2),
+	("Tha_Dolor_Card",2),
+	("Skeggiold_Card",2),
+	("Drosera_Card",2),
+	("Sword_Guardian_Card",2),
+	("Bow_Guardian_Card",2),
+	("Necromancer_Card",2),
+	("Centipede_Larva_Card",2),
+	("Hilsrion_Card",2),
+	("Bloody_Knight_Card",2),
+	"Tendrilrion_Card",
+	"Aunoe_Card",
+	"Fanat_Card",
+	"Beholder_Master_Card",
+	"Naga_Card",
+	"Nepenthes_Card",
+	"Draco_Egg_Card",
+	"Bradium_Golem_Card",
+	"Ancient_Tree_Card",
+	"Zakudam_Card",
+	"Cobalt_Mineral_Card",
+	"Pinguicula_Card",
+	"Hell_Apocalypse_Card"
+)
+/* currently unsupported or unknown ('Splendid_Box2')
+Splendid_Box2: (
 	"Imperial_Guard",
 	"Bone_Plate",
 	"Ebone_Armor",
@@ -3367,434 +3823,655 @@ Splendid_Box: (
 	"Red_Square_Bag",
 	"Carga_Mace",
 	"Red_Ether_Bag",
-	"Mystic_Bow"
+	"Mystic_Bow",
+	"Hunting_Spear",
+	"Piece_Of_Angent_Skin",
+	"Diabolus_Robe",
+	"Diabolus_Armor",
+	"Diabolus_Boots",
+	"Diabolus_Manteau",
+	"Bison_Horn",
+	"Dragon_Vest",
+	"Dragon_Manteau",
+	"Elven_Ears",
+	"Tidal_Shoes",
+	"Black_Leather_Boots",
+	"Black_Leather_Boots_",
+	"Variant_Shoes",
+	"Twin_Edge_B",
+	"Twin_Edge_R"
 )
-Old_C_Album_Armor: (
-	"Pupa_Card",
-	"Picky_Card",
-	"Picky__Card",
-	"Roda_Frog_Card",
-	"Thief_Bug_Card",
-	"Rocker_Card",
-	"Desert_Wolf_Babe_Card",
-	"Pecopeco_Card",
-	"Steel_Chonchon_Card",
-	"Cornutus_Card",
-	"Savage_Card",
+*/
+/* currently unsupported or unknown ('Mysterious_Egg')
+Mysterious_Egg: (
+	("Lucky_Egg2",3),
+	("Lucky_Egg_C3",3),
+	("Lucky_Egg_C4",3),
+	("Lucky_Egg_C5",3),
+	("Lucky_Egg_C6",3),
+	("Lucky_Egg_C",2)
+)
+*/
+High_Weapon_Box: (
+	("Mail_Breaker",5),
+	("Weeder_Knife",5),
+	("Mama's_Knife",5),
+	("Assasin_Dagger",5),
+	("Exercise",5),
+	("Azoth",5),
+	("Sucsamad",5),
+	("Grimtooth_",5),
+	("Princess_Knife",5),
+	("Cursed_Dagger",5),
+	("Counter_Dagger",5),
+	("Holy_Dagger",5),
+	("Krieg",5),
+	("Weihna",5),
+	("Black_Wing",5),
+	("Blood_Tears",5),
+	("Unholy_Touch",5),
+	("Drill_Katar",5),
+	("Krishna",5),
+	("Cakram",5),
+	("Cleaver",5),
+	("Great_Axe",5),
+	("Sabbath",5),
+	("Bradium_Stonehammer",5),
+	("Slaughter",5),
+	("Tomahawk",5),
+	("Vecer_Axe",5),
+	("Ice_Falchon",7),
+	("Fire_Brand",7),
+	("Scissores_Sword",7),
+	("Cutlas",7),
+	("Solar_Sword",7),
+	("Mysteltainn_",7),
+	("Tale_Fing_",7),
+	("Byeorrun_Gum",7),
+	("Immaterial_Sword",7),
+	("Star_Dust_Blade",7),
+	("Muramasa",7),
+	("Dragon_Slayer",7),
+	("Schweizersabel",7),
+	("Zweihander",7),
+	("Katzbalger",7),
+	("Zweihander_",7),
+	("Muscle_Cutter",7),
+	("Schweizersabel_",7),
+	("Dragon_Slayer_",7),
+	("Tae_Goo_Lyeon",7),
+	("Bloody_Eater",7),
+	("Veteran_Sword",7),
+	("Ruber",5),
+	("Krasnaya",5),
+	("Gungnir",5),
+	("Gelerdria",5),
+	("Tjungkuletti",5),
+	("Gungnir_",5),
+	("Crescent_Scythe",5),
+	("Bill_Guisarme",5),
+	("Zephyrus",5),
+	("Longinus's_Spear",5),
+	("Brionac",5),
+	("Hell_Fire",5),
+	("Gae_Bolg",5),
+	("Crescent_Scythe_",5),
+	("Spectral_Spear",5),
+	("Ahlspiess",5),
+	("Spectral_Spear_",5),
+	("Gae_Bolg_",5),
+	("Zephyrus_",5),
+	("Wizardy_Staff",5),
+	("Staff_Of_Wing",5),
+	("Walking_Stick",5),
+	("Holy_Stick",5),
+	("Dead_Tree_Cane",5),
+	("Kronos",5),
+	("Dea_Staff",5),
+	("Divine_Cross",5),
+	("Golden_Mace",5),
+	("Long_Mace",5),
+	("Quadrille",5),
+	("Golden_Mace_",5),
+	("Nemesis",5),
+	("Erde",5),
+	("Red_Square_Bag",5),
+	("Red_Ether_Bag",5),
+	("Book_Of_The_Apocalypse",5),
+	("Girl's_Diary",5),
+	("Legacy_Of_Dragon",5),
+	("Hardback",5),
+	("Bible_Of_Battlefield",5),
+	("Kaiser_Knuckle",5),
+	("Claw_Of_Garm",5),
+	("Dragon_Wing",5),
+	("Bow_Of_Minstrel",5),
+	("Ixion_Wing",5),
+	("Nepenthes_Bow",5),
+	("Cursed_Lyre",5),
+	("Falken_Blitz",5),
+	("Mystic_Bow",5),
+	("Electronic_Guitar",5),
+	("Oriental_Lute",5),
+	("Oriental_Lute_",5),
+	("Harp_Of_Nepenthes",5),
+	("Lariat",5),
+	("Rapture_Rose",5),
+	("Chemeti",5),
+	("Bladed_Whip",5),
+	("Electric_Eel",5),
+	("Sea_Witch_Foot",5),
+	("Queen's_Whip",5),
+	("Carrot_Whip",5),
+	("Queen's_Whip_",5),
+	("Stem_Of_Nepenthes",5),
+	"Thorn_Staff",
+	"Eraser",
+	"Destruction_Rod",
+	"Infiltrator",
+	"Infiltrator_",
+	"Heart_Breaker",
+	"Hurricane_Fury",
+	"Right_Epsilon",
+	"Doom_Slayer",
+	("Sword_Breaker",4),
+	("Chrome_Sword",2),
+	("Chrome_Twohand_Sword",2),
+	("Excalibur",2),
+	("Masamune",2),
+	("Nagan",2),
+	("Executioner_",2),
+	("Executioner__",2),
+	("Altas_Weapon",2),
+	("Giant_Axe",2),
+	("Guillotine",2),
+	("Brood_Axe",2),
+	("Wild_Beast_Claw",2),
+	("Inverse_Scale",2),
+	("Bloody_Roar",2),
+	("Cardo",2),
+	("Imperial_Spear",2),
+	("Skewer",2),
+	("Battle_Hook",2),
+	("Mental_Stick",2),
+	"Doom_Slayer_",
+	"Hunting_Spear",
+	"Edge",
+	"Violet_Fear",
+	"Death_Guidance",
+	"House_Auger",
+	"Bazerald",
+	"Ancient_Dagger",
+	"Grand_Cross",
+	"Grand_Cross_",
+	"Death_Note",
+	"Berserk",
+	"Berserk_",
+	"Berserk_Guitar",
+	"Rosebine",
+	("Forturn_Sword",2),
+	("Combat_Knife",2),
+	("Moonlight_Sword",2),
+	("Spike",2),
+	("Spike_",2),
+	("Slash",2),
+	("Sura_Rampage",2),
+	("Bow_Of_Roguemaster",2),
+	("Balistar",2),
+	("Balistar_",2),
+	("Bow_Of_Rudra",2),
+	("Green_Whistle",2),
+	("Stem_Whip",2),
+	"Agent_Katar",
+	"Guillotine_Katar",
+	"Ignus_Steel",
+	"End_Sectora",
+	"Cannon_Spear",
+	"Cold_Magic_Book",
+	"Light_of_Recovery",
+	"As-nail",
+	"Scarlet-nail",
+	"Bloody_Cross",
+	"Thief_Crossbow",
+	"Giant_Crossbow",
+	"Creeper_Bow"
+)
+/* currently unsupported or unknown ('Ink_Ball')
+Ink_Ball: (
+	("Jellopy",39),
+	("Large_Jellopy",20),
+	("Gift_Box",20),
+	("Food_Package",10),
+	("Treasure_Box",6),
+	("Blue_Gemstone",10),
+	("First_Aid_Kit",5),
+	"Old_Blue_Box",
+	"Old_Violet_Box",
+	("Hometown_Gift",14),
+	"Accessory_Box",
+	"Wrapped_Mask",
+	"Old_Card_Album",
+	("Crystal_Blue",20)
+)
+*/
+/* currently unsupported or unknown ('God_Material_Box')
+God_Material_Box: (
+	"Iron_Glove",
+	"Iron_Maiden",
+	"Mystery_Wheel",
+	"Silver_Fancy",
+	"Anger_Of_Valkurye",
+	"Feather_Of_Angel",
+	"Foot_Step_Of_Cat",
+	"Beard_Of_Women",
+	"Root_Of_Stone",
+	"Soul_Of_Fish",
+	"Saliva_Of_Bird",
+	"Tendon_Of_Bear",
+	"Symbol_Of_Sun",
+	"Breath_Of_Soul",
+	"Crystal_Of_Snow",
+	"Indication_Of_Tempest",
+	"Slilince_Wave",
+	"Rough_Billows",
+	"Air_Stream"
+)
+*/
+/* currently unsupported or unknown ('Sg_Weapon_Supply_Box')
+Sg_Weapon_Supply_Box: (
+	"Velum_Scale",
+	"Velum_Buster",
+	("Velum_Glaive",8),
+	("Velum_Arcwand",8),
+	("Velum_Claymore",8),
+	"Velum_Katzbalger",
+	("Velum_Balista",3),
+	("Velum_Crossbow",8),
+	("Velum_Bible",8),
+	("Velum_Great_Encyclopedia",8),
+	("Velum_Claw",3),
+	("Velum_Damascus",3),
+	("Velum_Stunner",3),
+	("Velum_Flail",3),
+	("Velum_Guillotine",8),
+	("Velum_Spear",8),
+//unknown/unsupported - 	("12677",13),
+//unknown/unsupported - 	("12678",13),
+	("Velum_Jahmadar",2)
+)
+*/
+/* currently unsupported or unknown ('Old_Card_Album_')
+Old_Card_Album_: (
+	("Poring_Card",14),
+	("Fabre_Card",17),
+	("Pupa_Card",6),
+	("Drops_Card",18),
+	("Poring__Card",2),
+	("Lunatic_Card",14),
+	("Pecopeco_Egg_Card",4),
+	("Picky_Card",17),
+	("Chonchon_Card",17),
+	("Wilow_Card",17),
+	("Picky__Card",17),
+	("Thief_Bug_Egg_Card",19),
+	("Andre_Egg_Card",12),
+	("Roda_Frog_Card",5),
+	("Condor_Card",12),
+	("Thief_Bug_Card",12),
+	("Savage_Babe_Card",5),
+	("Hornet_Card",10),
+	("Farmiliar_Card",10),
+	("Rocker_Card",10),
+	("Spore_Card",10),
+	("Desert_Wolf_Babe_Card",5),
+	("Plankton_Card",5),
+	("Skeleton_Card",5),
+	("Thief_Bug_Female_Card",9),
+	("Kukre_Card",3),
+	("Tarou_Card",9),
+	("Wolf_Card",9),
+	("Mandragora_Card",9),
+	("Pecopeco_Card",3),
+	("Ambernite_Card",6),
+	("Poporing_Card",6),
+	("Worm_Tail_Card",6),
+	("Hydra_Card",3),
+	("Muka_Card",3),
+	("Snake_Card",3),
+	("Zombie_Card",3),
+	("Stainer_Card",3),
+	("Creamy_Card",3),
+	("Coco_Card",3),
+	("Steel_Chonchon_Card",3),
+	("Andre_Card",3),
+	("Smokie_Card",3),
+	("Horn_Card",3),
+	("Martin_Card",3),
+	"Ghostring_Card",
+	("Poison_Spore_Card",3),
+	("Vadon_Card",3),
+	("Thief_Bug_Male_Card",3),
+	("Yoyo_Card",3),
+	("Elder_Wilow_Card",3),
+	"Vitata_Card",
+	"Angeling_Card",
+	("Marina_Card",3),
+	("Dustiness_Card",3),
+	("Metaller_Card",2),
+	("Thara_Frog_Card",2),
+	("Goblin_Card",2),
+	("Cornutus_Card",2),
+	("Anacondaq_Card",2),
+	("Caramel_Card",2),
+	("Zerom_Card",2),
+	("Kaho_Card",2),
+	("Orc_Warrior_Card",2),
+	("Megalodon_Card",2),
+	("Scorpion_Card",2),
+	("Drainliar_Card",2),
+	("Eggyra_Card",2),
+	("Orc_Zombie_Card",2),
+	("Golem_Card",2),
+	("Pirate_Skel_Card",2),
+	("BigFoot_Card",2),
+	("Argos_Card",2),
+	("Magnolia_Card",2),
+	("Phen_Card",2),
+	("Savage_Card",2),
+	("Mantis_Card",2),
+	("Flora_Card",2),
+	("Hode_Card",2),
+	"Desert_Wolf_Card",
+	"Rafflesia_Card",
+	"Marine_Sphere_Card",
+	"Orc_Skeleton_Card",
+	"Soldier_Skeleton_Card",
+	"Giearth_Card",
+	"Frilldora_Card",
 	"Sword_Fish_Card",
+	"Munak_Card",
+	"Kobold_Card",
+	"Skel_Worker_Card",
+	"Obeaune_Card",
+	"Archer_Skeleton_Card",
+	"Marse_Card",
+	"Zenorc_Card",
+	"Matyr_Card",
 	"Dokebi_Card",
 	"Pasana_Card",
+	"Sohee_Card",
 	"Sand_Man_Card",
+	"Whisper_Card",
+	"Horong_Card",
+	"Requiem_Card",
 	"Marc_Card",
+	"Mummy_Card",
+	"Verit_Card",
+	"Myst_Card",
+	"Jakk_Card",
+	"Ghoul_Card",
+	"Strouf_Card",
+	"Marduk_Card",
+	"Marionette_Card",
 	"Argiope_Card",
+	"Hunter_Fly_Card",
+	"Isis_Card",
+	"Side_Winder_Card",
+	"Petit_Card",
 	"Bathory_Card",
+	"Petit__Card",
+	"Deviruchi_Card",
+	"Deviace_Card",
+	"Nightmare_Card",
+	"Baphomet__Card",
+	"Daydric_Card",
+	"Khalitzburg_Card",
+	"Joker_Card",
 	"Evil_Druid_Card",
+	"Gargoyle_Card",
 	"Goat_Card",
+	"Gajomart_Card",
+	"Galapago_Card",
+	"Crab_Card",
+	"Rice_Cake_Boy_Card",
+	"Steam_Goblin_Card",
+	"Goblin_Archer_Card",
 	"Flying_Deleter_Card",
+	"Nine_Tail_Card",
+	"Antique_Firelock_Card",
+	"Grand_Peco_Card",
 	"Grizzly_Card",
+	"Gullinbursti_Card",
+	"Gig_Card",
 	"Nightmare_Terror_Card",
+	"Neraid_Card",
 	"Dark_Frame_Card",
+	"The_Paper_Card",
 	"Demon_Pungus_Card",
+	"Poison_Toad_Card",
+	"Dullahan_Card",
+	"Dryad_Card",
+	"Dragon_Tail_Card",
+	"Driller_Card",
 	"Disguise_Card",
+	"Diabolic_Card",
+	"Lava_Golem_Card",
+	"Rideword_Card",
+	"Raggler_Card",
+	"Raydric_Archer_Card",
+	"Leib_Olmai_Card",
 	"Wraith_Dead_Card",
+	"Wraith_Card",
 	"Loli_Ruri_Card",
+	"Rotar_Zairo_Card",
+	"Lude_Card",
 	"Rybio_Card",
+	"Leaf_Cat_Card",
+	"Marin_Card",
+	"Merman_Card",
+	"Megalith_Card",
 	"Majoruros_Card",
+	"Civil_Servant_Card",
+	"Mini_Demon_Card",
+	"Mimic_Card",
+	"Mystcase_Card",
+	"Miyabi_Ningyo_Card",
+	"Violy_Card",
+	"Wander_Man_Card",
+	"Bon_Gun_Card",
 	"Brilight_Card",
+	"Bloody_Murderer_Card",
+	"Blazzer_Card",
 	"Sasquatch_Card",
+	"Live_Peach_Tree_Card",
 	"Succubus_Card",
+	"Sageworm_Card",
 	"Solider_Card",
+	"Skeleton_General_Card",
 	"Skel_Prisoner_Card",
+	"Stalactic_Golem_Card",
+	"Stem_Worm_Card",
+	"Stone_Shooter_Card",
+	"Sting_Card",
+	"Spring_Rabbit_Card",
+	"Sleeper_Card",
+	"C_Tower_Manager_Card",
+	"Shinobi_Card",
+	"Increase_Soil_Card",
+	"Wild_Ginseng_Card",
 	"Baby_Leopard_Card",
 	"Anolian_Card",
+	"Cookie_XMAS_Card",
+	"Owl_Duke_Card",
+	"Owl_Baron_Card",
+	"Iron_Fist_Card",
+	"Arclouse_Card",
 	"Apocalips_Card",
+	"Antonio_Card",
+	"Alarm_Card",
+	"Am_Mut_Card",
+	"Assulter_Card",
+	"Aster_Card",
+	"Ancient_Mummy_Card",
+	"Ancient_Worm_Card",
+	"Elder_Card",
+	"Alligator_Card",
+	"Alice_Card",
+	"Orc_Lady_Card",
+	"Orc_Archer_Card",
+	"Wild_Rose_Card",
+	"Wicked_Nymph_Card",
 	"Wooden_Golem_Card",
+	"Wootan_Shooter_Card",
+	"Wootan_Fighter_Card",
+	"Evil_Cloud_Hermit_Card",
+	"Wind_Ghost_Card",
+	"Li_Me_Mang_Ryang_Card",
+	"Explosion_Card",
+	"Injustice_Card",
+	"Incubus_Card",
 	"Giant_Spider_Card",
+	"Giant_Honet_Card",
+	"Dancing_Dragon_Card",
+	"Shellfish_Card",
+	"Zombie_Master_Card",
+	"Zombie_Prisoner_Card",
+	"Zherlthsh_Card",
+	"Gibbet_Card",
 	"Deleter_Card",
 	"Geographer_Card",
+	"Zipper_Bear_Card",
+	"Tengu_Card",
+	"Greatest_General_Card",
+	"Chepet_Card",
+	"Choco_Card",
 	"Karakasa_Card",
+	"Kapha_Card",
+	"Carat_Card",
+	"Caterpillar_Card",
+	"Cat_O_Nine_Tail_Card",
+	"Kobold_Archer_Card",
+	"Cookie_Card",
+	"Quve_Card",
 	"Kraben_Card",
+	"Cramp_Card",
+	"Cruiser_Card",
 	"Cremy_Fear_Card",
 	"Clock_Card",
 	"Chimera_Card",
 	"Killer_Mantis_Card",
+	"Tamruan_Card",
+	"Kind_Of_Beetle_Card",
+	"Tri_Joint_Card",
+	"Parasite_Card",
+	"Panzer_Goblin_Card",
+	"Permeter_Card",
+	"Fur_Seal_Card",
+	"Punk_Card",
+	"Penomena_Card",
 	"Pest_Card",
+	"Fake_Angel_Card",
+	"Freezer_Card",
+	"Hylozoist_Card",
+	"High_Orc_Card",
+	"Garm_Baby_Card",
+	"Harpy_Card",
+	"See_Otter_Card",
+	"Blood_Butterfly_Card",
+	"Hyegun_Card",
+	"Phendark_Card",
+	"Heater_Card",
 	"Waste_Stove_Card",
-	"Venomous_Card",
+	("Venomous_Card",3),
+	"Noxious_Card",
+	("Pitman_Card",3),
+	"Ungoliant_Card",
 	"Porcellio_Card",
 	"Obsidian_Card",
 	"Mineral_Card",
+	"Teddy_Bear_Card",
+	"Metaling_Card",
+	"Mole_Card",
+	("Anopheles_Card",3),
+	("Hill_Wind_Card",3),
 	"Ygnizem_Card",
+	("Armaia_Card",3),
+	"Whikebain_Card",
+	"Erend_Card",
+	("Rawrel_Card",3),
+	"Kavac_Card",
 	"Removal_Card",
+	"Gemini_Card",
+	("Gremlin_Card",3),
+	"Beholder_Card",
+	"Seyren_Card",
+	("Eremes_Card",3),
+	"Harword_Card",
+	"Katrinn_Card",
+	"Shecil_Card",
 	"Venatu_Card",
 	"Dimik_Card",
 	"Archdam_Card",
+	"Chung_E_Card",
+	"Orc_Baby_Card",
+	("Green_Iguana_Card",3),
+	"Acidus_Card",
+	"Acidus__Card",
+	("Ferus_Card",3),
+	"Ferus__Card",
 	"Novus__Card",
-	"Novus_Card",
+	("Novus_Card",3),
+	"Hydro_Card",
+	("Dragon_Egg_Card",3),
 	"Ancient_Mimic_Card",
+	("Deathword_Card",3),
+	"Plasma_Card",
+	"Breeze_Card",
+	("Retribution_Card",3),
 	"Observation_Card",
 	"Shelter_Card",
+	"Solace_Card",
+	"Tha_Maero_Card",
+	"Tha_Odium_Card",
+	"Tha_Despero_Card",
 	"Aliza_Card",
 	"Alicel_Card",
+	"Aliot_Card",
 	"Skogul_Card",
 	"Frus_Card",
 	"Agav_Card",
 	"Echio_Card",
-	"Byorgue_Card",
-	"Banshee_Master_Card"
-)
-Old_C_Album_Helm: (
-	"Stainer_Card",
-	"Coco_Card",
-	"Martin_Card",
-	"Elder_Wilow_Card",
-	"Giearth_Card",
-	"Ghoul_Card",
-	"Marduk_Card",
-	"Deviruchi_Card",
-	"Nightmare_Card",
-	"Grand_Peco_Card",
-	"Dark_Illusion_Card",
-	"Dryad_Card",
-	"Rideword_Card",
-	"Leib_Olmai_Card",
-	"Leaf_Cat_Card",
-	"Mystcase_Card",
-	"Stalactic_Golem_Card",
-	"C_Tower_Manager_Card",
-	"Archangeling_Card",
-	"Wicked_Nymph_Card",
-	"Wootan_Shooter_Card",
-	"Wootan_Fighter_Card",
-	"Incubus_Card",
-	"Giant_Honet_Card",
-	"Gibbet_Card",
-	"Carat_Card",
-	"Cramp_Card",
-	"Permeter_Card",
-	"Ungoliant_Card",
-	"Mole_Card",
-	"Gemini_Card",
-	"Seyren_Card",
-	"Magaleta_Card",
-	"Katrinn_Card",
-	"Acidus__Card",
 	"Vanberk_Card",
 	"Isilla_Card",
-	"Knocker_Card",
-	"Banshee_Card"
-)
-Old_C_Album_Acc: (
-	"Kukre_Card",
-	"Tarou_Card",
-	"Poporing_Card",
-	"Worm_Tail_Card",
-	"Muka_Card",
-	"Smokie_Card",
-	"Poison_Spore_Card",
-	"Yoyo_Card",
-	"Vitata_Card",
-	"Zerom_Card",
-	"Pirate_Skel_Card",
-	"Phen_Card",
-	"Mantis_Card",
-	"Marine_Sphere_Card",
-	"Kobold_Card",
-	"Obeaune_Card",
-	"Horong_Card",
-	"Joker_Card",
-	"Gargoyle_Card",
-	"Galapago_Card",
-	"Rice_Cake_Boy_Card",
-	"Poison_Toad_Card",
-	"Raydric_Archer_Card",
-	"Wraith_Card",
-	"Lude_Card",
-	"Marin_Card",
-	"Mimic_Card",
-	"Violy_Card",
-	"Bon_Gun_Card",
-	"Blazzer_Card",
-	"Sageworm_Card",
-	"Stem_Worm_Card",
-	"Spring_Rabbit_Card",
-	"Sleeper_Card",
-	"Shinobi_Card",
-	"Wild_Ginseng_Card",
-	"Owl_Duke_Card",
-	"Owl_Baron_Card",
-	"Alligator_Card",
-	"Orc_Archer_Card",
-	"Evil_Cloud_Hermit_Card",
-	"Wind_Ghost_Card",
-	"Li_Me_Mang_Ryang_Card",
-	"Dancing_Dragon_Card",
-	"Tengu_Card",
-	"Greatest_General_Card",
-	"Cookie_Card",
-	"Quve_Card",
-	"Hylozoist_Card",
-	"See_Otter_Card",
-	"Blood_Butterfly_Card",
-	"Heater_Card",
-	"Anopheles_Card",
-	"Armaia_Card",
-	"Whikebain_Card",
-	"Erend_Card",
-	"Gremlin_Card",
-	"Beholder_Card",
-	"Green_Iguana_Card",
-	"Hydro_Card",
-	"Dragon_Egg_Card",
-	"Plasma_Card",
-	"Retribution_Card",
-	"Snowier_Card",
-	"Siroma_Card",
-	"Gazeti_Card",
-	"Galion_Card",
-	"Stapo_Card",
-	"Imp_Card",
-	"Ragged_Zombie_Card",
-	"Hell_Poodle_Card"
-)
-Old_C_Album_Shoes: (
-	"Zombie_Card",
-	"Thief_Bug_Male_Card",
-	"Eggyra_Card",
-	"Matyr_Card",
-	"Sohee_Card",
-	"Verit_Card",
-	"Gajomart_Card",
-	"Antique_Firelock_Card",
-	"Gullinbursti_Card",
-	"Raggler_Card",
-	"Merman_Card",
-	"Megalith_Card",
-	"Mini_Demon_Card",
-	"Miyabi_Ningyo_Card",
-	"Skeleton_General_Card",
-	"Cookie_XMAS_Card",
-	"Iron_Fist_Card",
-	"Alarm_Card",
-	"Am_Mut_Card",
-	"Ancient_Worm_Card",
-	"Wild_Rose_Card",
-	"Explosion_Card",
-	"Zombie_Prisoner_Card",
-	"Cat_O_Nine_Tail_Card",
-	"Freezer_Card",
-	"Acidus_Card",
-	"Ferus__Card",
-	"Tha_Odium_Card",
-	"Ice_Titan_Card",
-	"Zombie_Slaughter_Card"
-)
-Old_C_Album_Shield: (
-	"Andre_Egg_Card",
-	"Ambernite_Card",
-	"Horn_Card",
-	"Thara_Frog_Card",
-	"Orc_Warrior_Card",
-	"Megalodon_Card",
-	"BigFoot_Card",
-	"Argos_Card",
-	"Rafflesia_Card",
-	"Munak_Card",
-	"Petit__Card",
-	"Medusa_Card",
-	"Khalitzburg_Card",
-	"Anubis_Card",
-	"Mysteltainn_Card",
-	"Live_Peach_Tree_Card",
-	"Sting_Card",
-	"Increase_Soil_Card",
-	"Arclouse_Card",
-	"Ancient_Mummy_Card",
-	"Executioner_Card",
-	"Alice_Card",
-	"Tirfing_Card",
-	"Zherlthsh_Card",
-	"Tamruan_Card",
-	"Parasite_Card",
-	"Penomena_Card",
-	"High_Orc_Card",
-	"Teddy_Bear_Card",
-	"Tha_Despero_Card",
 	"Hodremlin_Card",
 	"Seeker_Card",
+	("Snowier_Card",2),
+	"Siroma_Card",
+	"Ice_Titan_Card",
+	"Gazeti_Card",
 	"Muscipular_Card",
-	"Flame_Skull_Card",
-	"Tatacho_Card",
-	"Aqua_Elemental_Card",
-	"Draco_Card",
-	"Luciola_Vespa_Card",
-	"Centipede_Card",
-	"Cornus_Card",
-	"Dark_Shadow_Card"
-)
-Old_C_Album_Weapon: (
-	"Drops_Card",
-	"Poring__Card",
-	"Lunatic_Card",
-	"Pecopeco_Egg_Card",
-	"Savage_Babe_Card",
-	"Andre_Larva_Card",
-	"Hornet_Card",
-	"Farmiliar_Card",
-	"Plankton_Card",
-	"Skeleton_Card",
-	"Thief_Bug_Female_Card",
-	"Wolf_Card",
-	"Mandragora_Card",
-	"Hydra_Card",
-	"Snake_Card",
-	"Andre_Card",
-	"Vadon_Card",
-	"Marina_Card",
-	"Metaller_Card",
-	"Goblin_Card",
-	"Anacondaq_Card",
-	"Caramel_Card",
-	"Kaho_Card",
-	"Scorpion_Card",
-	"Drainliar_Card",
-	"Golem_Card",
-	"Magnolia_Card",
-	"Flora_Card",
-	"Desert_Wolf_Card",
-	"Orc_Skeleton_Card",
-	"Soldier_Skeleton_Card",
-	"Skel_Worker_Card",
-	"Archer_Skeleton_Card",
-	"Zenorc_Card",
-	"Requiem_Card",
-	"Mummy_Card",
-	"Strouf_Card",
-	"Hunter_Fly_Card",
-	"Side_Winder_Card",
-	"Petit_Card",
-	"Deviace_Card",
-	"Minorous_Card",
-	"Scorpion_King_Card",
-	"Knight_Of_Abyss_Card",
-	"Crab_Card",
-	"Goblin_Leader_Card",
-	"Steam_Goblin_Card",
-	"Goblin_Archer_Card",
-	"Gryphon_Card",
-	"Gig_Card",
-	"Neraid_Card",
-	"Dark_Priest_Card",
-	"The_Paper_Card",
-	"Dullahan_Card",
-	"Driller_Card",
-	"Diabolic_Card",
-	"Lava_Golem_Card",
-	"Rotar_Zairo_Card",
-	"Civil_Servant_Card",
-	"Mutant_Dragon_Card",
-	"Bloody_Murderer_Card",
-	"Stone_Shooter_Card",
-	"Assulter_Card",
-	"Aster_Card",
-	"Elder_Card",
-	"Orc_Lady_Card",
-	"Injustice_Card",
-	"Shellfish_Card",
-	"Zombie_Master_Card",
-	"Zipper_Bear_Card",
-	"Chepet_Card",
-	"Caterpillar_Card",
-	"Kobold_Leader_Card",
-	"Kobold_Archer_Card",
-	"Cruiser_Card",
-	"Kind_Of_Beetle_Card",
-	"Tri_Joint_Card",
-	"Panzer_Goblin_Card",
-	"Fur_Seal_Card",
-	"Fake_Angel_Card",
-	"Mobster_Card",
-	"Garm_Baby_Card",
-	"Phendark_Card",
-	"Pitman_Card",
-	"Metaling_Card",
-	"Hill_Wind_Card",
-	"Rawrel_Card",
-	"Eremes_Card",
-	"Harword_Card",
-	"Shecil_Card",
-	"Ferus_Card",
-	"Deathword_Card",
-	"Breeze_Card",
-	"Solace_Card",
-	"Tha_Maero_Card",
-	"Tha_Dolor_Card",
-	"Skeggiold_Card",
-	"Drosera_Card",
+	("Drosera_Card",2),
+	"Roween_Card",
+	"Galion_Card",
+	("Stapo_Card",3),
+	"Byorgue_Card",
 	"Sword_Guardian_Card",
 	"Bow_Guardian_Card",
-	"Necromancer_Card",
-	"Centipede_Larva_Card",
-	"Hilsrion_Card",
-	"Bloody_Knight_Card"
-)
-Old_C_Album_Garment: (
-	("Dustiness_Card",32),
-	("Orc_Zombie_Card",32),
-	("Hode_Card",32),
-	("Frilldora_Card",32),
-	("Marse_Card",32),
-	("Whisper_Card",32),
-	("Myst_Card",32),
-	("Jakk_Card",32),
-	("Marionette_Card",32),
-	("Isis_Card",32),
-	("Baphomet__Card",32),
-	("Daydric_Card",32),
-	("Nine_Tail_Card",32),
-	"Deviling_Card",
-	("Dragon_Tail_Card",32),
-	("Dragon_Fly_Card",32),
-	"Vagabond_Wolf_Card",
-	"Mastering_Card",
-	"Wander_Man_Card",
-	"Vocal_Card",
-	("Eclipse_Card",32),
-	("Choco_Card",32),
-	("Kapha_Card",32),
-	("Whisper_Boss_Card",32),
-	"Toad_Card",
-	("Punk_Card",32),
-	("Harpy_Card",32),
-	("Hyegun_Card",32),
-	("Noxious_Card",32),
-	"Kavac_Card",
-	("Chung_E_Card",32),
-	("Orc_Baby_Card",32),
-	("Aliot_Card",32),
-	("Roween_Card",32),
-	("Salamander_Card",32),
-	("Kasa_Card",32),
-	("Magmaring_Card",33),
-	("Condor_Card",31)
+	"Salamander_Card",
+	"Kasa_Card",
+	("Magmaring_Card",2),
+	"Imp_Card",
+	"Knocker_Card",
+	"Zombie_Slaughter_Card",
+	("Ragged_Zombie_Card",2),
+	("Hell_Poodle_Card",2),
+	("Banshee_Card",2),
+	"Flame_Skull_Card",
+	"Necromancer_Card"
 )
-//unknown carrier / unsupported
-/*Candy_Holder: (
-	("Honey",9),
-	("Candy",20),
-	("Well_Baked_Cookie",15),
-	("Piece_Of_Cake",10),
-	("Bread",20),
-	"Old_Blue_Box",
-	"Yggdrasilberry",
-	"Old_Card_Album",
-	"Old_Violet_Box",
-	"Contracts_In_Shadow",
-	("Niflheim_Ticket",10),
-	("Pumpkin_Cake",5),
-	("Pumpkin_Pie",5)
-)*/
-High_Weapon_Box: (
+*/
+/* currently unsupported or unknown ('High_Weapon_Box_')
+High_Weapon_Box_: (
 	("Mail_Breaker",5),
 	("Weeder_Knife",5),
 	("Mama's_Knife",5),
@@ -3917,7 +4594,6 @@ High_Weapon_Box: (
 	"Right_Epsilon",
 	"Doom_Slayer",
 	("Sword_Breaker",4),
-	//("14420",2), -- Unknown/Unsupported
 	("Chrome_Sword",2),
 	("Chrome_Twohand_Sword",2),
 	("Excalibur",2),
@@ -3978,4 +4654,92 @@ High_Weapon_Box: (
 	"Thief_Crossbow",
 	"Giant_Crossbow",
 	"Creeper_Bow"
-)
\ No newline at end of file
+)
+*/
+Holy_Egg_2: (
+	("Oridecon",3),
+	("Elunium",10),
+	("White_Slim_Potion",30),
+	("Blue_Potion",30),
+	("Yggdrasilberry",3),
+	("Seed_Of_Yggdrasil",2),
+	("Leaf_Of_Yggdrasil",15),
+	("Old_Card_Album",5),
+	"Drooping_Bunny"
+)
+/* currently unsupported or unknown ('Candy_Holder')
+Candy_Holder: (
+	("Honey",9),
+	("Candy",20),
+	("Well_Baked_Cookie",15),
+	("Piece_Of_Cake",10),
+	("Bread",20),
+	"Old_Blue_Box",
+	"Yggdrasilberry",
+	"Old_Card_Album",
+	"Old_Violet_Box",
+	"Contracts_In_Shadow",
+	("Niflheim_Ticket",10),
+	("Pumpkin_Cake",5),
+	("Pumpkin_Pie",5)
+)
+*/
+Lotto_Box01: (
+	"Lotto02",
+	"Lotto03",
+	"Lotto04",
+	"Lotto05",
+	"Lotto06",
+	"Lotto07",
+	"Lotto08",
+	"Lotto09"
+)
+Lotto_Box02: (
+	"Lotto11",
+	"Lotto12",
+	"Lotto13",
+	"Lotto14",
+	"Lotto15",
+	"Lotto16",
+	"Lotto17",
+	"Lotto18"
+)
+Lotto_Box03: (
+	"Lotto20",
+	"Lotto21",
+	"Lotto22",
+	"Lotto23",
+	"Lotto24",
+	"Lotto25",
+	"Lotto26",
+	"Lotto27"
+)
+Lotto_Box04: (
+	"Lotto29",
+	"Lotto30",
+	"Lotto31",
+	"Lotto32",
+	"Lotto33",
+	"Lotto34",
+	"Lotto35",
+	"Lotto36"
+)
+Lotto_Box05: (
+	"Lotto38",
+	"Lotto39",
+	"Lotto40",
+	"Lotto41",
+	"Lotto42",
+	"Lotto43",
+	"Lotto44",
+	"Lotto45"
+)
+/* currently unsupported or unknown ('Lucky_Bag')
+Lucky_Bag: (
+	("Fire_Cracker",7),
+	("Korea_Rice_Cake",6),
+	("Handsei",2),
+//unknown/unsupported - 	("7647",3),
+//unknown/unsupported - 	"7649"
+)
+*/
\ No newline at end of file
diff --git a/db/re/refine_db.txt b/db/re/refine_db.txt
index 3dad5be78..a9b7fedd1 100644
--- a/db/re/refine_db.txt
+++ b/db/re/refine_db.txt
@@ -27,14 +27,15 @@
 // Chance:
 // 100 = 100%
 //
+// Note: Chances for +11 and higher are not verified - 10% is a rumor from iRO wiki.
 // A note about renewal Armors, there may or may not be another bonus, according to iRO wiki: Every upgrade gives floor[( 3 + current upgrade ) / 4] equipment DEF)
 
-0,0,0,0,100:100,100:100,100:100,100:100,60:200,40:200,40:200,20:200,20:300,10:300,50:300,30:300,30:400,20:400,10:400,10:400,10:500,10:500,10:500,10:500
+0,0,0,0,100:100,100:100,100:100,100:100,60:200,40:200,40:200,20:200,20:300,10:300,100:300,100:300,100:400,100:400,90:400,60:400,60:500,30:500,30:500,10:500
 // Level 1 weapons
-1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,90:0,80:0,80:0,70:0,70:0,60:300,60:300,40:300,20:300,20:300
+1,200,8,300,100:0,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,100:0,100:0,100:0,100:0,100:0,100:300,100:300,90:300,60:300,20:300
 // Level 2 weapons
-2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,20:0,80:0,80:0,70:0,70:0,60:0,60:600,50:600,20:600,20:600,20:600
+2,300,7,500,100:0,100:0,100:0,100:0,100:0,100:0,60:0,40:0,20:0,20:0,100:0,100:0,100:0,100:0,100:0,100:600,90:600,60:600,30:600,20:600
 // Level 3 weapons
-3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,20:0,80:0,70:0,70:0,60:0,60:0,40:900,40:900,20:900,20:900,10:900
+3,500,6,800,100:0,100:0,100:0,100:0,100:0,60:0,50:0,20:0,20:0,20:0,100:0,100:0,100:0,100:0,100:0,90:900,75:900,30:900,30:900,20:900
 // Level 4 weapons
-4,700,5,1400,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0,50:0,30:0,30:0,20:0,20:0,10:1200,10:1200,10:1200,10:1200,10:1200
+4,700,5,1400,100:0,100:0,100:0,100:0,60:0,40:0,40:0,20:0,20:0,10:0,100:0,100:0,100:0,100:0,90:0,60:1200,60:1200,30:1200,30:1200,10:1200
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index 446f0d698..e61b066be 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1113,6 +1113,8 @@
 2019,0,0,0,180000,0,0,-1
 //-- RK_DRAGONBREATH_WATER
 5004,0:0:0:1000:1000:1000:1500:1500:2000:2000,2000,0,40000,0,0,500
+//-- RK_LUXANIMA
+5005,0,0,0,60000,0,0,-1
 //==========================================
 
 //===== Gillotine Cross ====================
@@ -1148,7 +1150,7 @@
 //-- GC_CROSSRIPPERSLASHER
 2037,0,1000,0,0,0,0,-1
 //-- GC_DARKCROW
-5001,0,1500,0,5000,0,0,-1
+5001,0,1500,0,5000,0,60000,-1
 //==========================================
 
 //===== Arch Bishop ========================
@@ -1380,8 +1382,8 @@
 2303,2000,2000,0,10000:20000:30000,0,180000,-1
 //-- SC_FEINTBOMB
 2304,1000,0,0,1000,0,5000,-1
-//-- SC_SCAPE
-5010,1000,0,0,1000,0,5000,-1
+//-- SC_ESCAPE
+5010,0,0,0,1000,0,15000,-1
 //==========================================
 
 //==== Royal Guard skills ==================
@@ -1591,6 +1593,8 @@
 2467,1000,0,0,60000,0,60000,1000
 //-- SO_EARTH_INSIGNIA
 2468,1000,0,0,60000,0,60000,1000
+//-- SO_ELEMENTAL_SHIELD
+5008,1000,0,0,0,0,10000,-1
 //==========================================
 
 //==== Genetic skills ======================
@@ -1633,6 +1637,9 @@
 
 //-- GN_SLINGITEM_RANGEMELEEATK
 2498,0,0,0,3000,0,0,-1
+
+//-- GN_ILLUSIONDOPING
+5003,0,0,0,10000,0,10000,-1
 //==========================================
 
 //===== Extra 3rd Class Skills =============
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index 45ec76c38..5164e511a 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -567,7 +567,7 @@
 521,-9,6,2,-1,0x40,1,10,1,no,0,0,0,weapon,3,	GS_GROUNDDRIFT,Ground Drift
 522,0,0,0,0,0,0,10,1,no,0,0,0,weapon,0,		NJ_TOBIDOUGU,Shuriken Training
 523,9,6,1,-1,0x40,0,10,1,no,0,0,0,weapon,0,	NJ_SYURIKEN,Throw Shuriken
-524,9,8,1,-1,0x40,0,5,3,no,0,0,0,weapon,0,	NJ_KUNAI,Throw Kunai
+524,9,8,1,-1,0x40,0,5,-3,no,0,0,0,weapon,0,	NJ_KUNAI,Throw Kunai
 525,9,8,2,-1,0x2,0,5,-3:-3:-4:-4:-5,no,0,0,0,weapon,0,	NJ_HUUMA,Throw Huuma Shuriken
 526,9,6,1,0,0x50,0,10,1,no,0,0,0,misc,0,		NJ_ZENYNAGE,Throw Zeny
 527,0,6,4,-1,0,0,5,1,no,0,0,0,weapon,4,		NJ_TATAMIGAESHI,Improvised Defense
@@ -1079,16 +1079,16 @@
 3035,0,6,4,0,0x1,0,1,1,no,0,0,0,none,0,		ECLAGE_RECALL,Return To Eclage
 
 // EP 14.3 Part 2 3rd Job Skills
-5001,1,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	GC_DARKCROW,Dark Claw
+5001,1,8,1,-1,0,0,5,3,no,0,0,0,weapon,0,	GC_DARKCROW,Dark Claw
 5002,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		RA_UNLIMIT,Unlimited
-//5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,	GN_ILLUSIONDOPING,Illusion Doping
+5003,7,6,1,-1,0x2,4:5:6:7:8,5,1,no,0,0,0,weapon,0,	GN_ILLUSIONDOPING,Illusion Doping
 5004,9,6,2,1,0x2,1:1:1:2:2:2:3:3:4:4,10,1,no,0,0,0,misc,0,	RK_DRAGONBREATH_WATER,Dragon Breath - Water
-//5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,		RK_LUXANIMA,Lux Anima
+5005,0,6,4,0,0x3,3,1,1,no,0,0,0,none,0,		RK_LUXANIMA,Lux Anima
 5006,1,6,2,3,0,0,5,1,no,0,0,3,misc,0,		NC_MAGMA_ERUPTION,Magma Eruption
 5007,0,6,4,0,0x3,5:6:7:8:9,5,1,no,0,0,0,none,0,	WM_FRIGG_SONG,Frigg's Song
-//5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,	SO_ELEMENTAL_SHIELD,Elemental Shield
+5008,0,6,4,0,0x3,15,5,1,no,0,0,0,none,0,	SO_ELEMENTAL_SHIELD,Elemental Shield
 5009,1,6,1,0,0x1,0,5,1,no,0,0,0,none,0,		SR_FLASHCOMBO,Flash Combo
-//5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SC_ESCAPE,Emergency Escape
+5010,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SC_ESCAPE,Emergency Escape
 5011,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		AB_OFFERTORIUM,Offertorium
 5012,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		WL_TELEKINESIS_INTENSE,Intense Telekinesis
 5013,0,6,4,0,0x3,5,5,1,no,0,0,0,none,0,		LG_KINGS_GRACE,King's Grace
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index 75ac6d3cf..2f2c1e8b6 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -842,9 +842,9 @@
 5005,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0        //RK_LUXANIMA#Lux Anima#
 5006,0,0,60:70:80:90:100,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  //NC_MAGMA_ERUPTION#Magma Eruption#
 5007,0,0,200:230:260:290:320,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //WM_FRIGG_SONG#Frigg's Song#
-5008,0,0,120:120:120:120:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //SO_ELEMENTAL_SHIELD#Elemental Shield#
+5008,0,0,120:120:120:120:120,0,0,0,99,0,0,elementalspirit,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //SO_ELEMENTAL_SHIELD#Elemental Shield#
 5009,0,0,75:65:55:45:35,0,0,0,99,0,0,none,5:5:4:4:3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SR_FLASHCOMBO#Flash Combo#
-5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SC_ESCAPE#Emergency Escape#
+5010,0,0,30:26:22:18:14,0,0,0,99,0,0,none,0,7940,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0   //SC_ESCAPE#Emergency Escape#
 5011,0,0,30:60:90:120:150,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //AB_OFFERTORIUM#Offertorium#
 5012,0,0,100:150:200:250:300,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //WL_TELEKINESIS_INTENSE#Intense Telekinesis#
 5013,0,0,200:180:160:140:120,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0      //LG_KINGS_GRACE#King's Grace#
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index 80c4a43df..3cd90f201 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -2977,6 +2977,10 @@ Sorcerer: {
 			MaxLevel: 3
 			SO_SUMMON_TERA: 3
 		}
+		SO_ELEMENTAL_SHIELD: {
+			MaxLevel: 5
+			SO_EL_CONTROL: 3
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }
@@ -3381,10 +3385,10 @@ Genetic: {
 			GN_MIX_COOKING: 1
 		}
 		GN_S_PHARMACY: 10
-//		GN_ILLUSIONDOOPING: {
-//			MaxLevel: 5
-//			GN_S_PHARMACY: 1
-//		}
+		GN_ILLUSIONDOPING: {
+			MaxLevel: 5
+			GN_S_PHARMACY: 1
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }
@@ -3482,10 +3486,10 @@ Shadow_Chaser: {
 			MaxLevel: 3
 			SC_DIMENSIONDOOR: 3
 		}
-//		SC_SCAPE: {
-//			MaxLevel: 5
-//			SC_TRIANGLESHOT: 2
-//		}
+		SC_ESCAPE: {
+			MaxLevel: 5
+			SC_TRIANGLESHOT: 2
+		}
 		ALL_FULL_THROTTLE: 5
 	}
 }