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

7 files changed, 190 insertions, 160 deletions

diff --git a/db/const.txt b/db/const.txt
index 6ecae2177..e5874f52f 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1244,6 +1244,8 @@ SC_MTF_RANGEATK 567
 SC_MTF_MATK 568
 SC_MTF_MLEATKED 569
 SC_MTF_CRIDAMAGE 570
+SC_MOONSTAR	571
+SC_SUPER_STAR	572
 
 e_gasp	0
 e_what	1
@@ -3220,6 +3222,16 @@ HAVEQUEST	0
 PLAYTIME	1
 HUNTING	2
 
+QTYPE_NONE	0x270f
+QTYPE_QUEST	0x00
+QTYPE_QUEST2	0x01
+QTYPE_JOB	0x02
+QTYPE_JOB2	0x03
+QTYPE_EVENT	0x04
+QTYPE_EVENT2	0x05
+QTYPE_WARG	0x06
+QTYPE_WARG2	0x08
+
 FW_DONTCARE	0
 FW_THIN	100
 FW_EXTRALIGHT	200
diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf
index e85d6c9ed..e31ffd339 100644
--- a/db/pre-re/item_group.conf
+++ b/db/pre-re/item_group.conf
@@ -322,7 +322,7 @@ Old_Card_Album: (
 	("Hell_Poodle_Card",2),
 	("Banshee_Card",2),
 	"Flame_Skull_Card",
-	"Necromancer_Card"
+	"Necromancer_Card",
 )
 Gift_Box: (
 	"Star_Crumb",
@@ -393,7 +393,7 @@ Gift_Box: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_1: (
 	"Star_Crumb",
@@ -464,7 +464,7 @@ Gift_Box_1: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_2: (
 	"Star_Crumb",
@@ -535,7 +535,7 @@ Gift_Box_2: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_3: (
 	"Star_Crumb",
@@ -606,7 +606,7 @@ Gift_Box_3: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_4: (
 	"Star_Crumb",
@@ -677,7 +677,7 @@ Gift_Box_4: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Old_Blue_Box: (
 	("Guard_",3),
@@ -1701,7 +1701,7 @@ Old_Blue_Box: (
 	"Thunder_P",
 	"Long_Barrel",
 	("Lever_Action_Rifle",2),
-	"Long_Barrel_"
+	"Long_Barrel_",
 )
 Old_Violet_Box: (
 	("Buckler_",7),
@@ -2626,7 +2626,7 @@ Old_Violet_Box: (
 	"Thunder_P",
 	"Long_Barrel",
 	("Lever_Action_Rifle",2),
-	"Long_Barrel_"
+	"Long_Barrel_",
 )
 Random_Quiver: (
 	"Iron_Arrow_Container",
@@ -2640,7 +2640,7 @@ Random_Quiver: (
 	"Shadow_Arrow_Container",
 	"Imma_Arrow_Container",
 	"Rusty_Arrow_Container",
-	("Holy_Arrow_Quiver",2)
+	("Holy_Arrow_Quiver",2),
 )
 Set_Of_Taiming_Item: (
 	"Orange_Juice",
@@ -2690,7 +2690,7 @@ Set_Of_Taiming_Item: (
 	"Red_Muffler",
 	"Sword_Of_Grave_Keeper",
 	"Flaming_Ice",
-	"Tantanmen"
+	"Tantanmen",
 )
 Accessory_Box: (
 	("Gold_Ring",14),
@@ -2734,7 +2734,7 @@ Accessory_Box: (
 	"Librarian_Glove",
 	"Pocket_Watch_",
 	"Lunatic_Brooch",
-	"Iron_Wrist"
+	"Iron_Wrist",
 )
 Wrapped_Mask: (
 	("Phantom_Of_Opera",10),
@@ -2749,7 +2749,7 @@ Wrapped_Mask: (
 	("Goblin_Mask_04",10),
 	("Mr_Smile",9),
 	"Zherlthsh_Mask",
-	("Hahoe_Mask",2)
+	("Hahoe_Mask",2),
 )
 Bundle_Of_Magic_Scroll: (
 	"Earth_Scroll_1_5",
@@ -2768,7 +2768,7 @@ Bundle_Of_Magic_Scroll: (
 	"Cold_Scroll_2_1",
 	"Cold_Scroll_2_5",
 	"Holy_Scroll_1_3",
-	"Holy_Scroll_1_5"
+	"Holy_Scroll_1_5",
 )
 Food_Package: (
 	"Candy_Striper",
@@ -2813,7 +2813,7 @@ Food_Package: (
 	"Milk",
 	"Lemon",
 	"Long_Rice_Cake",
-	"Piece_Of_Cake"
+	"Piece_Of_Cake",
 )
 First_Aid_Kit: (
 	("Red_Potion",5),
@@ -2832,7 +2832,7 @@ First_Aid_Kit: (
 	("Berserk_Potion",5),
 	("Novice_Potion",5),
 	("Anodyne",5),
-	("Speed_Up_Potion",5)
+	("Speed_Up_Potion",5),
 )
 Cookie_Bag: (
 	("Lucky_Candy",5),
@@ -2850,12 +2850,12 @@ Cookie_Bag: (
 	"HandMade_Chocolate_",
 	"White_Chocolate",
 	"Chocolate_Drink",
-	("Candy",4)
+	("Candy",4),
 )
 Red_Box_: (
 	("Magic_Eyes",9),
 	("Hibiscus",10),
-	("Charming_Ribbon",10)
+	("Charming_Ribbon",10),
 )
 Egg_Boy: (
 	("Grape",299),
@@ -2864,7 +2864,7 @@ Egg_Boy: (
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
 	("Ghost_Bandana",5),
-	("Inccubus_Horn",2)
+	("Inccubus_Horn",2),
 )
 Egg_Girl: (
 	("Grape",299),
@@ -2873,7 +2873,7 @@ Egg_Girl: (
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
 	("Hair_Protector",5),
-	("Horn_Of_Succubus",2)
+	("Horn_Of_Succubus",2),
 )
 Giftbox_China: (
 	"Orange_Potion",
@@ -3138,7 +3138,7 @@ Giftbox_China: (
 	"Safety_Helmet",
 	"Indian_Hair_Piece",
 	"Fin_Helm",
-	("Egg_Shell",2)
+	("Egg_Shell",2),
 )
 Red_Box: (
 	("Twin_Ribbon",9),
@@ -3154,7 +3154,7 @@ Red_Box: (
 	"Chinese_Crown",
 	("Crescent_Helm",11),
 	("Kabuki_Mask",12),
-	"Cat_Hat"
+	"Cat_Hat",
 )
 Green_Box: (
 	("Str_Dish10",99),
@@ -3167,7 +3167,7 @@ Green_Box: (
 	("Seed_Of_Yggdrasil",100),
 	("Fire_Cracker",100),
 	("Chocolate_Drink",100),
-	"Puppy_Hat"
+	"Puppy_Hat",
 )
 Old_Bleu_Box: (
 	"Cold_Scroll_1_5",
@@ -3179,17 +3179,17 @@ Old_Bleu_Box: (
 	"Cold_Scroll_2_5",
 	"Gift_Box",
 	"Milk",
-	"Well_Baked_Cookie"
+	"Well_Baked_Cookie",
 )
 Old_Yellow_Box: (
 	"Cookie_Hat",
 	"Silver_Tiara_",
-	"Gold_Tiara_"
+	"Gold_Tiara_",
 )
 Old_Gift_Box: (
 	("Chinese_Crown_",14),
 	("Tongue_Mask_",40),
-	("Fallen_Leaves_",45)
+	("Fallen_Leaves_",45),
 )
 Magic_Card_Album: (
 	"Angeling_Card",
@@ -3221,13 +3221,13 @@ Magic_Card_Album: (
 	"Hydro_Card",
 	("Tha_Maero_Card",3),
 	("Tha_Odium_Card",3),
-	("Tha_Despero_Card",3)
+	("Tha_Despero_Card",3),
 )
 Masquerade_Ball_Box: (
 	("Drooping_Nine_Tail_",9),
 	"Soulless_Wing_",
 	("Marvelous_Wig_",10),
-	("Ati_Atihan_Hat_",10)
+	("Ati_Atihan_Hat_",10),
 )
 Easter_Scroll: (
 	("Silver_Knife_Of_Chaste",109),
@@ -3243,7 +3243,7 @@ Easter_Scroll: (
 	"Bongun_Hat",
 	"Munak_Turban_",
 	"Bongun_Hat_",
-	"Ghost_Bandana"
+	"Ghost_Bandana",
 )
 Tresure_Box_WoE: (
 	("Wind_Arrow_Container",23),
@@ -3265,17 +3265,17 @@ Tresure_Box_WoE: (
 	("Wrapped_Mask",2),
 	("Poison_Bottle",3),
 	("Old_Blue_Box",6),
-	("Crystal_Jewel__",9)
+	("Crystal_Jewel__",9),
 )
 Masquerade_Ball_Box2: (
 	("Black_Bunny_Band",12),
 	("Vanilmirth_Hat",10),
 	("Cap_Of_Blindness",10),
-	"Dress_Hat"
+	"Dress_Hat",
 )
 Louise_Costume_Box: (
 	("Red_Bag",16),
-	("Cool_Summer_Outfit",2)
+	("Cool_Summer_Outfit",2),
 )
 Xmas_Gift: (
 	("Fire_Cracker_Love",6),
@@ -3296,7 +3296,7 @@ Xmas_Gift: (
 	("HandMade_Chocolate_",18),
 	("Chocolate_Drink",18),
 	("Santa's_Hat_",12),
-	("Fire_Cracker_Xmas",4)
+	("Fire_Cracker_Xmas",4),
 )
 Pierre_Treasurebox: (
 	("Scarlet_Dyestuffs",3),
@@ -3326,17 +3326,17 @@ Pierre_Treasurebox: (
 	("Gift_Box",3),
 	("Old_Blue_Box",11),
 	("Fire_Cracker",2),
-	"Bloody_Dead_Branch"
+	"Bloody_Dead_Branch",
 )
 Cherish_Box: (
 	("Geographer_Band_",4),
-	("Vacation_Hat_",5)
+	("Vacation_Hat_",5),
 )
 Cherish_Box_Ori: (
 	("Satellite_Hairband",2),
 	("Pirate_Dagger",2),
 	("Loki_Mask",2),
-	("Ragnarok_Limited_Ed",3)
+	("Ragnarok_Limited_Ed",3),
 )
 Splendid_Box: (
 //unknown/unsupported - 	("2153",2),
@@ -3361,10 +3361,10 @@ Splendid_Box: (
 //unknown/unsupported - 	("13061",2),
 	("Ruber",2),
 	("Erde",2),
-	("Red_Square_Bag",2)
+	("Red_Square_Bag",2),
 //unknown/unsupported - 	("16003",2),
 //unknown/unsupported - 	("16010",2),
-//unknown/unsupported - 	("18103",2)
+//unknown/unsupported - 	("18103",2),
 )
 /* currently unsupported or unknown ('Old_C_Album_Armor')
 Old_C_Album_Armor: (
@@ -3441,7 +3441,7 @@ Old_C_Album_Armor: (
 	("Echio_Card",2),
 	("Byorgue_Card",2),
 	("Banshee_Master_Card",2),
-//unknown/unsupported - 	"4462"
+//unknown/unsupported - 	"4462",
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Helm')
@@ -3489,7 +3489,7 @@ Old_C_Album_Helm: (
 //unknown/unsupported - 	"4459",
 //unknown/unsupported - 	"4460",
 //unknown/unsupported - 	"4461",
-//unknown/unsupported - 	"4468"
+//unknown/unsupported - 	"4468",
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Acc')
@@ -3565,7 +3565,7 @@ Old_C_Album_Acc: (
 	("Stapo_Card",2),
 	("Imp_Card",2),
 	("Ragged_Zombie_Card",2),
-	("Hell_Poodle_Card",2)
+	("Hell_Poodle_Card",2),
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Shoes')
@@ -3600,7 +3600,7 @@ Old_C_Album_Shoes: (
 	("Tha_Odium_Card",2),
 	("Ice_Titan_Card",2),
 	("Zombie_Slaughter_Card",2),
-//unknown/unsupported - 	"4467"
+//unknown/unsupported - 	"4467",
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Shield')
@@ -3645,7 +3645,7 @@ Old_C_Album_Shield: (
 	("Luciola_Vespa_Card",2),
 	("Centipede_Card",2),
 	("Cornus_Card",2),
-	("Dark_Shadow_Card",2)
+	("Dark_Shadow_Card",2),
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Garment')
@@ -3686,7 +3686,7 @@ Old_C_Album_Garment: (
 	("Roween_Card",2),
 	("Salamander_Card",2),
 	("Kasa_Card",2),
-	("Magmaring_Card",2)
+	("Magmaring_Card",2),
 )
 */
 /* currently unsupported or unknown ('Old_C_Album_Weapon')
@@ -3807,7 +3807,7 @@ Old_C_Album_Weapon: (
 //unknown/unsupported - 	"4474",
 //unknown/unsupported - 	"4475",
 //unknown/unsupported - 	"4476",
-//unknown/unsupported - 	"4477"
+//unknown/unsupported - 	"4477",
 )
 */
 /* currently unsupported or unknown ('Splendid_Box2')
@@ -3853,7 +3853,7 @@ Splendid_Box2: (
 	"Black_Leather_Boots_",
 	"Variant_Shoes",
 	"Twin_Edge_B",
-	"Twin_Edge_R"
+	"Twin_Edge_R",
 )
 */
 /* currently unsupported or unknown ('Mysterious_Egg')
@@ -3863,7 +3863,7 @@ Mysterious_Egg: (
 	("Lucky_Egg_C4",3),
 	("Lucky_Egg_C5",3),
 	("Lucky_Egg_C6",3),
-	("Lucky_Egg_C",2)
+	("Lucky_Egg_C",2),
 )
 */
 /* currently unsupported or unknown ('High_Weapon_Box')
@@ -4049,7 +4049,7 @@ High_Weapon_Box: (
 //unknown/unsupported - 	"16017",
 //unknown/unsupported - 	"18109",
 //unknown/unsupported - 	"18110",
-//unknown/unsupported - 	"18111"
+//unknown/unsupported - 	"18111",
 )
 */
 /* currently unsupported or unknown ('Ink_Ball')
@@ -4067,7 +4067,7 @@ Ink_Ball: (
 	"Accessory_Box",
 	"Wrapped_Mask",
 	"Old_Card_Album",
-	("Crystal_Blue",20)
+	("Crystal_Blue",20),
 )
 */
 /* currently unsupported or unknown ('God_Material_Box')
@@ -4090,7 +4090,7 @@ God_Material_Box: (
 	"Indication_Of_Tempest",
 	"Slilince_Wave",
 	"Rough_Billows",
-	"Air_Stream"
+	"Air_Stream",
 )
 */
 /* currently unsupported or unknown ('Sg_Weapon_Supply_Box')
@@ -4113,7 +4113,7 @@ Sg_Weapon_Supply_Box: (
 //unknown/unsupported - 	("1436",8),
 //unknown/unsupported - 	("12677",13),
 //unknown/unsupported - 	("12678",13),
-//unknown/unsupported - 	("1293",2)
+//unknown/unsupported - 	("1293",2),
 )
 */
 /* currently unsupported or unknown ('Old_Card_Album_')
@@ -4483,7 +4483,7 @@ Old_Card_Album_: (
 	("Hell_Poodle_Card",2),
 	("Banshee_Card",2),
 	"Flame_Skull_Card",
-	"Necromancer_Card"
+	"Necromancer_Card",
 )
 */
 /* currently unsupported or unknown ('High_Weapon_Box_')
@@ -4669,7 +4669,7 @@ High_Weapon_Box_: (
 //unknown/unsupported - 	"16017",
 //unknown/unsupported - 	"18109",
 //unknown/unsupported - 	"18110",
-//unknown/unsupported - 	"18111"
+//unknown/unsupported - 	"18111",
 )
 */
 Holy_Egg_2: (
@@ -4681,7 +4681,7 @@ Holy_Egg_2: (
 	("Seed_Of_Yggdrasil",2),
 	("Leaf_Of_Yggdrasil",15),
 	("Old_Card_Album",5),
-	"Drooping_Bunny"
+	"Drooping_Bunny",
 )
 /* currently unsupported or unknown ('Candy_Holder')
 Candy_Holder: (
@@ -4697,7 +4697,7 @@ Candy_Holder: (
 	"Contracts_In_Shadow",
 	("Niflheim_Ticket",10),
 //unknown/unsupported - 	("11550",5),
-	("Pumpkin_Pie",5)
+	("Pumpkin_Pie",5),
 )
 */
 Lotto_Box01: (
@@ -4708,7 +4708,7 @@ Lotto_Box01: (
 	"Lotto06",
 	"Lotto07",
 	"Lotto08",
-	"Lotto09"
+	"Lotto09",
 )
 Lotto_Box02: (
 	"Lotto11",
@@ -4718,7 +4718,7 @@ Lotto_Box02: (
 	"Lotto15",
 	"Lotto16",
 	"Lotto17",
-	"Lotto18"
+	"Lotto18",
 )
 Lotto_Box03: (
 	"Lotto20",
@@ -4728,7 +4728,7 @@ Lotto_Box03: (
 	"Lotto24",
 	"Lotto25",
 	"Lotto26",
-	"Lotto27"
+	"Lotto27",
 )
 Lotto_Box04: (
 	"Lotto29",
@@ -4738,7 +4738,7 @@ Lotto_Box04: (
 	"Lotto33",
 	"Lotto34",
 	"Lotto35",
-	"Lotto36"
+	"Lotto36",
 )
 Lotto_Box05: (
 	"Lotto38",
@@ -4748,7 +4748,7 @@ Lotto_Box05: (
 	"Lotto42",
 	"Lotto43",
 	"Lotto44",
-	"Lotto45"
+	"Lotto45",
 )
 /* currently unsupported or unknown ('Lucky_Bag')
 Lucky_Bag: (
@@ -4756,6 +4756,6 @@ Lucky_Bag: (
 	("Korea_Rice_Cake",6),
 	("Handsei",2),
 //unknown/unsupported - 	("7647",3),
-//unknown/unsupported - 	"7649"
+//unknown/unsupported - 	"7649",
 )
 */
diff --git a/db/pre-re/map_zone_db.conf b/db/pre-re/map_zone_db.conf
index 3bc0fd95e..e6571702a 100644
--- a/db/pre-re/map_zone_db.conf
+++ b/db/pre-re/map_zone_db.conf
@@ -42,7 +42,8 @@ zones: (
 		//ID501: true
 	}
 	
-	mapflags: ( )
+	mapflags: (
+	)
 	
 	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
 	disabled_commands: {
@@ -72,7 +73,8 @@ zones: (
 	disabled_items: {
 	
 	}
-	mapflags: ( )
+	mapflags: (
+	)
 	
 },
 {
@@ -88,7 +90,9 @@ zones: (
 		Greed_Scroll: true
 	}
 	
-	mapflags: ( "nocashshop" )
+	mapflags: (
+		"nocashshop",
+	)
 	
 },
 {
@@ -115,7 +119,8 @@ zones: (
 		"magic_damage_rate	60",
 		"misc_damage_rate	60",
 		"long_damage_rate	70",
-		"short_damage_rate	80" )
+		"short_damage_rate	80",
+	)
 },
 {
 	/* GvG zone is applied to all maps with a gvg mapflag */
@@ -154,15 +159,16 @@ zones: (
 	/* - misc_damage_rate   -40% */
 	/* - long_damage_rate   -20% */
 	/* - short_damage_rate  -20% */
-	mapflags: ( "invincible_time_inc	5000",
-				"noknockback",
-				"weapon_damage_rate	60",
-				"magic_damage_rate	60",
-				"misc_damage_rate	60",
-				"long_damage_rate	80",
-				"short_damage_rate	80",
-				"nocashshop"
-				)
+	mapflags: (
+		"invincible_time_inc	5000",
+		"noknockback",
+		"weapon_damage_rate	60",
+		"magic_damage_rate	60",
+		"misc_damage_rate	60",
+		"long_damage_rate	80",
+		"short_damage_rate	80",
+		"nocashshop",
+	)
 	
 },
 {
@@ -216,12 +222,14 @@ zones: (
 	/* - misc_damage_rate   -30% */
 	/* - long_damage_rate   -25% */
 	/* - short_damage_rate  -25% */
-	mapflags: ( "noknockback",
-				"weapon_damage_rate	70",
-				"magic_damage_rate	70",
-				"misc_damage_rate	70",
-				"long_damage_rate	75",
-				"short_damage_rate	75" )
+	mapflags: (
+		"noknockback",
+		"weapon_damage_rate	70",
+		"magic_damage_rate	70",
+		"misc_damage_rate	70",
+		"long_damage_rate	75",
+		"short_damage_rate	75",
+	)
 
 },
 {
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 870fbfd60..5825034c8 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -8159,9 +8159,9 @@
 18737,Fortier_Mask,Fortier Masque,5,20,,200,,0,,0,0xFFFFFFFF,7,2,512,,10,0,876,{ bonus bUnbreakableHelm,0; },{},{}
 18739,Carnation_Hairband,Carnation Hairband,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,878,{ bonus bLuk,1; },{},{}
 18740,Hair_Of_The_Strong,RMSC2012 Special Costume,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,879,{},{},{}
-18742,C_MoonStar_Accessory,Moon and Stars,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,0,{},{},{}
+18742,C_MoonStar_Accessory,Moon and Stars,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,881,{},{ sc_start SC_MOONSTAR,-1,0; },{ sc_end SC_MOONSTAR; }
 18743,Spirit_Of_Chung_E,Spirit Of Chung E,5,20,,0,,0,,0,0xFFFFFFFF,7,2,1024,,0,0,882,{},{},{}
-18744,C_World_Star,Twilight,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,0,{},{},{}
+18744,C_World_Star,Twilight,5,20,,0,,0,,0,0xFFFFFFFF,7,2,2048,,0,0,883,{},{ sc_start SC_SUPER_STAR,-1,0; },{ sc_end SC_SUPER_STAR; }
 18745,Choco_Stick_In_Mouth,Choco Stick In Mouth,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,884,{},{},{}
 18746,Chilly_Breath,Chilly Breath,5,20,,100,,0,,0,0xFFFFFFFF,7,2,1,,10,0,885,{ bonus bInt,1; },{},{}
 18747,Eyes_Of_Ifrit,Eyes Of Ifrit,5,20,,100,,1,,1,0xFFFFFFFF,7,2,512,,0,0,886,{ bonus bDex,1; },{},{}
diff --git a/db/re/item_group.conf b/db/re/item_group.conf
index 85d2610fb..9bf1db66d 100644
--- a/db/re/item_group.conf
+++ b/db/re/item_group.conf
@@ -322,7 +322,7 @@ Old_Card_Album: (
 	("Hell_Poodle_Card",2),
 	("Banshee_Card",2),
 	"Flame_Skull_Card",
-	"Necromancer_Card"
+	"Necromancer_Card",
 )
 Gift_Box: (
 	"Star_Crumb",
@@ -393,7 +393,7 @@ Gift_Box: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_1: (
 	"Star_Crumb",
@@ -464,7 +464,7 @@ Gift_Box_1: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_2: (
 	"Star_Crumb",
@@ -535,7 +535,7 @@ Gift_Box_2: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_3: (
 	"Star_Crumb",
@@ -606,7 +606,7 @@ Gift_Box_3: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Gift_Box_4: (
 	"Star_Crumb",
@@ -677,7 +677,7 @@ Gift_Box_4: (
 	"Piece_Of_Cake",
 	"Old_Violet_Box",
 	("Gift_Box",19),
-	"Girl's_Diary"
+	"Girl's_Diary",
 )
 Old_Blue_Box: (
 	("Guard_",3),
@@ -1701,7 +1701,7 @@ Old_Blue_Box: (
 	"Thunder_P",
 	"Long_Barrel",
 	("Lever_Action_Rifle",2),
-	"Long_Barrel_"
+	"Long_Barrel_",
 )
 Old_Violet_Box: (
 	("Buckler_",7),
@@ -2626,7 +2626,7 @@ Old_Violet_Box: (
 	"Thunder_P",
 	"Long_Barrel",
 	("Lever_Action_Rifle",2),
-	"Long_Barrel_"
+	"Long_Barrel_",
 )
 Random_Quiver: (
 	"Iron_Arrow_Container",
@@ -2640,7 +2640,7 @@ Random_Quiver: (
 	"Shadow_Arrow_Container",
 	"Imma_Arrow_Container",
 	"Rusty_Arrow_Container",
-	("Holy_Arrow_Quiver",2)
+	("Holy_Arrow_Quiver",2),
 )
 Set_Of_Taiming_Item: (
 	"Orange_Juice",
@@ -2690,7 +2690,7 @@ Set_Of_Taiming_Item: (
 	"Red_Muffler",
 	"Sword_Of_Grave_Keeper",
 	"Flaming_Ice",
-	"Tantanmen"
+	"Tantanmen",
 )
 Accessory_Box: (
 	("Gold_Ring",14),
@@ -2734,7 +2734,7 @@ Accessory_Box: (
 	"Librarian_Glove",
 	"Pocket_Watch_",
 	"Lunatic_Brooch",
-	"Iron_Wrist"
+	"Iron_Wrist",
 )
 Wrapped_Mask: (
 	("Phantom_Of_Opera",10),
@@ -2749,7 +2749,7 @@ Wrapped_Mask: (
 	("Goblin_Mask_04",10),
 	("Mr_Smile",9),
 	"Zherlthsh_Mask",
-	("Hahoe_Mask",2)
+	("Hahoe_Mask",2),
 )
 Bundle_Of_Magic_Scroll: (
 	"Earth_Scroll_1_5",
@@ -2768,7 +2768,7 @@ Bundle_Of_Magic_Scroll: (
 	"Cold_Scroll_2_1",
 	"Cold_Scroll_2_5",
 	"Holy_Scroll_1_3",
-	"Holy_Scroll_1_5"
+	"Holy_Scroll_1_5",
 )
 Food_Package: (
 	"Candy_Striper",
@@ -2813,7 +2813,7 @@ Food_Package: (
 	"Milk",
 	"Lemon",
 	"Long_Rice_Cake",
-	"Piece_Of_Cake"
+	"Piece_Of_Cake",
 )
 First_Aid_Kit: (
 	("Red_Potion",5),
@@ -2832,7 +2832,7 @@ First_Aid_Kit: (
 	("Berserk_Potion",5),
 	("Novice_Potion",5),
 	("Anodyne",5),
-	("Speed_Up_Potion",5)
+	("Speed_Up_Potion",5),
 )
 Cookie_Bag: (
 	("Lucky_Candy",5),
@@ -2850,12 +2850,12 @@ Cookie_Bag: (
 	"HandMade_Chocolate_",
 	"White_Chocolate",
 	"Chocolate_Drink",
-	("Candy",4)
+	("Candy",4),
 )
 Red_Box_: (
 	("Magic_Eyes",9),
 	("Hibiscus",10),
-	("Charming_Ribbon",10)
+	("Charming_Ribbon",10),
 )
 Egg_Boy: (
 	("Grape",299),
@@ -2864,7 +2864,7 @@ Egg_Boy: (
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
 	("Ghost_Bandana",5),
-	("Inccubus_Horn",2)
+	("Inccubus_Horn",2),
 )
 Egg_Girl: (
 	("Grape",299),
@@ -2873,7 +2873,7 @@ Egg_Girl: (
 	("Realgar_Wine",100),
 	("Exorcize_Herb",50),
 	("Hair_Protector",5),
-	("Horn_Of_Succubus",2)
+	("Horn_Of_Succubus",2),
 )
 Giftbox_China: (
 	"Orange_Potion",
@@ -3138,7 +3138,7 @@ Giftbox_China: (
 	"Safety_Helmet",
 	"Indian_Hair_Piece",
 	"Fin_Helm",
-	("Egg_Shell",2)
+	("Egg_Shell",2),
 )
 Red_Box: (
 	("Twin_Ribbon",9),
@@ -3154,7 +3154,7 @@ Red_Box: (
 	"Chinese_Crown",
 	("Crescent_Helm",11),
 	("Kabuki_Mask",12),
-	"Cat_Hat"
+	"Cat_Hat",
 )
 Green_Box: (
 	("Str_Dish10",99),
@@ -3167,7 +3167,7 @@ Green_Box: (
 	("Seed_Of_Yggdrasil",100),
 	("Fire_Cracker",100),
 	("Chocolate_Drink",100),
-	"Puppy_Hat"
+	"Puppy_Hat",
 )
 Old_Bleu_Box: (
 	"Cold_Scroll_1_5",
@@ -3179,17 +3179,17 @@ Old_Bleu_Box: (
 	"Cold_Scroll_2_5",
 	"Gift_Box",
 	"Milk",
-	"Well_Baked_Cookie"
+	"Well_Baked_Cookie",
 )
 Old_Yellow_Box: (
 	"Cookie_Hat",
 	"Silver_Tiara_",
-	"Gold_Tiara_"
+	"Gold_Tiara_",
 )
 Old_Gift_Box: (
 	("Chinese_Crown_",14),
 	("Tongue_Mask_",40),
-	("Fallen_Leaves_",45)
+	("Fallen_Leaves_",45),
 )
 Magic_Card_Album: (
 	"Angeling_Card",
@@ -3221,18 +3221,18 @@ Magic_Card_Album: (
 	"Hydro_Card",
 	("Tha_Maero_Card",3),
 	("Tha_Odium_Card",3),
-	("Tha_Despero_Card",3)
+	("Tha_Despero_Card",3),
 )
 /* currently unsupported or unknown ('Hometown_Gift')
 Hometown_Gift: (
-	("0",7)
+	("0",7),
 )
 */
 Masquerade_Ball_Box: (
 	("Drooping_Nine_Tail_",9),
 	"Soulless_Wing_",
 	("Marvelous_Wig_",10),
-	("Ati_Atihan_Hat_",10)
+	("Ati_Atihan_Hat_",10),
 )
 Easter_Scroll: (
 	("Silver_Knife_Of_Chaste",109),
@@ -3248,7 +3248,7 @@ Easter_Scroll: (
 	"Bongun_Hat",
 	"Munak_Turban_",
 	"Bongun_Hat_",
-	"Ghost_Bandana"
+	"Ghost_Bandana",
 )
 Tresure_Box_WoE: (
 	("Wind_Arrow_Container",23),
@@ -3270,17 +3270,17 @@ Tresure_Box_WoE: (
 	("Wrapped_Mask",2),
 	("Poison_Bottle",3),
 	("Old_Blue_Box",6),
-	("Crystal_Jewel__",9)
+	("Crystal_Jewel__",9),
 )
 Masquerade_Ball_Box2: (
 	("Black_Bunny_Band",12),
 	("Vanilmirth_Hat",10),
 	("Cap_Of_Blindness",10),
-	"Dress_Hat"
+	"Dress_Hat",
 )
 Louise_Costume_Box: (
 	("Red_Bag",16),
-	("Cool_Summer_Outfit",2)
+	("Cool_Summer_Outfit",2),
 )
 Xmas_Gift: (
 	("Fire_Cracker_Love",6),
@@ -3301,7 +3301,7 @@ Xmas_Gift: (
 	("HandMade_Chocolate_",18),
 	("Chocolate_Drink",18),
 	("Santa's_Hat_",12),
-	("Fire_Cracker_Xmas",4)
+	("Fire_Cracker_Xmas",4),
 )
 Pierre_Treasurebox: (
 	("Scarlet_Dyestuffs",3),
@@ -3331,17 +3331,17 @@ Pierre_Treasurebox: (
 	("Gift_Box",3),
 	("Old_Blue_Box",11),
 	("Fire_Cracker",2),
-	"Bloody_Dead_Branch"
+	"Bloody_Dead_Branch",
 )
 Cherish_Box: (
 	("Geographer_Band_",4),
-	("Vacation_Hat_",5)
+	("Vacation_Hat_",5),
 )
 Cherish_Box_Ori: (
 	("Satellite_Hairband",2),
 	("Pirate_Dagger",2),
 	("Loki_Mask",2),
-	("Ragnarok_Limited_Ed",3)
+	("Ragnarok_Limited_Ed",3),
 )
 Splendid_Box: (
 	("Imperial_Guard",2),
@@ -3369,7 +3369,7 @@ Splendid_Box: (
 	("Red_Square_Bag",2),
 	("Carga_Mace",2),
 	("Red_Ether_Bag",2),
-	("Mystic_Bow",2)
+	("Mystic_Bow",2),
 )
 Old_C_Album_Armor: (
 	("Pupa_Card",2),
@@ -3445,7 +3445,7 @@ Old_C_Album_Armor: (
 	("Echio_Card",2),
 	("Byorgue_Card",2),
 	("Banshee_Master_Card",2),
-	"Hardrock_Mommos_Card"
+	"Hardrock_Mommos_Card",
 )
 Old_C_Album_Helm: (
 	("Stainer_Card",2),
@@ -3491,7 +3491,7 @@ Old_C_Album_Helm: (
 	"Lata_Card",
 	"Ringco_Card",
 	"Pillar_Card",
-	"Pinguicula_Dark_Card"
+	"Pinguicula_Dark_Card",
 )
 Old_C_Album_Acc: (
 	("Kukre_Card",2),
@@ -3565,7 +3565,7 @@ Old_C_Album_Acc: (
 	("Stapo_Card",2),
 	("Imp_Card",2),
 	("Ragged_Zombie_Card",2),
-	("Hell_Poodle_Card",2)
+	("Hell_Poodle_Card",2),
 )
 Old_C_Album_Shoes: (
 	("Zombie_Card",2),
@@ -3598,7 +3598,7 @@ Old_C_Album_Shoes: (
 	("Tha_Odium_Card",2),
 	("Ice_Titan_Card",2),
 	("Zombie_Slaughter_Card",2),
-	"Heavy_Metaling_Card"
+	"Heavy_Metaling_Card",
 )
 Old_C_Album_Shield: (
 	("Andre_Egg_Card",2),
@@ -3641,7 +3641,7 @@ Old_C_Album_Shield: (
 	("Luciola_Vespa_Card",2),
 	("Centipede_Card",2),
 	("Cornus_Card",2),
-	("Dark_Shadow_Card",2)
+	("Dark_Shadow_Card",2),
 )
 Old_C_Album_Garment: (
 	("Dustiness_Card",2),
@@ -3680,7 +3680,7 @@ Old_C_Album_Garment: (
 	("Roween_Card",2),
 	("Salamander_Card",2),
 	("Kasa_Card",2),
-	("Magmaring_Card",2)
+	("Magmaring_Card",2),
 )
 Old_C_Album_Weapon: (
 	("Drops_Card",2),
@@ -3799,7 +3799,7 @@ Old_C_Album_Weapon: (
 	"Jakudam_Card",
 	"Cobalt_Mineral_Card",
 	"Pinguicula_Card",
-	"Hell_Apocalips_Card"
+	"Hell_Apocalips_Card",
 )
 /* currently unsupported or unknown ('Splendid_Box2')
 Splendid_Box2: (
@@ -3844,7 +3844,7 @@ Splendid_Box2: (
 	"Black_Leather_Boots_",
 	"Variant_Shoes",
 	"Twin_Edge_B",
-	"Twin_Edge_R"
+	"Twin_Edge_R",
 )
 */
 /* currently unsupported or unknown ('Mysterious_Egg')
@@ -3854,7 +3854,7 @@ Mysterious_Egg: (
 	("Lucky_Egg_C4",3),
 	("Lucky_Egg_C5",3),
 	("Lucky_Egg_C6",3),
-	("Lucky_Egg_C",2)
+	("Lucky_Egg_C",2),
 )
 */
 High_Weapon_Box: (
@@ -4039,7 +4039,7 @@ High_Weapon_Box: (
 	"Bloody_Cross",
 	"Catapult",
 	"Big_CrossBow",
-	"Creeper_Bow"
+	"Creeper_Bow",
 )
 Ink_Ball: (
 	("Jellopy",39),
@@ -4055,7 +4055,7 @@ Ink_Ball: (
 	"Accessory_Box",
 	"Wrapped_Mask",
 	"Old_Card_Album",
-	("Crystal_Blue",20)
+	("Crystal_Blue",20),
 )
 /* currently unsupported or unknown ('God_Material_Box')
 God_Material_Box: (
@@ -4077,7 +4077,7 @@ God_Material_Box: (
 	"Indication_Of_Tempest",
 	"Slilince_Wave",
 	"Rough_Billows",
-	"Air_Stream"
+	"Air_Stream",
 )
 */
 /* currently unsupported or unknown ('Sg_Weapon_Supply_Box')
@@ -4100,7 +4100,7 @@ Sg_Weapon_Supply_Box: (
 	("Velum_Spear",8),
 //unknown/unsupported - 	("12677",13),
 //unknown/unsupported - 	("12678",13),
-	("Velum_Jamadhar",2)
+	("Velum_Jamadhar",2),
 )
 */
 /* currently unsupported or unknown ('Old_Card_Album_')
@@ -4470,7 +4470,7 @@ Old_Card_Album_: (
 	("Hell_Poodle_Card",2),
 	("Banshee_Card",2),
 	"Flame_Skull_Card",
-	"Necromancer_Card"
+	"Necromancer_Card",
 )
 */
 High_Weapon_Box_: (
@@ -4655,7 +4655,7 @@ High_Weapon_Box_: (
 	"Bloody_Cross",
 	"Catapult",
 	"Big_CrossBow",
-	"Creeper_Bow"
+	"Creeper_Bow",
 )
 Holy_Egg_2: (
 	("Oridecon",3),
@@ -4666,7 +4666,7 @@ Holy_Egg_2: (
 	("Seed_Of_Yggdrasil",2),
 	("Leaf_Of_Yggdrasil",15),
 	("Old_Card_Album",5),
-	"Drooping_Bunny"
+	"Drooping_Bunny",
 )
 Candy_Holder: (
 	("Honey",9),
@@ -4681,7 +4681,7 @@ Candy_Holder: (
 	"Contracts_In_Shadow",
 	("Niflheim_Ticket",10),
 	("Pumpkin_Cake",5),
-	("Pumpkin_Pie",5)
+	("Pumpkin_Pie",5),
 )
 Lotto_Box01: (
 	"Lotto02",
@@ -4691,7 +4691,7 @@ Lotto_Box01: (
 	"Lotto06",
 	"Lotto07",
 	"Lotto08",
-	"Lotto09"
+	"Lotto09",
 )
 Lotto_Box02: (
 	"Lotto11",
@@ -4701,7 +4701,7 @@ Lotto_Box02: (
 	"Lotto15",
 	"Lotto16",
 	"Lotto17",
-	"Lotto18"
+	"Lotto18",
 )
 Lotto_Box03: (
 	"Lotto20",
@@ -4711,7 +4711,7 @@ Lotto_Box03: (
 	"Lotto24",
 	"Lotto25",
 	"Lotto26",
-	"Lotto27"
+	"Lotto27",
 )
 Lotto_Box04: (
 	"Lotto29",
@@ -4721,7 +4721,7 @@ Lotto_Box04: (
 	"Lotto33",
 	"Lotto34",
 	"Lotto35",
-	"Lotto36"
+	"Lotto36",
 )
 Lotto_Box05: (
 	"Lotto38",
@@ -4731,7 +4731,7 @@ Lotto_Box05: (
 	"Lotto42",
 	"Lotto43",
 	"Lotto44",
-	"Lotto45"
+	"Lotto45",
 )
 /* currently unsupported or unknown ('Lucky_Bag')
 Lucky_Bag: (
@@ -4739,6 +4739,6 @@ Lucky_Bag: (
 	("Korea_Rice_Cake",6),
 	("Handsei",2),
 	("Taiwan_Luk_Coin",3),
-	"Big_Luk_Bookmark"
+	"Big_Luk_Bookmark",
 )
 */
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 7a8331216..1f505b5ab 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -42,7 +42,8 @@ zones: (
 		//ID501: true
 	}
 	
-	mapflags: ( )
+	mapflags: (
+	)
 	
 	/* "command:min-group-lv-to-override" e.g. "heal: 70" */
 	disabled_commands: {
@@ -72,7 +73,8 @@ zones: (
 	disabled_items: {
 	
 	}
-	mapflags: ( )
+	mapflags: (
+	)
 	
 },
 {
@@ -89,7 +91,9 @@ zones: (
 	}
 	
 	/* cashshop disabled in pvp maps */
-	mapflags: ( "nocashshop" )
+	mapflags: (
+		"nocashshop",
+	)
 },
 {
 	/* PK Mode zone is only used when server is on pk_mode (battle.conf),
@@ -115,7 +119,8 @@ zones: (
 		"magic_damage_rate	60",
 		"misc_damage_rate	60",
 		"long_damage_rate	70",
-		"short_damage_rate	80" )
+		"short_damage_rate	80",
+	)
 },
 {
 	/* GvG zone is applied to all maps with a gvg mapflag */
@@ -154,15 +159,16 @@ zones: (
 	/* - misc_damage_rate   -40% */
 	/* - long_damage_rate   -20% */
 	/* - short_damage_rate  -20% */
-	mapflags: ( "invincible_time_inc	5000",
-				"noknockback",
-				"weapon_damage_rate	60",
-				"magic_damage_rate	60",
-				"misc_damage_rate	60",
-				"long_damage_rate	80",
-				"short_damage_rate	80",
-				"nocashshop"
-				)
+	mapflags: (
+		"invincible_time_inc	5000",
+		"noknockback",
+		"weapon_damage_rate	60",
+		"magic_damage_rate	60",
+		"misc_damage_rate	60",
+		"long_damage_rate	80",
+		"short_damage_rate	80",
+		"nocashshop",
+	)
 	
 },
 {
@@ -216,12 +222,14 @@ zones: (
 	/* - misc_damage_rate   -30% */
 	/* - long_damage_rate   -25% */
 	/* - short_damage_rate  -25% */
-	mapflags: ( "noknockback",
-				"weapon_damage_rate	70",
-				"magic_damage_rate	70",
-				"misc_damage_rate	70",
-				"long_damage_rate	75",
-				"short_damage_rate	75" )
+	mapflags: (
+		"noknockback",
+		"weapon_damage_rate	70",
+		"magic_damage_rate	70",
+		"misc_damage_rate	70",
+		"long_damage_rate	75",
+		"short_damage_rate	75",
+	)
 
 },
 {
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 1adfec6ca..9e0b8b268 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -420,3 +420,5 @@ SC_FORTUNE, 79
 SC_SERVICEFORYOU, 79
 SC_INCHIT, 77
 SC_PUSH_CART, 0x4D
+SC_MOONSTAR, 79
+SC_SUPER_STAR, 79