diff options
| author | Micksha <ms-shaman@gmx.de> | 2020-04-09 07:45:02 +0000 |
|---|---|---|
| committer | Micksha <ms-shaman@gmx.de> | 2020-04-09 07:45:02 +0000 |
| commit | 724de9027c965553c870e1f69de8c8195d81c5e8 (patch) | |
| tree | b82dc82fddbf3be196d6259e0b56b5d0dac0fe3b /graphics | |
| parent | de8cfebcd6bfe491f931d7f444dca4a368e7df2d (diff) | |
| parent | c5c671c97a13a7d4f5f0a3573942056a469e3262 (diff) | |
| download | clientdata-724de9027c965553c870e1f69de8c8195d81c5e8.tar.gz clientdata-724de9027c965553c870e1f69de8c8195d81c5e8.tar.bz2 clientdata-724de9027c965553c870e1f69de8c8195d81c5e8.tar.xz clientdata-724de9027c965553c870e1f69de8c8195d81c5e8.zip | |
Merge branch 'candor' into 'master'
Candor
See merge request evol/clientdata!142
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/sprites/npcs/sprite/toichi.png | bin | 0 -> 4915 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/sprite/unanimated-legacy.png | bin | 74512 -> 91465 bytes | |||
| -rw-r--r-- | graphics/sprites/npcs/xml/toichi.xml | 35 | ||||
| -rw-r--r-- | graphics/sprites/npcs/xml/unanimated-legacy.xml | 2 | ||||
| -rw-r--r-- | graphics/tilesets/hurns-wood-lab-x3x3.png | bin | 0 -> 19336 bytes |
5 files changed, 36 insertions, 1 deletions
diff --git a/graphics/sprites/npcs/sprite/toichi.png b/graphics/sprites/npcs/sprite/toichi.png Binary files differnew file mode 100644 index 00000000..c7c04d60 --- /dev/null +++ b/graphics/sprites/npcs/sprite/toichi.png diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy.png b/graphics/sprites/npcs/sprite/unanimated-legacy.png Binary files differindex c35c4663..cd419199 100644 --- a/graphics/sprites/npcs/sprite/unanimated-legacy.png +++ b/graphics/sprites/npcs/sprite/unanimated-legacy.png diff --git a/graphics/sprites/npcs/xml/toichi.xml b/graphics/sprites/npcs/xml/toichi.xml new file mode 100644 index 00000000..e73db640 --- /dev/null +++ b/graphics/sprites/npcs/xml/toichi.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Reid, Micksha +Copyright (C) 2015-2020 Evol Online --> + +<sprite> + <imageset name="npc" + src="graphics/sprites/npcs/sprite/toichi.png" + width="40" + height="78"/> + + <action name="stand" imageset="npc"> + <animation direction="default"> + <label name="start"/> + <goto label="static" rand="90"/> + <goto label="hamlong" rand="33"/> + <goto label="ham" rand="100"/> + <!-- Long Hammering --> + <label name="hamlong"/> + <sequence start="0" end="3" repeat="6" delay="200"/> + <sequence start="0" end="2" repeat="2" delay="180"/> + <frame index="4" delay="240"/> + <goto label="start"/> + <!-- Long Move Animation --> + <label name="ham"/> + <sequence start="0" end="3" repeat="2" delay="200"/> + <sequence start="0" end="2" repeat="2" delay="180"/> + <frame index="4" delay="240"/> + <!-- Static Animation --> + <label name="static"/> + <frame index="4" delay="240"/> + <goto label="start"/> + <goto label="start"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/unanimated-legacy.xml b/graphics/sprites/npcs/xml/unanimated-legacy.xml index 9bd463d7..5e560fec 100644 --- a/graphics/sprites/npcs/xml/unanimated-legacy.xml +++ b/graphics/sprites/npcs/xml/unanimated-legacy.xml @@ -2,7 +2,7 @@ <!-- Author: Reid, Micksha Copyright (C) 2018 Evol Online --> -<sprite variants="32" variant_offset="1"> +<sprite variants="41" variant_offset="1"> <imageset name="npc" src="graphics/sprites/npcs/sprite/unanimated-legacy.png|S" width="64" diff --git a/graphics/tilesets/hurns-wood-lab-x3x3.png b/graphics/tilesets/hurns-wood-lab-x3x3.png Binary files differnew file mode 100644 index 00000000..1961dd00 --- /dev/null +++ b/graphics/tilesets/hurns-wood-lab-x3x3.png |
