summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE1
-rw-r--r--graphics/sprites/npcs/sprite/terry.pngbin0 -> 2356 bytes
-rw-r--r--graphics/sprites/npcs/sprite/unanimated.pngbin37848 -> 34202 bytes
-rw-r--r--graphics/sprites/npcs/xml/terry.xml20
-rw-r--r--graphics/sprites/npcs/xml/unanimated.xml2
-rw-r--r--npcs.xml10
6 files changed, 27 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index e7886613..916e7c87 100644
--- a/LICENSE
+++ b/LICENSE
@@ -249,6 +249,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/silvio.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/sleepingorc.png (Reid) (CC BY-SA 3.0) (Crush)
graphics/sprites/npcs/sprite/tarlan.png (Reid) (CC BY-SA 3.0) (Modanung)
+ graphics/sprites/npcs/sprite/terry.png (Reid) (CC BY-SA 3.0) (Modanung)
graphics/sprites/npcs/sprite/unanimated.png (Lien, Modanung, Reid) (CC BY-SA 3.0) (Talaroc, Fother)
## Races
graphics/sprites/races/demon-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy)
diff --git a/graphics/sprites/npcs/sprite/terry.png b/graphics/sprites/npcs/sprite/terry.png
new file mode 100644
index 00000000..f208cb44
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/terry.png
Binary files differ
diff --git a/graphics/sprites/npcs/sprite/unanimated.png b/graphics/sprites/npcs/sprite/unanimated.png
index bc8c5b70..0e3abfc6 100644
--- a/graphics/sprites/npcs/sprite/unanimated.png
+++ b/graphics/sprites/npcs/sprite/unanimated.png
Binary files differ
diff --git a/graphics/sprites/npcs/xml/terry.xml b/graphics/sprites/npcs/xml/terry.xml
new file mode 100644
index 00000000..bc317cc9
--- /dev/null
+++ b/graphics/sprites/npcs/xml/terry.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Reid
+Copyright (C) 2015 Evol Online -->
+<sprite>
+ <imageset name="npc"
+ src="graphics/sprites/npcs/sprite/terry.png"
+ width="32"
+ height="64"/>
+
+ <action name="stand" imageset="npc">
+ <!-- Flask animation -->
+ <animation direction="default">
+ <frame index="1"/>
+ </animation>
+ <!-- Static Flask -->
+ <animation direction="up">
+ <frame index="0"/>
+ </animation>
+ </action>
+</sprite>
diff --git a/graphics/sprites/npcs/xml/unanimated.xml b/graphics/sprites/npcs/xml/unanimated.xml
index 79db8068..f353ac50 100644
--- a/graphics/sprites/npcs/xml/unanimated.xml
+++ b/graphics/sprites/npcs/xml/unanimated.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Author: Reid
Copyright (C) 2012 Evol Online -->
-<sprite variants="13" variant_offset="1">
+<sprite variants="12" variant_offset="1">
<imageset name="npc"
src="graphics/sprites/npcs/sprite/unanimated.png|S"
width="64"
diff --git a/npcs.xml b/npcs.xml
index 8fe9d05b..00fa930c 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -115,11 +115,6 @@ IDs 990-999 = Special
<menu name="Buy" command="buy 'NAME'"/>
<menu name="Sell" command="sell 'NAME'"/>
</npc>
- <npc id="118">
- <!-- Raijin Male, librarian. -->
- <sprite variant="11">npcs/xml/unanimated.xml</sprite>
- <menu name="Talk" command="talk 'NAME'"/>
- </npc>
<!-- Animated NPCs -->
<npc id="401" targetCursor="small">
@@ -241,6 +236,11 @@ IDs 990-999 = Special
<sprite>npcs/xml/flask.xml</sprite>
<menu name="Launch" command="launch"/>
</npc>
+ <npc id="423">
+ <!-- Raijin Male, librarian. -->
+ <sprite>npcs/xml/terry.xml</sprite>
+ <menu name="Talk" command="talk 'NAME'"/>
+ </npc>
<npc id="800">
<!-- Test npc. -->