diff options
| author | Ali-G <gauvain.dauchy@free.fr> | 2011-06-15 17:09:41 +0200 |
|---|---|---|
| committer | Ali-G <gauvain.dauchy@free.fr> | 2011-06-15 17:09:41 +0200 |
| commit | e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3 (patch) | |
| tree | 6cb9178035e1775b74bf74532bdd439f905ef1f5 | |
| parent | 727b118e90f8ff15dff948c74b4fcf05c0599f5f (diff) | |
| parent | 3e565300a297a7f88b3fe05432cd7eba91020b91 (diff) | |
| download | clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.gz clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.bz2 clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.tar.xz clientdata-e82b0f1c1a15ba1aad991350130f3d6dd9ead7e3.zip | |
Merge branch 'master' of git://gitorious.org/+dm-developers/tmw/rossy-client
Conflicts:
monsters.xml
| -rw-r--r-- | graphics/sprites/monsters/monster-skull-ice.png | bin | 0 -> 20129 bytes | |||
| -rw-r--r-- | graphics/sprites/monsters/monster-skull-ice.xml | 75 | ||||
| -rw-r--r-- | graphics/tiles/Woodland_village_x2.png | bin | 21769 -> 21759 bytes | |||
| -rwxr-xr-x | graphics/tiles/thermin-cave.png | bin | 0 -> 23884 bytes | |||
| -rwxr-xr-x | graphics/tiles/thermin-town.png | bin | 0 -> 91358 bytes | |||
| -rw-r--r-- | monsters.xml | 4 |
6 files changed, 79 insertions, 0 deletions
diff --git a/graphics/sprites/monsters/monster-skull-ice.png b/graphics/sprites/monsters/monster-skull-ice.png Binary files differnew file mode 100644 index 00000000..dcc66922 --- /dev/null +++ b/graphics/sprites/monsters/monster-skull-ice.png diff --git a/graphics/sprites/monsters/monster-skull-ice.xml b/graphics/sprites/monsters/monster-skull-ice.xml new file mode 100644 index 00000000..14375a0d --- /dev/null +++ b/graphics/sprites/monsters/monster-skull-ice.xml @@ -0,0 +1,75 @@ +<?xml version="1.0"?> +<sprite> + + <imageset name="base" src="graphics/sprites/monsters/monster-skull-ice.png" width="45" height="60" /> + + <action name="stand" imageset="base"> + <animation direction="down"> + <frame index="0" delay="350" /> + <frame index="1" delay="350" /> + </animation> + <animation direction="left"> + <frame index="12" delay="350" /> + <frame index="13" delay="350" /> + </animation> + <animation direction="up"> + <frame index="24" delay="350" /> + <frame index="25" delay="350" /> + </animation> + <animation direction="right"> + <frame index="36" delay="350" /> + <frame index="37" delay="350" /> + </animation> + </action> + + <action name="walk" imageset="base"> + <animation direction="down"> + <sequence start="0" end="4" delay="150" /> + </animation> + <animation direction="left"> + <sequence start="12" end="16" delay="150" /> + </animation> + <animation direction="up"> + <sequence start="24" end="28" delay="150" /> + </animation> + <animation direction="right"> + <sequence start="36" end="40" delay="150" /> + </animation> + </action> + + + <action name="dead" imageset="base"> + <animation direction="right"> + <sequence start="44" end="46" delay="150" /> + <frame index="47" delay="0" /> + </animation> + <animation direction="down"> + <sequence start="8" end="10" delay="150" /> + <frame index="11" delay="0" /> + </animation> + <animation direction="left"> + <sequence start="20" end="22" delay="150" /> + <frame index="23" delay="0" /> + </animation> + <animation direction="up"> + <sequence start="32" end="34" delay="150" /> + <frame index="35" delay="0" /> + </animation> + </action> + + <action name="attack" imageset="base"> + <animation direction="down"> + <sequence start="5" end="7" delay="100" /> + </animation> + <animation direction="left"> + <sequence start="17" end="19" delay="100" /> + </animation> + <animation direction="up"> + <sequence start="29" end="31" delay="100" /> + </animation> + <animation direction="right"> + <sequence start="41" end="43" delay="100" /> + </animation> + </action> + +</sprite> diff --git a/graphics/tiles/Woodland_village_x2.png b/graphics/tiles/Woodland_village_x2.png Binary files differindex e0f067a0..9d853b0b 100644 --- a/graphics/tiles/Woodland_village_x2.png +++ b/graphics/tiles/Woodland_village_x2.png diff --git a/graphics/tiles/thermin-cave.png b/graphics/tiles/thermin-cave.png Binary files differnew file mode 100755 index 00000000..2fa926c5 --- /dev/null +++ b/graphics/tiles/thermin-cave.png diff --git a/graphics/tiles/thermin-town.png b/graphics/tiles/thermin-town.png Binary files differnew file mode 100755 index 00000000..34bc9a08 --- /dev/null +++ b/graphics/tiles/thermin-town.png diff --git a/monsters.xml b/monsters.xml index 5463f214..38a22cce 100644 --- a/monsters.xml +++ b/monsters.xml @@ -470,4 +470,8 @@ <sound event="miss">monsters/scorpion/scorpion-miss1.ogg</sound> </monster> + <monster id="83" name="Ice Skull"> + <sprite>monsters/monster-skull-ice.xml</sprite> + </monster> + </monsters> |
