summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChuck Miller <shadowmil@gmail.com>2010-07-10 02:59:00 -0400
committerChuck Miller <shadowmil@gmail.com>2010-07-10 02:59:00 -0400
commit59af0f4d00e5cc4615de3c5e4596e21ba8b1f3ab (patch)
tree8d8a6bd06841b9d1121c8ff94ce549ec76056b3d
parentafe5c4a69e764d74afe97fcaa2cb49bcdf4b745f (diff)
parentdfd1701bb918969fc80ef3902dc0da5d6b353770 (diff)
downloadclientdata-59af0f4d00e5cc4615de3c5e4596e21ba8b1f3ab.tar.gz
clientdata-59af0f4d00e5cc4615de3c5e4596e21ba8b1f3ab.tar.bz2
clientdata-59af0f4d00e5cc4615de3c5e4596e21ba8b1f3ab.tar.xz
clientdata-59af0f4d00e5cc4615de3c5e4596e21ba8b1f3ab.zip
Merge branch 'master' of gitorious.org:tmwdata/mainline
-rw-r--r--graphics/sprites/monsters/accessories/generic-shadow-small-circle.xml (renamed from graphics/sprites/monsters/accessories/bee-shadow.xml)0
-rw-r--r--monsters.xml3
2 files changed, 2 insertions, 1 deletions
diff --git a/graphics/sprites/monsters/accessories/bee-shadow.xml b/graphics/sprites/monsters/accessories/generic-shadow-small-circle.xml
index 6aac520a..6aac520a 100644
--- a/graphics/sprites/monsters/accessories/bee-shadow.xml
+++ b/graphics/sprites/monsters/accessories/generic-shadow-small-circle.xml
diff --git a/monsters.xml b/monsters.xml
index 8bfbe228..037043a4 100644
--- a/monsters.xml
+++ b/monsters.xml
@@ -1230,7 +1230,7 @@ exp<TAG>: Tells how much experience point a monster is giving up
<monster id="47" name="Bee" targetCursor="small">
<sprite>monsters/monster-bee.xml</sprite>
- <sprite>monsters/accessories/bee-shadow.xml</sprite>
+ <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite>
<!-- Insert Bee Stats here -->
</monster>
@@ -1242,6 +1242,7 @@ exp<TAG>: Tells how much experience point a monster is giving up
<monster id="53" name="Butterfly" targetCursor="small">
<sprite>monsters/monster-butterfly.xml|#660000,FF3300,FFCC99,FFCCCC</sprite>
+ <sprite>monsters/accessories/generic-shadow-small-circle.xml</sprite>
</monster>
</monsters>