summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--LICENSE5
-rw-r--r--graphics/sprites/npcs/xml/koga.xml4
-rw-r--r--graphics/sprites/npcs/xml/lumberjack.xml4
-rw-r--r--npcs.xml10
4 files changed, 14 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index e48de02b..1f42a419 100644
--- a/LICENSE
+++ b/LICENSE
@@ -498,9 +498,11 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/harbour.png (EJlol, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/hammock.png (IvanMorve) (CC BY-SA 3.0) (Reid)
graphics/sprites/npcs/sprite/hammock-animated.png (IvanMorve) (CC BY-SA 3.0) (Reid)
+ graphics/sprites/npcs/sprite/hinnak.png (Micksha) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/interactive.png (Hal9000, Modanung, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/jenna.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/julia.png (Reid) (CC BY-SA 3.0) (Modanung)
+ graphics/sprites/npcs/sprite/lumberjack.png (LEGACY) (CC BY-SA 3.0) (Micksha)
graphics/sprites/npcs/sprite/lydon.png (Reid) (CC BY-SA 3.0) (Modanung)
graphics/sprites/npcs/sprite/magicarpan.png (Reid) (CC BY-SA 3.0) (Len, Modanung)
graphics/sprites/npcs/sprite/mona.png (Reid) (CC BY-SA 3.0) (-)
@@ -508,6 +510,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/piourocket.png (Reid) (CC BY-SA 3.0) (Fother_J)
graphics/sprites/npcs/sprite/qonan.png (Reid) (CC BY-SA 3.0) (Modanung)
graphics/sprites/npcs/sprite/rattosailor.png (Reid) (CC BY-SA 3.0) (Coolkid782, Modanung, Talaroc)
+ graphics/sprites/npcs/sprite/richard.png (Micksha) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/rumly.png (Reid) (CC BY-SA 3.0) (Crush, Modanung, Talaroc)
graphics/sprites/npcs/sprite/sailors.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc)
graphics/sprites/npcs/sprite/sapartan.png (Reid) (CC BY-SA 3.0) (Modanung)
@@ -517,6 +520,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/terry.png (Reid) (CC BY-SA 3.0) (Salva)
graphics/sprites/npcs/sprite/treeleaf.png (Sogomn) (CC BY-SA 3.0) (Reid)
graphics/sprites/npcs/sprite/unanimated.png (Lien, Modanung, Reid) (CC BY-SA 3.0) (Crush, Fother, Talaroc)
+ graphics/sprites/npcs/sprite/unanimated-legacy.png (LEGACY) (CC BY-SA 3.0) (Micksha)
+ graphics/sprites/npcs/sprite/unanimated-legacy-tall.png (LEGACY) (CC BY-SA 3.0) (-)
graphics/sprites/npcs/sprite/unanimated-tall.png (Modanung, Nard, Reid) (GPLv2) (Yuuki)
## Races
graphics/sprites/races/demon-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy)
diff --git a/graphics/sprites/npcs/xml/koga.xml b/graphics/sprites/npcs/xml/koga.xml
index cff9a83e..262f2af0 100644
--- a/graphics/sprites/npcs/xml/koga.xml
+++ b/graphics/sprites/npcs/xml/koga.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<sprite variants="1" variant_offset="1">
- <imageset name="base" src="graphics/sprites/npcs/koga.png" width="634" height="477"/>
- <action name="stand" imageset="base">
+ <imageset name="base" src="graphics/sprites/npcs/sprite/koga.png" width="634" height="477"/>
+ <action name="stand" imageset="npc">
<animation direction="default">
<frame index="0"/>
</animation>
diff --git a/graphics/sprites/npcs/xml/lumberjack.xml b/graphics/sprites/npcs/xml/lumberjack.xml
index c099838b..e56cc3fa 100644
--- a/graphics/sprites/npcs/xml/lumberjack.xml
+++ b/graphics/sprites/npcs/xml/lumberjack.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<sprite>
- <imageset name="base" src="graphics/sprites/npcs/npc-lumberjack.png" width="42" height="63"/>
- <action name="stand" imageset="base">
+ <imageset name="base" src="graphics/sprites/npcs/lumberjack.png" width="42" height="63"/>
+ <action name="stand" imageset="npc">
<animation direction="default">
<!-- eyes movements -->
<frame index="0" delay="3000"/>
diff --git a/npcs.xml b/npcs.xml
index d80d7410..05e0e718 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -373,27 +373,27 @@ IDs 900-999 = Special
<sprite variant="20">npcs/xml/unanimated-legacy.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="170">
+ <npc id="171">
<!-- LEGACY - Princess, Celestia. -->
<sprite variant="0">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="171">
+ <npc id="172">
<!-- LEGACY - Young Man without taste, Dyer. -->
<sprite variant="1">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="172">
+ <npc id="173">
<!-- LEGACY - Young Man with Top Hat, Dimond. -->
<sprite variant="2">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="173">
+ <npc id="174">
<!-- LEGACY - Mid-aged Man, Chef. -->
<sprite variant="3">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
- <npc id="174">
+ <npc id="175">
<!-- LEGACY - Young sexy lady with Rabbit Ears. -->
<sprite variant="4">npcs/xml/unanimated-legacy-tall.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>