summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali-g <gauvain.dauchy@free.fr>2011-10-31 10:15:53 +0100
committerJessica Tölke <jtoelke@mail.upb.de>2011-11-02 14:03:39 +0100
commitca5c1c8f9a87c910da4e1365af52b07b0c825536 (patch)
tree498cd18564b9d2d76244291c21f2776dff9f3eba
parent9a83dc2af174357db0e01ec9c23060dcd90f54b3 (diff)
downloadclientdata-ca5c1c8f9a87c910da4e1365af52b07b0c825536.tar.gz
clientdata-ca5c1c8f9a87c910da4e1365af52b07b0c825536.tar.bz2
clientdata-ca5c1c8f9a87c910da4e1365af52b07b0c825536.tar.xz
clientdata-ca5c1c8f9a87c910da4e1365af52b07b0c825536.zip
Added the dyable version of the new halloween lollipop made by Wombat.
Original lollipops made by Lizandra. Removed the cranberry, orange and grape lollipop icons. Updated items.xml with correct colors for these three lollipops.
-rw-r--r--graphics/items/use/food/cranberry-lollipop.pngbin742 -> 0 bytes
-rw-r--r--graphics/items/use/food/grape-lollipop.pngbin715 -> 0 bytes
-rw-r--r--graphics/items/use/food/lollipop2.pngbin0 -> 529 bytes
-rw-r--r--graphics/items/use/food/orange-lollipop.pngbin674 -> 0 bytes
-rw-r--r--items.xml6
5 files changed, 3 insertions, 3 deletions
diff --git a/graphics/items/use/food/cranberry-lollipop.png b/graphics/items/use/food/cranberry-lollipop.png
deleted file mode 100644
index 236f0e5b..00000000
--- a/graphics/items/use/food/cranberry-lollipop.png
+++ /dev/null
Binary files differ
diff --git a/graphics/items/use/food/grape-lollipop.png b/graphics/items/use/food/grape-lollipop.png
deleted file mode 100644
index 21a26c62..00000000
--- a/graphics/items/use/food/grape-lollipop.png
+++ /dev/null
Binary files differ
diff --git a/graphics/items/use/food/lollipop2.png b/graphics/items/use/food/lollipop2.png
new file mode 100644
index 00000000..bafcacb7
--- /dev/null
+++ b/graphics/items/use/food/lollipop2.png
Binary files differ
diff --git a/graphics/items/use/food/orange-lollipop.png b/graphics/items/use/food/orange-lollipop.png
deleted file mode 100644
index 20455e24..00000000
--- a/graphics/items/use/food/orange-lollipop.png
+++ /dev/null
Binary files differ
diff --git a/items.xml b/items.xml
index 2914ce24..8a77adca 100644
--- a/items.xml
+++ b/items.xml
@@ -2798,21 +2798,21 @@
weight="2"/>
<!-- ID 837 RESERVED - "Witch Root" -->
<item id="838"
- image="use/food/cranberry-lollipop.png"
+ image="use/food/lollipop2.png|M:#c21439,e81844,ffffff"
name="Cranberry Lollipop"
description="A lollipop with cranberry flavor."
type="usable"
hp="750"
weight="1"/>
<item id="839"
- image="use/food/grape-lollipop.png"
+ image="use/food/lollipop2.png"
name="Grape Lollipop"
description="A lollipop with grape flavor."
type="usable"
hp="750"
weight="1"/>
<item id="840"
- image="use/food/orange-lollipop.png"
+ image="use/food/lollipop2.png|M:#f4950d,f4be40,ffffff"
name="Orange Lollipop"
description="A lollipop with orange flavor."
type="usable"