summaryrefslogtreecommitdiff
path: root/world
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-03-13 16:57:00 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2013-03-13 16:57:00 +0100
commitdc7102b33d7078c455bbefde097d143b9aa56827 (patch)
treeb641a20acd2a9f2302a27ab15fe618fd409f60da /world
parentc3b7c5a191a467110075e86f155c006a6d5ed73e (diff)
downloadserverdata-dc7102b33d7078c455bbefde097d143b9aa56827.tar.gz
serverdata-dc7102b33d7078c455bbefde097d143b9aa56827.tar.bz2
serverdata-dc7102b33d7078c455bbefde097d143b9aa56827.tar.xz
serverdata-dc7102b33d7078c455bbefde097d143b9aa56827.zip
Rename Beanie Copter Cap to Beanie Copter.
Diffstat (limited to 'world')
-rw-r--r--world/map/db/item_db.txt2
-rw-r--r--world/map/npc/009-1/milly.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 247831e8..37feb868 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -398,7 +398,7 @@
881, RaggedShorts, Ragged Shorts, 5, 60, 1, 7, , 0, , -2, 0, 2, 1, , 1, 0, {}, {}
888, MagicGMTopHat, Magic GM Top Hat, 5, 4200, 1900, 30, , 60, , 20, 0, 2, 256, , 0, 0, {}, {set @minLvl, 60; callfunc "RestrictedItem"; bonus bMaxHP, 31000; bonus bFlee, -200; bonus bHPrecovRate, -400; bonus bCriticalDef, 250; bonus bMdef, 89;}
889, MurdererCrown, Murderer Crown, 5, 75000, 12000, 240, , 4, , 0, 0, 2, 256, , 0, 0, {}, {}
-890, BeanieCopterCap, Beanie Copter Cap, 5, 8000, 2000, 20, , 4, , 2, 0, 2, 256, , 0, 0, {}, {}
+890, BeanieCopter, Beanie Copter, 5, 8000, 2000, 20, , 4, , 2, 0, 2, 256, , 0, 0, {}, {}
// Add new entries above here. For dyed entries,add to the bottom of the 2000s.
diff --git a/world/map/npc/009-1/milly.txt b/world/map/npc/009-1/milly.txt
index 57cff48b..68f80cfb 100644
--- a/world/map/npc/009-1/milly.txt
+++ b/world/map/npc/009-1/milly.txt
@@ -290,9 +290,9 @@ L_Cap:
mes "[Milly]";
mes "\"Wow, thanks for accepting my gift, it is so pleasing to know that you have the exact same cap as me! Friends forever!\"";
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("BeanieCopterCap", 1) == 0))
+ if (@inventorylist_count == 100 || (checkweight("BeanieCopter", 1) == 0))
goto L_TooMany;
- getitem "BeanieCopterCap", 1;
+ getitem "BeanieCopter", 1;
set FLAGS, FLAGS | FLAG_GOT_BEANIEHAT;
next;
mes "She is giggling with excitement.";
@@ -348,9 +348,9 @@ L_FinishedBad:
L_Apologize:
getinventorylist;
- if (@inventorylist_count == 100 || (checkweight("BeanieCopterCap", 1) == 0))
+ if (@inventorylist_count == 100 || (checkweight("BeanieCopter", 1) == 0))
goto L_TooMany;
- getitem "BeanieCopterCap", 1;
+ getitem "BeanieCopter", 1;
set FLAGS, FLAGS | FLAG_GOT_BEANIEHAT;
set FLAGS, FLAGS & ~FLAG_DECLINED_BEANIEHAT;