Added support for trailing commas within libconfig lists

- Follow-up to 62c5e65d28833c1068d195778c0e3a710acaa104, special thanks
  to Ind
- A trailing comma in a libconfig list (enclosed in parentheses) will no
  longer cause a parse error.
- Updated config files where it makes sense to put a trailing comma

Signed-off-by: Haru <haru@dotalux.com>

6 files changed, 233 insertions, 210 deletions

diff --git a/3rdparty/libconfig/extra/gen/grammar.y b/3rdparty/libconfig/extra/gen/grammar.y
index 576241c01..026547a17 100644
--- a/3rdparty/libconfig/extra/gen/grammar.y
+++ b/3rdparty/libconfig/extra/gen/grammar.y
@@ -354,9 +354,13 @@ simple_value:
   }
   ;
 
-value_list:
+value_list_sub:
     value
-  | value_list TOK_COMMA value
+  | value_list_sub TOK_COMMA value
+  ;
+
+value_list:
+    value_list_sub comma_optional
   ;
 
 value_list_optional:
diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c
index 47fb7b5dd..3595578de 100644
--- a/3rdparty/libconfig/grammar.c
+++ b/3rdparty/libconfig/grammar.c
@@ -445,16 +445,16 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  6
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   36
+#define YYLAST   37
 
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  23
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  22
+#define YYNNTS  23
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  42
+#define YYNRULES  43
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  49
+#define YYNSTATES  51
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -504,8 +504,8 @@ static const yytype_uint8 yyprhs[] =
        0,     0,     3,     4,     6,     8,    11,    12,    14,    15,
       17,    19,    20,    22,    23,    29,    30,    35,    36,    41,
       43,    45,    47,    49,    51,    54,    56,    58,    60,    62,
-      64,    66,    68,    70,    74,    75,    77,    79,    83,    86,
-      87,    89,    90
+      64,    66,    68,    70,    74,    77,    78,    80,    82,    86,
+      89,    90,    92,    93
 };
 
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -514,13 +514,13 @@ static const yytype_int8 yyrhs[] =
       24,     0,    -1,    -1,    25,    -1,    29,    -1,    25,    29,
       -1,    -1,    25,    -1,    -1,    20,    -1,    17,    -1,    -1,
       17,    -1,    -1,    10,    30,    11,    35,    27,    -1,    -1,
-      13,    32,    42,    14,    -1,    -1,    15,    34,    39,    16,
-      -1,    37,    -1,    31,    -1,    33,    -1,    43,    -1,     9,
+      13,    32,    43,    14,    -1,    -1,    15,    34,    40,    16,
+      -1,    37,    -1,    31,    -1,    33,    -1,    44,    -1,     9,
       -1,    36,     9,    -1,     3,    -1,     4,    -1,     6,    -1,
        5,    -1,     7,    -1,     8,    -1,    36,    -1,    35,    -1,
-      38,    17,    35,    -1,    -1,    38,    -1,    37,    -1,    40,
-      17,    37,    -1,    40,    28,    -1,    -1,    41,    -1,    -1,
-      18,    44,    26,    19,    -1
+      38,    17,    35,    -1,    38,    28,    -1,    -1,    39,    -1,
+      37,    -1,    41,    17,    37,    -1,    41,    28,    -1,    -1,
+      42,    -1,    -1,    18,    45,    26,    19,    -1
 };
 
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
@@ -529,8 +529,8 @@ static const yytype_uint16 yyrline[] =
        0,   100,   100,   102,   106,   107,   110,   112,   115,   117,
      118,   121,   123,   128,   127,   147,   146,   170,   169,   192,
      193,   194,   195,   199,   200,   204,   224,   246,   268,   290,
-     312,   330,   358,   359,   362,   364,   368,   369,   373,   376,
-     378,   383,   382
+     312,   330,   358,   359,   363,   366,   368,   372,   373,   377,
+     380,   382,   387,   386
 };
 #endif
 
@@ -546,9 +546,9 @@ static const char *const yytname[] =
   "TOK_GROUP_END", "TOK_SEMICOLON", "TOK_GARBAGE", "TOK_ERROR", "$accept",
   "configuration", "setting_list", "setting_list_optional",
   "setting_terminator", "comma_optional", "setting", "$@1", "array", "$@2",
-  "list", "$@3", "value", "string", "simple_value", "value_list",
-  "value_list_optional", "simple_value_list_sub", "simple_value_list",
-  "simple_value_list_optional", "group", "$@4", 0
+  "list", "$@3", "value", "string", "simple_value", "value_list_sub",
+  "value_list", "value_list_optional", "simple_value_list_sub",
+  "simple_value_list", "simple_value_list_optional", "group", "$@4", 0
 };
 #endif
 
@@ -569,8 +569,8 @@ static const yytype_uint8 yyr1[] =
        0,    23,    24,    24,    25,    25,    26,    26,    27,    27,
       27,    28,    28,    30,    29,    32,    31,    34,    33,    35,
       35,    35,    35,    36,    36,    37,    37,    37,    37,    37,
-      37,    37,    38,    38,    39,    39,    40,    40,    41,    42,
-      42,    44,    43
+      37,    37,    38,    38,    39,    40,    40,    41,    41,    42,
+      43,    43,    45,    44
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -579,8 +579,8 @@ static const yytype_uint8 yyr2[] =
        0,     2,     0,     1,     1,     2,     0,     1,     0,     1,
        1,     0,     1,     0,     5,     0,     4,     0,     4,     1,
        1,     1,     1,     1,     2,     1,     1,     1,     1,     1,
-       1,     1,     1,     3,     0,     1,     1,     3,     2,     0,
-       1,     0,     4
+       1,     1,     1,     3,     2,     0,     1,     1,     3,     2,
+       0,     1,     0,     4
 };
 
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -589,18 +589,19 @@ static const yytype_uint8 yyr2[] =
 static const yytype_uint8 yydefact[] =
 {
        2,    13,     0,     3,     4,     0,     1,     5,     0,    25,
-      26,    28,    27,    29,    30,    23,    15,    17,    41,    20,
-      21,     8,    31,    19,    22,    39,    34,     6,    10,     9,
-      14,    24,    36,    11,    40,     0,    32,    35,     0,     7,
-       0,    12,    38,    16,     0,    18,    42,    37,    33
+      26,    28,    27,    29,    30,    23,    15,    17,    42,    20,
+      21,     8,    31,    19,    22,    40,    35,     6,    10,     9,
+      14,    24,    37,    11,    41,     0,    32,    11,    36,     0,
+       7,     0,    12,    39,    16,    12,    34,    18,    43,    38,
+      33
 };
 
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
-      -1,     2,     3,    40,    30,    42,     4,     5,    19,    25,
-      20,    26,    21,    22,    23,    37,    38,    33,    34,    35,
-      24,    27
+      -1,     2,     3,    41,    30,    43,     4,     5,    19,    25,
+      20,    26,    21,    22,    23,    37,    38,    39,    33,    34,
+      35,    24,    27
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
@@ -608,19 +609,20 @@ static const yytype_int8 yydefgoto[] =
 #define YYPACT_NINF -26
 static const yytype_int8 yypact[] =
 {
-      -7,   -26,     4,    -7,   -26,     1,   -26,   -26,     2,   -26,
+       2,   -26,    10,     2,   -26,     5,   -26,   -26,     0,   -26,
      -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,   -26,
-     -26,    -4,     5,   -26,   -26,    18,     2,    -7,   -26,   -26,
-     -26,   -26,   -26,    11,   -26,    15,   -26,    13,    16,    -7,
-      12,    18,   -26,   -26,     2,   -26,   -26,   -26,   -26
+     -26,    -6,     8,   -26,   -26,    18,     0,     2,   -26,   -26,
+     -26,   -26,   -26,    11,   -26,    15,   -26,    13,   -26,    16,
+       2,    12,    18,   -26,   -26,     0,   -26,   -26,   -26,   -26,
+     -26
 };
 
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
-     -26,   -26,     6,   -26,   -26,   -26,    -3,   -26,   -26,   -26,
+     -26,   -26,     6,   -26,   -26,    -2,    -3,   -26,   -26,   -26,
      -26,   -26,   -25,   -26,   -23,   -26,   -26,   -26,   -26,   -26,
-     -26,   -26
+     -26,   -26,   -26
 };
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -630,18 +632,18 @@ static const yytype_int8 yypgoto[] =
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
-       7,    36,    32,     1,     6,     9,    10,    11,    12,    13,
-      14,    15,     8,    28,    31,    16,    29,    17,    47,    48,
-      18,     9,    10,    11,    12,    13,    14,    15,    41,    43,
-      44,    46,    45,    39,     0,     0,     7
+       7,    36,    32,     9,    10,    11,    12,    13,    14,    15,
+       6,    28,     1,    16,    29,    17,     8,    31,    18,    49,
+      50,     9,    10,    11,    12,    13,    14,    15,    42,    44,
+      45,    48,    47,    40,     0,    46,     0,     7
 };
 
 static const yytype_int8 yycheck[] =
 {
-       3,    26,    25,    10,     0,     3,     4,     5,     6,     7,
-       8,     9,    11,    17,     9,    13,    20,    15,    41,    44,
-      18,     3,     4,     5,     6,     7,     8,     9,    17,    14,
-      17,    19,    16,    27,    -1,    -1,    39
+       3,    26,    25,     3,     4,     5,     6,     7,     8,     9,
+       0,    17,    10,    13,    20,    15,    11,     9,    18,    42,
+      45,     3,     4,     5,     6,     7,     8,     9,    17,    14,
+      17,    19,    16,    27,    -1,    37,    -1,    40
 };
 
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -650,9 +652,10 @@ static const yytype_uint8 yystos[] =
 {
        0,    10,    24,    25,    29,    30,     0,    29,    11,     3,
        4,     5,     6,     7,     8,     9,    13,    15,    18,    31,
-      33,    35,    36,    37,    43,    32,    34,    44,    17,    20,
-      27,     9,    37,    40,    41,    42,    35,    38,    39,    25,
-      26,    17,    28,    14,    17,    16,    19,    37,    35
+      33,    35,    36,    37,    44,    32,    34,    45,    17,    20,
+      27,     9,    37,    41,    42,    43,    35,    38,    39,    40,
+      25,    26,    17,    28,    14,    17,    28,    16,    19,    37,
+      35
 };
 
 #define yyerrok		(yyerrstatus = 0)
@@ -1768,10 +1771,10 @@ yyreduce:
   }
     break;
 
-  case 41:
+  case 42:
 
 /* Line 1464 of yacc.c  */
-#line 383 "grammar.y"
+#line 387 "grammar.y"
     {
     if(IN_LIST())
     {
@@ -1787,10 +1790,10 @@ yyreduce:
   }
     break;
 
-  case 42:
+  case 43:
 
 /* Line 1464 of yacc.c  */
-#line 398 "grammar.y"
+#line 402 "grammar.y"
     {
     if(ctx->parent)
       ctx->parent = ctx->parent->parent;
@@ -1800,7 +1803,7 @@ yyreduce:
 
 
 /* Line 1464 of yacc.c  */
-#line 1804 "grammar.c"
+#line 1807 "grammar.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2012,6 +2015,6 @@ yyreturn:
 
 
 /* Line 1684 of yacc.c  */
-#line 404 "grammar.y"
+#line 408 "grammar.y"
 
 
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_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",
+	)
 
 },
 {