summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwushin <pasekei@gmail.com>2014-06-30 22:46:06 -0500
committerwushin <pasekei@gmail.com>2014-06-30 22:46:06 -0500
commitff0a84a7c575b4e8cc863494dc5e55ecfe1193e6 (patch)
tree61eff329ee1b4403321deb2ae39d1d972081e79b
parent77f59b8d07736f2fa20bfab3a63d0a6dd968c8a2 (diff)
parent1e0d4d554226f706600f8773ed032ab3fc9692c6 (diff)
downloadclientdata-ff0a84a7c575b4e8cc863494dc5e55ecfe1193e6.tar.gz
clientdata-ff0a84a7c575b4e8cc863494dc5e55ecfe1193e6.tar.bz2
clientdata-ff0a84a7c575b4e8cc863494dc5e55ecfe1193e6.tar.xz
clientdata-ff0a84a7c575b4e8cc863494dc5e55ecfe1193e6.zip
Merge branch 'sling-color-fix'
-rw-r--r--graphics/items/equipment/weapon/slingshot-icon.pngbin558 -> 578 bytes
-rw-r--r--graphics/sprites/equipment/weapons/bow-slingshot.pngbin14760 -> 13329 bytes
-rw-r--r--items.xml6
3 files changed, 3 insertions, 3 deletions
diff --git a/graphics/items/equipment/weapon/slingshot-icon.png b/graphics/items/equipment/weapon/slingshot-icon.png
index a0586329..fdb52c92 100644
--- a/graphics/items/equipment/weapon/slingshot-icon.png
+++ b/graphics/items/equipment/weapon/slingshot-icon.png
Binary files differ
diff --git a/graphics/sprites/equipment/weapons/bow-slingshot.png b/graphics/sprites/equipment/weapons/bow-slingshot.png
index 45e8e5fa..875faf2c 100644
--- a/graphics/sprites/equipment/weapons/bow-slingshot.png
+++ b/graphics/sprites/equipment/weapons/bow-slingshot.png
Binary files differ
diff --git a/items.xml b/items.xml
index 0baae82f..1a72f97d 100644
--- a/items.xml
+++ b/items.xml
@@ -3996,7 +3996,7 @@
<sprite gender="female">equipment/head/rosehat-female.xml|#6666aa,ccccff</sprite>
</item>
<item id="903"
- image="equipment/weapon/slingshot-icon.png"
+ image="equipment/weapon/slingshot-icon.png|G:#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;R:#332c19,443a20,453b1e,61532d,87733d,a58d4d;"
name="Sling Shot"
description="In the right hands, everything is a weapon."
effect="Damage +5 / Range 3"
@@ -4006,8 +4006,8 @@
attack-range="5"
weight="10"
missile-particle="graphics/particles/stoneprojectile.particle.xml">
- <sprite gender="male">equipment/weapons/bow-slingshot-male.xml</sprite>
- <sprite gender="female">equipment/weapons/bow-slingshot-female.xml</sprite>
+ <sprite gender="male">equipment/weapons/bow-slingshot-male.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
+ <sprite gender="female">equipment/weapons/bow-slingshot-female.xml|#48488c,48488e,48488f,695c21,5f5fbe,827229,6e6edb,9493a4,a4adff,bab8c2,bcbbc6,e3eaff;#332c19,443a20,453b1e,61532d,87733d,a58d4d;</sprite>
</item>
<item id="904"
image="equipment/ammo/stoneprojectile-icon.png"