summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgumi <mekolat@users.noreply.github.com>2017-08-22 22:21:42 -0400
committergumi <mekolat@users.noreply.github.com>2017-08-22 22:21:42 -0400
commit99db75fe94313f7c63d0ae730df5c26fe80ad7bf (patch)
tree5341c66c383a83af096d21604bfbadcaa1601e13
parent8b2cf738edf8bd94f61364944e255bd6ae9fe873 (diff)
downloadclientdata-99db75fe94313f7c63d0ae730df5c26fe80ad7bf.tar.gz
clientdata-99db75fe94313f7c63d0ae730df5c26fe80ad7bf.tar.bz2
clientdata-99db75fe94313f7c63d0ae730df5c26fe80ad7bf.tar.xz
clientdata-99db75fe94313f7c63d0ae730df5c26fe80ad7bf.zip
partially revert 11dfb45
-rw-r--r--LICENSE2
-rw-r--r--graphics/sprites/npcs/sprite/confused-tree.pngbin0 -> 5297 bytes
-rw-r--r--graphics/sprites/npcs/xml/confused-tree.xml11
3 files changed, 7 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index 381ea902..3d0d2119 100644
--- a/LICENSE
+++ b/LICENSE
@@ -393,6 +393,8 @@ 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
new file mode 100644
index 00000000..866f33d3
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/confused-tree.png
Binary files differ
diff --git a/graphics/sprites/npcs/xml/confused-tree.xml b/graphics/sprites/npcs/xml/confused-tree.xml
index 3bd6ac71..874a44bf 100644
--- a/graphics/sprites/npcs/xml/confused-tree.xml
+++ b/graphics/sprites/npcs/xml/confused-tree.xml
@@ -4,20 +4,19 @@ Copyright (C) 2017 The Mana World -->
<sprite>
<imageset name="npc"
- src="graphics/tilesets/tree-x4x5.png"
- width="128"
+ src="graphics/sprites/npcs/sprite/confused-tree.png"
+ width="160"
height="160"/>
<action name="stand" imageset="npc">
+ <!-- TODO: add missing frames -->
<!-- Winter -->
<animation direction="default">
- <!-- TODO: change when we will have remaining frames -->
- <frame index="1"/>
+ <frame index="0"/>
</animation>
<!-- Spring -->
<animation direction="downleft">
- <!-- TODO: change when we will have remaining frames -->
<frame index="0"/>
</animation>
@@ -28,7 +27,7 @@ Copyright (C) 2017 The Mana World -->
<!-- Autumn -->
<animation direction="upleft">
- <frame index="1"/>
+ <frame index="0"/>
</animation>
</action>
</sprite>