summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-04-19 10:16:35 +0000
committerJesusaves <cpntb1@ymail.com>2020-04-19 10:16:35 +0000
commit7c6e45ed345fd1037c3d4a49bfb19dde8d1fabf1 (patch)
treedb9395404c5ab4fe359a65c980ef0979ac58cdb8
parentd6bbe935e1eefd10559d528ead3c5d6da7f0adff (diff)
parenta795c75990c3a6fd3a3c8abad12d198ca343601d (diff)
downloadclientdata-7c6e45ed345fd1037c3d4a49bfb19dde8d1fabf1.tar.gz
clientdata-7c6e45ed345fd1037c3d4a49bfb19dde8d1fabf1.tar.bz2
clientdata-7c6e45ed345fd1037c3d4a49bfb19dde8d1fabf1.tar.xz
clientdata-7c6e45ed345fd1037c3d4a49bfb19dde8d1fabf1.zip
Merge branch 'jesusalva/doomsday' into 'master'
Clothes Pack, item obtained from Doomsday event epilogue See merge request evol/clientdata!145
-rw-r--r--LICENSE3
-rw-r--r--graphics/items/generic/clothespack.pngbin0 -> 767 bytes
-rw-r--r--items.xml7
3 files changed, 9 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 2fa8c257..35ae52e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -148,6 +148,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/generic/box-plushroom.png (Hal9000) (CC BY-SA 3.0) (Reid)
graphics/items/generic/bugleg.png (:grey_question:, Enchilado) (GPLv2) (Micksha)
graphics/items/generic/carp.png (Reid) (CC BY-SA 3.0) (-)
+ graphics/items/generic/clothespack.png (?) (GPLv2) (TMW BR Team)
graphics/items/generic/coal.png (Enchilado, Meway) (GPLv2,CC BY-SA 3.0) (Micksha)
graphics/items/generic/coinbag.png (LEGACY) (CC BY-SA 3.0) (Micksha)
graphics/items/generic/coral.png (Reid) (CC BY-SA 3.0) (Enchilado)
@@ -250,7 +251,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/items/usable/sandwich-pioulegs.png (Micksha) (CC BY-SA 3.0) (-)
graphics/items/usable/sandwich-manana.png (Micksha) (CC BY-SA 3.0) (-)
graphics/items/usable/seeds-grass.png (LEGACY) (CC BY-SA 3.0) (Micksha)
- graphics/items/usable/seeds-flower.png (LEGACY) (CC BY-SA 3.0) (Micksha)
+ graphics/items/usable/seeds-flower.png (LEGACY) (CC BY-SA 3.0) (Micksha)
graphics/items/usable/shovel.png (Alige, Reid) (CC BY-SA 3.0) (-)
graphics/items/usable/urchinmeat.png (Alige) (CC BY-SA 3.0) (Reid)
graphics/items/usable/wine.png (Jak1) (CC BY-SA 3.0) (Reid)
diff --git a/graphics/items/generic/clothespack.png b/graphics/items/generic/clothespack.png
new file mode 100644
index 00000000..b92f8ab5
--- /dev/null
+++ b/graphics/items/generic/clothespack.png
Binary files differ
diff --git a/items.xml b/items.xml
index dbbeabae..db2cc6ea 100644
--- a/items.xml
+++ b/items.xml
@@ -1185,6 +1185,13 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml.
description="An empty bowl. You may fill it with fine food, in case you get hungry."
type="generic"
weight="150"/>
+ <item id="807"
+ image="generic/clothespack.png"
+ name="Clothes Pack"
+ description="Torn and destroyed by the sea, it still emits a strange aura. Perhaps, one day, it could be restored?"
+ type="generic"
+ weight="25"
+ sellProtected="true"/>
<!-- Necklaces -->
<item id="1000"