summaryrefslogtreecommitdiff
path: root/world/map/db
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2015-02-15 12:04:26 -0600
committerwushin <pasekei@gmail.com>2015-02-19 22:19:27 -0600
commitbb1ebc93ce4e8fa53d4b9254b3e774fb55b279a9 (patch)
tree7b27cc7201f176552b15ff1cad97bcb930e7816a /world/map/db
parentf9e17eac8bdf1f852ec7b6cbdb3f0536d84304ef (diff)
downloadserverdata-bb1ebc93ce4e8fa53d4b9254b3e774fb55b279a9.tar.gz
serverdata-bb1ebc93ce4e8fa53d4b9254b3e774fb55b279a9.tar.bz2
serverdata-bb1ebc93ce4e8fa53d4b9254b3e774fb55b279a9.tar.xz
serverdata-bb1ebc93ce4e8fa53d4b9254b3e774fb55b279a9.zip
fix duplicate names
Diffstat (limited to 'world/map/db')
-rw-r--r--world/map/db/item_db_chest.txt6
-rw-r--r--world/map/db/item_db_head.txt12
-rw-r--r--world/map/db/item_db_trinket.txt1
3 files changed, 8 insertions, 11 deletions
diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt
index de94086c..c3db7222 100644
--- a/world/map/db/item_db_chest.txt
+++ b/world/map/db/item_db_chest.txt
@@ -212,14 +212,14 @@
5087, SorcererRobePurple, Sorcerer Robe Purple, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5088, RedSorcererRobeDarkGree, Red Sorcerer Robe Dark, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5089, GreenSorcererRobeDarkGr, Green Sorcerer Robe Dar, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
-5090, DarkBlueSorcererRobeDar, Dark Blue Sorcerer Robe, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
+5090, DarkBlueSorcererDarkGre, Dark Blue Sorcerer Robe, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5091, YellowSorcererRobeDarkG, Yellow Sorcerer Robe Da, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
-5092, LightBlueSorcererRobeDa, Light Blue Sorcerer Rob, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
+5092, LightBlueSorcererDarkGr, Light Blue Sorcerer Rob, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5093, PinkSorcererRobeDarkGre, Pink Sorcerer Robe Dark, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5094, BlackSorcererRobeDarkGr, Black Sorcerer Robe Dar, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5095, OrangeSorcererRobeDarkG, Orange Sorcerer Robe Da, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5096, PurpleSorcererRobeDarkG, Purple Sorcerer Robe Da, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
-5097, DarkGreenSorcererRobeDa, Dark Green Sorcerer Rob, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
+5097, DarkGreenSorcererDarkGr, Dark Green Sorcerer Rob, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5098, SorcererRobeDarkGreen, Sorcerer Robe Dark Gree, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5099, RedSorcererRobeWhite, Red Sorcerer Robe White, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
5100, GreenSorcererRobeWhite, Green Sorcerer Robe Whi, 5, 8000, 4000, 30, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, {}, {bonus bAgi, 1;}
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index a82e68b7..a183c9d1 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -40,11 +40,11 @@
725, GMCap, GM Cap, 5, 2000, 500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "RestrictedItem";}
751, PinkieHat, Pinkie Hat, 5, 5000, 1000, 5, 0, 1, 0, 1, 0, 2, 256, 0, 0, 0, {}, {}
752, FluffyHat, Fluffy Hat, 5, 7000, 2000, 10, 0, 2, 0, -5, 0, 2, 256, 0, 0, 0, {}, {}
-759, PaladinsHelmet, Paladin's Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-760, OverlordsHelmet, Overlord's Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-761, DesertHelmet, Desert Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-764, SailorHat, Sailor Hat, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-765, CaptainsHat, Captain's Hat, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+759, PaladinsHelmet, Paladin's Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+760, OverlordsHelmet, Overlord's Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+761, DesertHelmet, Desert Helmet, 5, 0, 0, 0, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+764, SailorHat, Sailor Hat, 5, 0, 0, 0, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+765, CaptainsHat, Captain's Hat, 5, 0, 0, 0, 0, 0, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
766, TerraniteHelmet, Terranite Helmet, 5, 30000, 3000, 300, 0, 15, 0, -12, 0, 2, 256, 0, 0, 0, {}, {bonus bMdef, 5;}
769, GuyFawkesMask, Guy Fawkes Mask, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
770, FairyHat, Fairy Hat, 5, 2000, 1000, 20, 0, 5, 0, -10, 0, 2, 256, 0, 0, 0, {}, {bonus bLuk, 3;}
@@ -118,8 +118,6 @@
2147, OrangeCottonHeadband, Orange Cotton Headband, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
2148, PurpleCottonHeadband, Purple Cotton Headband, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
2149, DarkGreenCottonHeadband, Dark Green Cotton Headb, 5, 3000, 500, 5, 0, 2, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
-2158, PurpleCottonBoots, Purple Cotton Boots, 5, 2000, 500, 30, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, {}, {}
-2159, DarkGreenCottonBoots, Dark Green Cotton Boots, 5, 2000, 500, 30, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, {}, {}
2190, RedRabbitEars, Red Rabbit Ears, 5, 7000, 5000, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, {}, {}
2191, GreenRabbitEars, Green Rabbit Ears, 5, 7000, 5000, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, {}, {}
2192, DarkBlueRabbitEars, Dark Blue Rabbit Ears, 5, 7000, 5000, 15, 0, 5, 0, 4, 0, 2, 256, 0, 1, 0, {}, {}
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index b589f249..fce3f06e 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -7,7 +7,6 @@
830, BromenalFourLeafAmulet, Bromenal Four-Leaf Amul, 5, 20000, 2000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 2;}
831, SilverFourLeafAmulet, Silver Four-Leaf Amulet, 5, 30000, 3000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 3;}
832, GoldenFourLeafAmulet, Golden Four-Leaf Amulet, 5, 40000, 4000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 4;}
-833, BrokenFourLeafAmulet, Broken Four-Leaf Amulet, 3, 100, 1, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {}, {}
865, Grimoire, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxSP, 30;}
879, HeartOfIsis, Heart of Isis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;}
1197, SkeletonCharm, Skeleton Charm, 5, 0, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, { callfunc "CheckMunro"; }