summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJared Adams <jaxad0127@gmail.com>2009-01-07 13:42:42 +0000
committerJared Adams <jaxad0127@gmail.com>2009-01-07 13:42:42 +0000
commitc5d3d7b20d8296905eb550cc9b087f60fbd91601 (patch)
tree89954b32ee8885098d989fb352e636f4e090894c
parentf5bb15d55c0c2cb8b1edeff02db4236a5408c429 (diff)
parent0c63e48187379692cf9d7f4bf95d7d26299ebc87 (diff)
downloadclientdata-c5d3d7b20d8296905eb550cc9b087f60fbd91601.tar.gz
clientdata-c5d3d7b20d8296905eb550cc9b087f60fbd91601.tar.bz2
clientdata-c5d3d7b20d8296905eb550cc9b087f60fbd91601.tar.xz
clientdata-c5d3d7b20d8296905eb550cc9b087f60fbd91601.zip
Merge branch 'master' of git@gitorious.org:tmwdata/mainline
-rw-r--r--graphics/sprites/npc-creepysurgeon.pngbin0 -> 26194 bytes
-rw-r--r--graphics/sprites/npc-creepysurgeon.xml28
-rw-r--r--npcs.xml2
3 files changed, 29 insertions, 1 deletions
diff --git a/graphics/sprites/npc-creepysurgeon.png b/graphics/sprites/npc-creepysurgeon.png
new file mode 100644
index 00000000..88fc095c
--- /dev/null
+++ b/graphics/sprites/npc-creepysurgeon.png
Binary files differ
diff --git a/graphics/sprites/npc-creepysurgeon.xml b/graphics/sprites/npc-creepysurgeon.xml
new file mode 100644
index 00000000..9542317d
--- /dev/null
+++ b/graphics/sprites/npc-creepysurgeon.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/npc-creepysurgeon.png" width="50" height="70" />
+ <action name="stand" imageset="base">
+ <animation direction="default">
+ <!-- Scissor demonstration -->
+ <sequence start="1" end="9" delay="200" />
+ <frame index="10" delay="500"/>
+ <frame index="11" delay="500"/>
+ <frame index="10" delay="500"/>
+ <frame index="11" delay="500"/>
+ <frame index="10" delay="500"/>
+ <frame index="11" delay="500"/>
+ <frame index="10" delay="500"/>
+ <frame index="12" delay="300"/>
+ <frame index="13" delay="1000"/>
+ <sequence start="14" end="16" delay="400" />
+ <frame index="0" delay="3000"/>
+ <!-- blinking -->
+ <frame index="19" delay="500"/>
+ <frame index="0" delay="3000"/>
+ <!-- checking pocket -->
+ <frame index="12" delay="1000"/>
+ <sequence start="14" end="16" delay="400" />
+ <frame index="0" delay="3000"/>
+ </animation>
+ </action>
+</sprite> \ No newline at end of file
diff --git a/npcs.xml b/npcs.xml
index 771f900e..e10db166 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -44,7 +44,7 @@
<npc id="133"><sprite variant="33">npc.xml</sprite></npc><!-- Captain Kirk -->
<npc id="134"><sprite variant="34">npc.xml</sprite></npc><!-- Mr. Spock -->
<npc id="135"><sprite variant="35">npc.xml</sprite></npc><!-- Guy with sword over shoulder -->
-<npc id="136"><sprite variant="36">npc.xml</sprite></npc><!-- Creepy surgeon guy -->
+<npc id="136"><sprite>npc-creepysurgeon.xml</sprite></npc><!-- Creepy surgeon guy -->
<npc id="137"><sprite variant="37">npc.xml</sprite></npc><!-- Metrosexual guy with pink jacket on stool -->
<npc id="138"><sprite variant="38">npc.xml</sprite></npc><!-- Zombie pirate captain-->
<npc id="139"><sprite variant="39">npc.xml</sprite></npc><!-- Girl in playboy bunny costume -->