summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorali-g <gauvain.dauchy@free.fr>2011-11-12 19:40:53 +0100
committerThe Kandiman <kandiman@kandiman.(none)>2011-11-13 12:32:37 -0500
commit7d20d57975cb09d6f666833bf56a4ee8263baf3f (patch)
treef048476f96af3e8934dd5c3e185cafe95cd9e8c3
parentea63bb9acdbb9d39107963eadf21a6e911c74f2d (diff)
downloadclientdata-7d20d57975cb09d6f666833bf56a4ee8263baf3f.tar.gz
clientdata-7d20d57975cb09d6f666833bf56a4ee8263baf3f.tar.bz2
clientdata-7d20d57975cb09d6f666833bf56a4ee8263baf3f.tar.xz
clientdata-7d20d57975cb09d6f666833bf56a4ee8263baf3f.zip
Added two new Bodyguard Elves (NPCs) made by Lizandra. Added the Saboteur NPC made by Wombat. christmas_npcs.png has one more spot for the Gnome that is still WIP.
-rw-r--r--graphics/sprites/npcs/christmas_npcs.pngbin12845 -> 18949 bytes
-rw-r--r--graphics/sprites/npcs/christmas_npcs.xml2
-rw-r--r--graphics/sprites/npcs/saboteur.pngbin0 -> 1351 bytes
-rw-r--r--graphics/sprites/npcs/saboteur.xml9
-rw-r--r--npcs.xml16
5 files changed, 20 insertions, 7 deletions
diff --git a/graphics/sprites/npcs/christmas_npcs.png b/graphics/sprites/npcs/christmas_npcs.png
index 80ab523e..af4352ce 100644
--- a/graphics/sprites/npcs/christmas_npcs.png
+++ b/graphics/sprites/npcs/christmas_npcs.png
Binary files differ
diff --git a/graphics/sprites/npcs/christmas_npcs.xml b/graphics/sprites/npcs/christmas_npcs.xml
index b4ab7a72..1679d0c1 100644
--- a/graphics/sprites/npcs/christmas_npcs.xml
+++ b/graphics/sprites/npcs/christmas_npcs.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<sprite variants="10" variant_offset="1">
+<sprite variants="8" variant_offset="1">
<imageset name="base" src="graphics/sprites/npcs/christmas_npcs.png" width="50" height="90" />
<action name="stand" imageset="base">
diff --git a/graphics/sprites/npcs/saboteur.png b/graphics/sprites/npcs/saboteur.png
new file mode 100644
index 00000000..150840fd
--- /dev/null
+++ b/graphics/sprites/npcs/saboteur.png
Binary files differ
diff --git a/graphics/sprites/npcs/saboteur.xml b/graphics/sprites/npcs/saboteur.xml
new file mode 100644
index 00000000..06f7b578
--- /dev/null
+++ b/graphics/sprites/npcs/saboteur.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<sprite>
+ <imageset name="base" src="graphics/sprites/npcs/saboteur.png|R;G;B;C;Y;M" width="38" height="57" />
+ <action name="stand" imageset="base">
+ <animation direction="default">
+ <frame index="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/npcs.xml b/npcs.xml
index 3c28289e..cd66f0ff 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -248,11 +248,15 @@
<npc id="327"><sprite>npcs/evil-obelisk.xml</sprite></npc><!-- Evil Obelisk -->
<npc id="328"><sprite variant="0">npcs/christmas_npcs.xml</sprite></npc><!-- Elf -->
<npc id="329"><sprite variant="1">npcs/christmas_npcs.xml</sprite></npc><!-- Cloaked Elf -->
-<npc id="330"><sprite variant="2">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf -->
-<npc id="331"><sprite variant="3">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf2 -->
-<npc id="332"><sprite variant="4">npcs/christmas_npcs.xml</sprite></npc><!-- Nutcracker -->
-<npc id="333"><sprite variant="0">npcs/thermin_npcs.xml</sprite></npc><!-- Fortune Teller -->
-<npc id="334"><sprite variant="1">npcs/thermin_npcs.xml</sprite></npc><!-- Steam Punk -->
-<npc id="335"><sprite>npcs/furnace.xml</sprite></npc><!-- Furnace -->
+<npc id="330"><sprite variant="2">npcs/christmas_npcs.xml</sprite></npc><!-- Nutcracker -->
+<!-- ID 331 Gnome -->
+<npc id="332"><sprite variant="4">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf1 -->
+<npc id="333"><sprite variant="5">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf2 -->
+<npc id="334"><sprite variant="6">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf3 -->
+<npc id="335"><sprite variant="7">npcs/christmas_npcs.xml</sprite></npc><!-- Bodyguard Elf4 -->
+<npc id="336"><sprite>npcs/saboteur.xml|#736f6e;#25383c;#ff0000;#00ff00;#feffab;#ffff00</sprite></npc><!-- Saboteur -->
+<npc id="337"><sprite variant="0">npcs/thermin_npcs.xml</sprite></npc><!-- Fortune Teller -->
+<npc id="338"><sprite variant="1">npcs/thermin_npcs.xml</sprite></npc><!-- Steam Punk -->
+<npc id="339"><sprite>npcs/furnace.xml</sprite></npc><!-- Furnace -->
<!-- note: don't go above 999, because the 1000's are reserved for mob id -->
</npcs>