summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJessica Tölke <jtoelke@mail.upb.de>2013-05-29 09:42:07 +0200
committerJessica Tölke <jtoelke@mail.upb.de>2013-06-09 19:19:34 +0200
commitbc9bedd8b3e0cf91a0dfbabd9c533d5b6361e418 (patch)
tree09988e91201aa1200c7ec44a05387b7cd3289b51
parent46f9dbd84d91596b83612ac36b081c6adb7e941e (diff)
downloadserverdata-bc9bedd8b3e0cf91a0dfbabd9c533d5b6361e418.tar.gz
serverdata-bc9bedd8b3e0cf91a0dfbabd9c533d5b6361e418.tar.bz2
serverdata-bc9bedd8b3e0cf91a0dfbabd9c533d5b6361e418.tar.xz
serverdata-bc9bedd8b3e0cf91a0dfbabd9c533d5b6361e418.zip
Add different colors of the Rose Hat.
-rw-r--r--world/map/db/item_db.txt7
-rw-r--r--world/map/npc/017-4/orum.txt2
2 files changed, 7 insertions, 2 deletions
diff --git a/world/map/db/item_db.txt b/world/map/db/item_db.txt
index 679d27cf..9481ee81 100644
--- a/world/map/db/item_db.txt
+++ b/world/map/db/item_db.txt
@@ -410,7 +410,12 @@
894, WhiteSummonFlower, White Summon Flower, 3, 200, 100, 1, , , , , , , , , , , {}, {}
895, YellowSummonFlower, Yellow Summon Flower, 3, 400, 200, 1, , , , , , , , , , , {}, {}
896, RedSummonFlower, Red Summon Flower, 3, 600, 300, 1, , , , , , , , , , , {}, {}
-897, RoseHat, Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+897, RedRoseHat, Red Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+898, WhiteRoseHat, White Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+899, PinkRoseHat, Pink Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+900, YellowRoseHat, Yellow Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+901, OrangeRoseHat, Orange Rose Hat, 5, 5000, 1000, , , 1, , 8, 0, 2, 256, , 0, 0, {}, {}
+902, BlueRoseHat, Blue Rose Hat, 5, 5000, 1000, , , 1, , 8, 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/017-4/orum.txt b/world/map/npc/017-4/orum.txt
index 388b52f8..d2d173a7 100644
--- a/world/map/npc/017-4/orum.txt
+++ b/world/map/npc/017-4/orum.txt
@@ -638,7 +638,7 @@ L_FlowerHat:
mes "\"Fool! See what you've done! It's ruined!\"";
next;
mes "\"Though we have enough of the materials left to start over... Here, take this garbage out and get a new Red Rose!\"";
- getitem "RoseHat", 1;
+ getitem "RedRoseHat", 1;
set OrumQuest, 29;
goto L_Close;