summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-08-24 11:06:30 -0400
committergumi <mekolat@users.noreply.github.com>2017-08-24 11:27:51 -0400
commitcc01c82d307e26c09010b42dbc3eddf29f8b48e1 (patch)
tree3092587c15a9f3a4af54f4d90b616f204d0e1764
parent99db75fe94313f7c63d0ae730df5c26fe80ad7bf (diff)
downloadclientdata-cc01c82d307e26c09010b42dbc3eddf29f8b48e1.tar.gz
clientdata-cc01c82d307e26c09010b42dbc3eddf29f8b48e1.tar.bz2
clientdata-cc01c82d307e26c09010b42dbc3eddf29f8b48e1.tar.xz
clientdata-cc01c82d307e26c09010b42dbc3eddf29f8b48e1.zip
This is getting ridiculous; we should use MRs
-rw-r--r--LICENSE2
-rw-r--r--graphics/sprites/npcs/sprite/confused-tree.pngbin5297 -> 0 bytes
-rw-r--r--graphics/sprites/npcs/xml/confused-tree.xml15
3 files changed, 8 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index 3d0d2119..381ea902 100644
--- a/LICENSE
+++ b/LICENSE
@@ -393,8 +393,6 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/treeleaf.png (Sogomn) (CC BY-SA 3.0) (Reid)
graphics/sprites/npcs/sprite/unanimated.png (Lien, Modanung, Reid) (CC BY-SA 3.0) (Crush, Fother, Talaroc)
graphics/sprites/npcs/sprite/unanimated-tall.png (Modanung, Nard, Reid) (GPLv2) (Yuuki)
- graphics/sprites/npcs/sprite/confused-tree.png (Saphy) (CC BY-SA 3.0) (Reid)
-
## Races
graphics/sprites/races/demon-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy)
graphics/sprites/races/demon-male.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy)
diff --git a/graphics/sprites/npcs/sprite/confused-tree.png b/graphics/sprites/npcs/sprite/confused-tree.png
deleted file mode 100644
index 866f33d3..00000000
--- a/graphics/sprites/npcs/sprite/confused-tree.png
+++ /dev/null
Binary files differ
diff --git a/graphics/sprites/npcs/xml/confused-tree.xml b/graphics/sprites/npcs/xml/confused-tree.xml
index 874a44bf..7f287522 100644
--- a/graphics/sprites/npcs/xml/confused-tree.xml
+++ b/graphics/sprites/npcs/xml/confused-tree.xml
@@ -4,30 +4,31 @@ Copyright (C) 2017 The Mana World -->
<sprite>
<imageset name="npc"
- src="graphics/sprites/npcs/sprite/confused-tree.png"
- width="160"
+ src="graphics/tilesets/tree-x4x5.png"
+ width="128"
height="160"/>
<action name="stand" imageset="npc">
- <!-- TODO: add missing frames -->
<!-- Winter -->
<animation direction="default">
- <frame index="0"/>
+ <!-- TODO: change when we will have remaining frames -->
+ <frame index="1" offsetX="16"/>
</animation>
<!-- Spring -->
<animation direction="downleft">
- <frame index="0"/>
+ <!-- TODO: change when we will have remaining frames -->
+ <frame index="0" offsetX="16"/>
</animation>
<!-- Summer -->
<animation direction="left">
- <frame index="0"/>
+ <frame index="0" offsetX="16"/>
</animation>
<!-- Autumn -->
<animation direction="upleft">
- <frame index="0"/>
+ <frame index="1" offsetX="16"/>
</animation>
</action>
</sprite>