summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-02-03 05:08:52 +0100
committerReid <reidyaro@gmail.com>2015-02-03 05:08:52 +0100
commit8f6bf9d178e24305617799884d45bec26d0abdce (patch)
tree15562d674366a8db2440afed1d470f6eb1cb85ad
parentefbac47abf04d41059b85bade5479a5865487b6c (diff)
downloadclientdata-8f6bf9d178e24305617799884d45bec26d0abdce.tar.gz
clientdata-8f6bf9d178e24305617799884d45bec26d0abdce.tar.bz2
clientdata-8f6bf9d178e24305617799884d45bec26d0abdce.tar.xz
clientdata-8f6bf9d178e24305617799884d45bec26d0abdce.zip
Renome and move harbour sprites.
-rw-r--r--LICENSE6
-rw-r--r--graphics/sprites/accessories/harbourhook.png (renamed from graphics/sprites/npcs/sprite/harbourhook.png)bin16104 -> 16104 bytes
-rw-r--r--graphics/sprites/accessories/harbourrope.png (renamed from graphics/sprites/npcs/sprite/harbourrope.png)bin8469 -> 8469 bytes
-rw-r--r--graphics/sprites/npcs/sprite/harbour.png (renamed from graphics/sprites/npcs/sprite/harbourbase.png)bin22140 -> 22140 bytes
-rw-r--r--npcs.xml7
5 files changed, 10 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index da3349b7..db073de5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -136,6 +136,8 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/accessories/blub-tentacle.png (Reid) (CC BY-SA 3.0) (Coolkid782)
graphics/sprites/accessories/eye-down-blink.png (Talaroc) (CC BY-SA 3.0) (Reid)
graphics/sprites/accessories/eye-left-blink.png (Talaroc) (CC BY-SA 3.0) (Reid)
+ graphics/sprites/accessories/harbour-hook.png (EJlol, Reid) (CC BY-SA 3.0) (-)
+ graphics/sprites/accessories/harbour-rope.png (EJlol, Reid) (CC BY-SA 3.0) (-)
graphics/sprites/accessories/littleblub-tentacle.png (Coolkid782) (CC BY-SA 3.0) (Reid)
graphics/sprites/accessories/piousse-egg.png (Reid) (CC BY-SA 3.0) (-)
graphics/sprites/accessories/ratto-tail.png (Coolkid782) (CC BY-SA 3.0) (-)
@@ -229,9 +231,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/sprites/npcs/sprite/cookiemaster.png (Hal9000, Reid) (CC BY-SA 3.0) (Alige)
graphics/sprites/npcs/sprite/elmo.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc)
graphics/sprites/npcs/sprite/gugli.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc)
- graphics/sprites/npcs/sprite/harbourbase.png (EJlol, Reid) (CC BY-SA 3.0) (-)
- graphics/sprites/npcs/sprite/harbourhook.png (EJlol, Reid) (CC BY-SA 3.0) (-)
- graphics/sprites/npcs/sprite/harbourrope.png (EJlol, Reid) (CC BY-SA 3.0) (-)
+ 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/interactive.png (Hal9000, Modanung, Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/sprites/npcs/sprite/harbourhook.png b/graphics/sprites/accessories/harbourhook.png
index 36962859..36962859 100644
--- a/graphics/sprites/npcs/sprite/harbourhook.png
+++ b/graphics/sprites/accessories/harbourhook.png
Binary files differ
diff --git a/graphics/sprites/npcs/sprite/harbourrope.png b/graphics/sprites/accessories/harbourrope.png
index 09925b5b..09925b5b 100644
--- a/graphics/sprites/npcs/sprite/harbourrope.png
+++ b/graphics/sprites/accessories/harbourrope.png
Binary files differ
diff --git a/graphics/sprites/npcs/sprite/harbourbase.png b/graphics/sprites/npcs/sprite/harbour.png
index ccf00120..ccf00120 100644
--- a/graphics/sprites/npcs/sprite/harbourbase.png
+++ b/graphics/sprites/npcs/sprite/harbour.png
Binary files differ
diff --git a/npcs.xml b/npcs.xml
index f14db90b..6bb9b705 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -216,6 +216,13 @@ IDs 990-999 = Special
<sprite>accessories/eye-down-blink.xml</sprite>
<menu name="Talk" command="talk 'NAME'"/>
</npc>
+ <npc id="420">
+ <!-- Harbour with a funny wheel. -->
+ <sprite>npcs/xml/harbourbase.xml</sprite>
+ <sprite>accessories/harbour-hook.xml</sprite>
+ <sprite>accessories/harbour-rope.xml</sprite>
+ <menu name="Talk" command="talk 'NAME'"/>
+ </npc>
<npc id="800">
<!-- Test npc. -->