summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
Diffstat (limited to 'db')
-rw-r--r--db/const.txt4
-rw-r--r--db/pre-re/item_db.txt8
-rw-r--r--db/pre-re/item_group.conf120
-rw-r--r--db/pre-re/map_zone_db.conf45
-rw-r--r--db/quest_db.txt62
-rw-r--r--db/re/item_db.txt4
-rw-r--r--db/re/item_group.conf120
-rw-r--r--db/re/map_zone_db.conf45
-rw-r--r--db/re/mob_db.txt12
-rw-r--r--db/sc_config.txt2
10 files changed, 230 insertions, 192 deletions
diff --git a/db/const.txt b/db/const.txt
index d04b0d8b4..e5874f52f 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -365,6 +365,8 @@ mf_monster_noteleport 49
mf_pvp_nocalcrank 50
mf_battleground 51
mf_reset 52
+mf_notomb 53
+mf_nocashshop 54
cell_walkable 0
cell_shootable 1
@@ -1242,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
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index 4f91b462c..4a8161dbc 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -2638,7 +2638,7 @@
//5468,Parade_Cap,Parade Hat,5,20,,800,,3,,1,0xFFFFFFFF,7,2,256,,0,1,465,{ bonus bDelayRate,-5; bonus bMdef,2; if(getrefine()>5) bonus bCastrate,-(getrefine()-5); },{},{}
//5469,Noble_Hat,Musketeer Hat,5,20,,300,,2,,0,0xFFFFFFFF,7,2,256,,30,1,466,{ bonus bStr,2; bonus3 bAutoSpellWhenHit,BS_ADRENALINE,1,7; },{},{}
//5470,Eyes_Of_Darkness,Eye Of Darkness,5,20,,100,,1,,0,0xFFFFFFFF,7,2,512,,50,0,467,{ bonus bDex,1; bonus2 bResEff,Eff_Blind,10000; },{},{}
-//5471,Hairband_Of_Reginleif,Hairband Of Reginleif,5,20,,800,,1,,0,0xFFFFFFFF,7,2,512,,50,0,468,{ bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3; },{},{}
+5471,Hairband_Of_Reginleif,Hairband Of Reginleif,5,20,,800,,1,,0,0xFFFFFFFF,7,2,512,,50,0,468,{ bonus2 bSubEle,Ele_Water,3; bonus2 bSubEle,Ele_Fire,3; bonus2 bSubEle,Ele_Undead,3; bonus2 bSubEle,Ele_Ghost,3; },{},{}
//5472,Red_White_Hat,Red Hat,5,20,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,469,{ bonus3 bAddMonsterDropItem,550,RC_DemiHuman,3; },{},{}
//5473,Forceps_Hairpin,Nipper Crab Hairpin,5,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,30,1,470,{ bonus3 bAutoSpellWhenHit,MG_COLDBOLT,1,100; bonus3 bAddMonsterDropItem,991,RC_Fish,3; },{},{}
//5474,Notice_Board,AFK Hat,5,20,,700,,2,,0,0xFFFFFFFF,7,2,256,,10,0,471,{},{},{}
@@ -2778,7 +2778,7 @@
//5608,Dorothy_Doll_Hat,Dorothy Doll Hat,5,0,,500,,0,,1,0xFFFFFFFF,7,2,256,,60,0,582,{},{},{}
//5609,Chung_Hairband,Chung Hairband,5,0,,500,,5,,1,0xFFFFFFFF,7,2,256,,60,0,583,{ bonus bLuk,3; bonus bMdef,4; },{},{}
//5610,Ice_Wing_Ear,Ice Wing Ear,5,0,,100,,0,,0,0xFFFFFFFF,7,2,512,,10,0,584,{ bonus bLuk,1; },{},{}
-//5611,Turtle_Hat,Turtle_Hat,5,0,,300,,0,,0,0xFFFFFFFF,7,2,256,,10,1,585,{ bonus bAgi,1; },{},{}
+5611,Turtle_Hat,Turtle_Hat,5,0,,300,,0,,0,0xFFFFFFFF,7,2,256,,10,1,585,{ bonus bAgi,1; },{},{}
//5612,F_Blue_Drooping_Kitty,F Blue Drooping Kitty,5,250000,,500,,1,,0,0xFFFFFFFE,7,2,256,,0,1,277,{ bonus bMdef,15; },{},{}
//5613,F_Flying_Angel,F Flying Angel,5,20,,300,,1,,0,0xFFFFFFFF,7,2,256,,10,1,264,{ bonus bInt,1; bonus bAgi,1; },{},{}
//5614,F_Smoking_Pipe_,F Smoking Pipe,5,20,,100,,0,,0,0xFFFFFFFE,7,2,1,,0,0,55,{ bonus bVit,1; },{},{}
@@ -2925,14 +2925,14 @@
//5755,Silent_Enforcer,Silent Enforcer,5,20,,100,,12,,0,0x00001000,8,2,513,,100,1,632,{ bonus bAgi,1; bonus bMdef,5; if(readparam(bAgi)>=120){ bonus bBaseAtk,10; bonus bFlee2,5; } },{},{}
//5756,Wind_Whisper,Wispers of Wind,5,20,,100,,12,,1,0x00010000,8,2,256,,100,1,633,{ bonus bInt,1; bonus bDex,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bFlee,3; } },{},{}
//5757,Schmidt_Helm,Reissue Schmitz Helm,5,20,,100,,12,,1,0x00004000,8,2,768,,100,1,634,{ bonus bVit,2; bonus bInt,1; bonus bMdef,5; if(readparam(bInt)>=120){ bonus bMatkRate,10; bonus bDef,5; } },{},{}
-//5758,Dying_Swan,Resting Swan,5,20,,100,,17,,1,0x00080000,8,0,256,,100,1,635,{ bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bAtkRate,5; bonus bUseSPrate,-10; },{},{}
+5758,Dying_Swan,Resting Swan,5,20,,100,,17,,1,0x00080000,8,0,256,,100,1,635,{ bonus bInt,1; bonus bLuk,1; bonus bMdef,5; bonus bAtkRate,5; bonus bUseSPrate,-10; },{},{}
//5759,Noah_Hat,Noah Hat,5,20,,500,,1,,1,0xFFFFFFFF,7,2,256,,1,1,636,{ bonus bMdef,3; },{},{}
//5760,Driver_Band_F,Driver Band,5,20,,100,,12,,1,0x00000400,8,0,256,,100,1,637,{ bonus bStr,1; bonus bDex,1; bonus bMdef,5; if(readparam(bStr)>=120){ bonus bBaseAtk,10; bonus bCritical,3; } },{},{}
//5761,Sloth_Hat,Sloth Hat,5,20,,800,,3,,1,0xFFFFFFFF,7,2,256,,1,1,638,{ bonus bAgi,2; },{},{}
//5762,Duneyrr_Helm,Duneyrr Helm,5,20,,100,,5,,0,0xFFFFFFFF,7,2,256,,1,1,639,{ bonus bAllStats,1; bonus bMdef,5; },{},{}
//5763,Red_Bunny_Band,Red Bunny Band,5,0,,200,,4,,0,0xFFFFFFFF,7,2,256,,1,1,640,{ bonus bAgi,2; bonus bMdef,3; },{},{}
//5765,Black_Tail_Ribbon,Black Tail Ribbon,5,20,,100,,0,,1,0xFFFFFFFF,7,2,256,,10,1,642,{ bonus bMdef,5; },{},{}
-//5766,Amistr_Cap,Amistr Cap,5,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,50,1,643,{ bonus bVit,5; },{},{}
+5766,Amistr_Cap,Amistr Cap,5,20,,500,,4,,0,0xFFFFFFFF,7,2,256,,50,1,643,{ bonus bVit,5; },{},{}
//5767,Samurai_Mask,Samurai Mask,5,20,,300,,1,,0,0xFFFFFFFF,7,2,1,,50,0,644,{},{},{}
//5768,Sakura_Coronet,Sakura Coronet,5,20,,800,,1,,1,0xFFFFFFFF,7,2,256,,1,1,645,{ bonus bMdef,3; },{},{}
//5769,Gold_Angel_Sculpture,Gold Angel Sculpture,5,100,,0,,2,,0,0xFFFFFFFF,7,2,256,,70,0,646,{},{},{}
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 384384fec..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: (
+ )
},
{
@@ -87,6 +89,11 @@ zones: (
disabled_items: {
Greed_Scroll: true
}
+
+ mapflags: (
+ "nocashshop",
+ )
+
},
{
/* PK Mode zone is only used when server is on pk_mode (battle.conf),
@@ -112,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 */
@@ -151,13 +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" )
+ 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",
+ )
},
{
@@ -211,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/quest_db.txt b/db/quest_db.txt
index 32cc64f2f..42cd3c651 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -57,7 +57,7 @@
1183,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1184,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1185,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
-1186,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1186,0,2313,15,0,0,0,0,"Get Rid of Bakonawa"
1187,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1188,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
1189,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
@@ -583,7 +583,7 @@
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"
+4229,82800,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!"
@@ -640,7 +640,9 @@
5052,0,0,0,0,0,0,0,"Traditional Weapon"
5053,0,0,0,0,0,0,0,"Traditional Weapon"
5054,0,0,0,0,0,0,0,"Traditional Weapon"
-
+5055,0,2071,15,0,0,0,0,"Local Rising - Headless Horse"
+5056,0,1584,15,0,0,0,0,"Local Rising - Tamruan"
+5057,0,0,0,0,0,0,0,"Local Rising - Ready the Festival"
5058,0,0,0,0,0,0,0,"The mood of the players-(1)"
5059,0,0,0,0,0,0,0,"The mood of the players-(2)"
5060,180,0,0,0,0,0,0,"Cat Shock"
@@ -860,7 +862,7 @@
7120,0,0,0,0,0,0,0,"Novice Training"
7121,0,0,0,0,0,0,0,"Novice Training"
7122,0,1002,1,0,0,0,0,"First battle - Poring Hunt"
-7123,0,1050,2,0,0,0,0,"Battle Basics -Swordman"
+7123,0,1049,2,0,0,0,0,"Battle Basics -Swordman"
7124,0,1063,5,0,0,0,0,"Battle Basics -Mage"
//7125,0,0,0,0,0,0,0,"not used"
7126,0,0,0,0,0,0,0,"Selling items"
@@ -896,7 +898,7 @@
7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest"
7156,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - start"
7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 1"
-7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2"
+7158,0,1065,10,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2"
7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest"
7160,0,0,0,0,0,0,0,"Mysterious Cryptogram"
@@ -949,6 +951,8 @@
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?"
+7209,0,0,0,0,0,0,0,"Forget the box."
+7210,0,0,0,0,0,0,0,"Daily delivery"
// Misty Forest Labyrinth
7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
@@ -1107,7 +1111,7 @@
7364,0,0,0,0,0,0,0,"Deliver Holy Item to Middle-aged Man"
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"
+7367,600,0,0,0,0,0,0,"Traditional Spiritual Protection and Impudent Girl-2"
7368,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pedro"
7369,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Nardo"
7370,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Pandoi"
@@ -1115,13 +1119,13 @@
7372,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Talah"
7373,0,0,0,0,0,0,0,"Deliver Spiritual Protection-Romel"
7374,0,0,0,0,0,0,0,"Love and Spiritual Protection for All"
-7375,0,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
+7375,82800,0,0,0,0,0,0,"Love and Spiritual Protection Continues"
7376,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-1"
7377,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-2"
-7378,0,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
+7378,82800,0,0,0,0,0,0,"Old Man and Cast-Iron Caldron-Regular Trades"
7379,0,0,0,0,0,0,0,"Peace Preacher"
7380,0,0,0,0,0,0,0,"To Smith a Traditional Spiritual Protection"
-7381,0,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
+7381,82800,0,0,0,0,0,0,"High Demand on Spiritual Protection Material"
7382,0,0,0,0,0,0,0,"Deliver to Pedro"
7383,0,0,0,0,0,0,0,"Deliver to Nardo"
7384,0,0,0,0,0,0,0,"Deliver to Pandoi"
@@ -1130,27 +1134,27 @@
7387,0,0,0,0,0,0,0,"Deliver to Romel"
7388,0,0,0,0,0,0,0,"Maries's Child"
7389,0,0,0,0,0,0,0,"Give the Shirt to Maries's Child"
-7390,0,0,0,0,0,0,0,"Worried about Maries's Child"
+7390,82800,0,0,0,0,0,0,"Worried about Maries's Child"
7391,0,0,0,0,0,0,0,"Jejeling and Jejellopy"
-7392,0,0,0,0,0,0,0,"Collect Jejellopy Regularly"
-7393,0,0,0,0,0,0,0,"Shiny Silver Blade"
-7394,0,0,0,0,0,0,0,"Shiny Tomorrow"
-7395,0,0,0,0,0,0,0,"Ghost on the Perry Ship"
-7396,0,0,0,0,0,0,0,"Angry Soul on Perry Ship"
+7392,86400,0,0,0,0,0,0,"Collect Jejellopy Regularly"
+7393,0,2314,10,2311,10,0,0,"Shiny Silver Blade"
+7394,82800,0,0,0,0,0,0,"Shiny Tomorrow"
+7395,0,0,0,0,0,0,0,"Ghost on the Ferry Ship"
+7396,0,0,0,0,0,0,0,"Angry Soul on Ferry Ship"
7397,0,0,0,0,0,0,0,"Mumbaki Phong's Advice"
7398,0,0,0,0,0,0,0,"Offering Bouquet Recommended by Mumbaki"
7399,0,0,0,0,0,0,0,"Soul Diwata's Story"
7400,0,0,0,0,0,0,0,"Mumbaki of Port Malaya"
-7401,0,0,0,0,0,0,0,"All Aboard for Perry Sailing"
+7401,82800,0,0,0,0,0,0,"All Aboard for Perry Sailing"
7402,0,0,0,0,0,0,0,"Bouquet for Diwata"
7403,0,0,0,0,0,0,0,"Stabilized Perry"
-7404,0,0,0,0,0,0,0,"Get Rid of Jejeling"
-7405,0,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
+7404,0,2316,20,0,0,0,0,"Get Rid of Jejeling"
+7405,82800,0,0,0,0,0,0,"Get Rid of Jejeling - Same Time Tomorrow"
7406,0,0,0,0,0,0,0,"Agree to Collecting Bones!"
7407,0,0,0,0,0,0,0,"Purified Bone"
-7408,0,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
-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!"
+7408,82800,0,0,0,0,0,0,"Agree to Come Back Tomorrow?"
+7409,0,2309,10,0,0,0,0,"Cannot Meet Eyes with Him!"
+7410,82800,0,0,0,0,0,0,"Teach Another Lesson Tomorrow!"
// Eclage
7411,0,0,0,0,0,0,0,"The traveler, Fome's story"
@@ -1497,10 +1501,10 @@
9058,0,0,0,0,0,0,0,"O'Riley's Request"
9059,0,0,0,0,0,0,0,"Happy St. Patrick's Day"
9117,0,0,0,0,0,0,0,"Lina's Curse"
-9118,0,0,0,0,0,0,0,"Lina's Curse - Deviruchi Hunt"
-9119,0,0,0,0,0,0,0,"Lina's Curse - Wraith Dead Hunt"
-9120,0,0,0,0,0,0,0,"Lina's Curse - Dullahan Hunt"
-9121,0,0,0,0,0,0,0,"Lina's Curse - Nightmare Terror Hunt"
+9118,0,1109,50,0,0,0,0,"Lina's Curse - Deviruchi Hunt"
+9119,0,1291,50,0,0,0,0,"Lina's Curse - Wraith Dead Hunt"
+9120,0,1504,50,0,0,0,0,"Lina's Curse - Dullahan Hunt"
+9121,0,1379,50,0,0,0,0,"Lina's Curse - Nightmare Terror Hunt"
9122,0,0,0,0,0,0,0,"Lina's Curse"
9123,0,0,0,0,0,0,0,"Lina's Curse"
9024,0,0,0,0,0,0,0,"An errand boy from Einbroch"
@@ -1534,9 +1538,9 @@
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"
+9222,0,2327,1,0,0,0,0,"Get Rid of Bangungot from Hospital 2F"
+9223,604800,0,0,0,0,0,0,"Will there be Peace at the Hospital?"
+9224,3600,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"
@@ -1964,7 +1968,7 @@
11306,0,0,0,0,0,0,0,"Nurse at Port Malaya-23"
11307,0,0,0,0,0,0,0,"Nurse at Port Malaya-24"
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"
+11309,0,2327,1,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"
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 384384fec..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: (
+ )
},
{
@@ -87,6 +89,11 @@ zones: (
disabled_items: {
Greed_Scroll: true
}
+
+ /* cashshop disabled in pvp maps */
+ mapflags: (
+ "nocashshop",
+ )
},
{
/* PK Mode zone is only used when server is on pk_mode (battle.conf),
@@ -112,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 */
@@ -151,13 +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" )
+ 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",
+ )
},
{
@@ -211,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/mob_db.txt b/db/re/mob_db.txt
index 86c854b26..7bf4cff0e 100644
--- a/db/re/mob_db.txt
+++ b/db/re/mob_db.txt
@@ -1557,12 +1557,14 @@
//2405,WEAK_SKELETON
//2406,WEAK_SKEL_SOLDIER
//2407,SAILOR_SKELETON
-//2408,DUMMY_10
-//2409,DUMMY_50
-//2410,DUMMY_100
-//2411,DUMMY_150
+
+2408,DUMMY_10,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2409,DUMMY_50,Dummy 50,Dummy 50,50,99999999,1,0,0,0,0,0,50,50,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2410,DUMMY_100,Dummy 100,Dummy 100,100,99999999,1,0,0,0,0,0,90,90,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2411,DUMMY_150,Dummy 150,Dummy 150,150,99999999,1,0,0,0,0,0,120,120,0,0,0,0,0,0,0,200,1,0,20,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
//2412,E_VALKIWI
-//2413,DUMMY_10_FIRE
+2413,DUMMY_10_FIRE,Dummy 10,Dummy 10,10,99999999,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,200,1,0,23,0x0,200,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+
//2414,RUNAWAY_BOOK
//2415,L_SEYREN
//2416,L_EREMES
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
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-15 13:49:47 +0000