summaryrefslogtreecommitdiff
path: root/db/pre-re
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-10-25 17:23:51 +0200
committerHaru <haru@dotalux.com>2013-10-25 17:43:35 +0200
commit5f6f1d66834b8328496c1678f0ce4f90a001b3fb (patch)
tree06ae5740c13135ac65f48c606deaa6ceb61a1140 /db/pre-re
parent8629562655cfcbd6aef97307e3e0c078235619ff (diff)
downloadhercules-5f6f1d66834b8328496c1678f0ce4f90a001b3fb.tar.gz
hercules-5f6f1d66834b8328496c1678f0ce4f90a001b3fb.tar.bz2
hercules-5f6f1d66834b8328496c1678f0ce4f90a001b3fb.tar.xz
hercules-5f6f1d66834b8328496c1678f0ce4f90a001b3fb.zip
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>
Diffstat (limited to 'db/pre-re')
-rw-r--r--db/pre-re/item_group.conf120
-rw-r--r--db/pre-re/map_zone_db.conf46
2 files changed, 87 insertions, 79 deletions
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",
+ )
},
{