Avatars update, cards :b

7 files changed, 70 insertions, 4 deletions

diff --git a/LICENSE b/LICENSE
index e499bd5f6..e6c9494c9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1049,6 +1049,11 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	    * 16 Thumbsup: Billr
 	    * 17 Interrogation Marks: Reid (CC BY-SA 3.0)
 	graphics/sprites/error.png (Reid)                                       (CC BY-SA 3.0)          (-)
+### Avatars
+	graphics/sprites/avatars/avatar-ship.png (jesusalva)                    (CC BY-SA 3.0)          (-)
+	graphics/sprites/avatars/aisleriot_ornamental.png (Callum McKenzie)     (GPL v3)                (Christian Persch, Jesusalva)
+        * https://gitlab.gnome.org/GNOME/aisleriot/blob/master/COPYING.README
+
 ### Accessories
 	graphics/sprites/accessories/blub-tentacle.png (Reid)                   (CC BY-SA 3.0)          (Coolkid782)
 	graphics/sprites/accessories/demonicmoubooantlers.png (Alige, Wombat)   (CC BY-SA 3.0)          (Saulc)
@@ -1520,7 +1525,6 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/sprites/npcs/sprite/artisdoor.png (IvanMorve, Reid)            (CC BY-SA 3.0)          (-)
 	graphics/sprites/npcs/sprite/artisindoor.png (IvanMorve, Reid)          (CC BY-SA 3.0)          (-)
 	graphics/sprites/npcs/sprite/artisindoor-wood.png (IvanMorve, Reid)     (CC BY-SA 3.0)          (-)
-	graphics/sprites/npcs/sprite/avatar-ship.png (jesusalva)                (CC BY-SA 3.0)          (-)
 	graphics/sprites/npcs/sprite/bacchus.png (Reid)                         (CC BY-SA 3.0)          (Enchilado)
 	graphics/sprites/npcs/sprite/bait.png (Reid)                            (CC BY-SA 3.0)          (-)
 	graphics/sprites/npcs/sprite/barbarians.png (ChefChelios, Nami)         (GPLv2), (CC BY-SA 3.0) (LoF)
diff --git a/avatars.xml b/avatars.xml
index 6c679f77f..977c81cfc 100644
--- a/avatars.xml
+++ b/avatars.xml
@@ -11,7 +11,7 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
         <sprite>monsters/piou.xml</sprite>
     </avatar>
     <avatar id="3" name="ship-avatar" width="64" height="54">
-        <sprite>npcs/xml/avatar-ship.xml</sprite>
+        <sprite>avatars/avatar-ship.xml</sprite>
     </avatar>
 
     <avatar id="119" name="name119">
@@ -202,4 +202,54 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
         <!-- Human Female, bearing a candel on a plate. -->
         <sprite>npcs/xml/mona.xml</sprite>
     </avatar>
+    <!-- All ids above 1000 are reserved -->
+
+    <!-- Aisleriot -->
+	<avatar id="1000" name="name1000">
+		<sprite variant="0">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- A -->
+	<avatar id="1001" name="name1001">
+		<sprite variant="1">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 2 -->
+	<avatar id="1002" name="name1002">
+		<sprite variant="2">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 3 -->
+	<avatar id="1003" name="name1003">
+		<sprite variant="3">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 4 -->
+	<avatar id="1004" name="name1004">
+		<sprite variant="4">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 5 -->
+	<avatar id="1005" name="name1005">
+		<sprite variant="5">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 6 -->
+	<avatar id="1006" name="name1006">
+		<sprite variant="6">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 7 -->
+	<avatar id="1007" name="name1007">
+		<sprite variant="7">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 8 -->
+	<avatar id="1008" name="name1008">
+		<sprite variant="8">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 9 -->
+	<avatar id="1009" name="name1009">
+		<sprite variant="9">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- 10 -->
+	<avatar id="1010" name="name1010">
+		<sprite variant="10">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- J -->
+	<avatar id="1011" name="name1011">
+		<sprite variant="11">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- Q -->
+	<avatar id="1012" name="name1012">
+		<sprite variant="12">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- K -->
+	<avatar id="1013" name="name1013">
+		<sprite variant="13">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- Red Joker -->
+	<avatar id="1015" name="name1015">
+		<sprite variant="15">avatars/aisleriot.xml</sprite>
+	</avatar> <!-- Red Card -->
+
+
 </avatars>
diff --git a/graphics/sprites/avatars/aisleriot.xml b/graphics/sprites/avatars/aisleriot.xml
new file mode 100644
index 000000000..0e2d5ac80
--- /dev/null
+++ b/graphics/sprites/avatars/aisleriot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<sprite variants="300" variant_offset="1">
+
+  <imageset name="base" src="graphics/sprites/avatars/aisleriot_ornamental.png" width="35" height="48" />
+
+  <action name="stand" imageset="base">
+    <animation direction="default">
+      <frame index="0" />
+    </animation>
+  </action>
+
+</sprite>
diff --git a/graphics/sprites/avatars/aisleriot_ornamental.png b/graphics/sprites/avatars/aisleriot_ornamental.png
new file mode 100644
index 000000000..37523deff
--- /dev/null
+++ b/graphics/sprites/avatars/aisleriot_ornamental.png
diff --git a/graphics/sprites/avatars/avatar-ship.png b/graphics/sprites/avatars/avatar-ship.png
new file mode 100644
index 000000000..92ac998fc
--- /dev/null
+++ b/graphics/sprites/avatars/avatar-ship.png
diff --git a/graphics/sprites/npcs/xml/avatar-ship.xml b/graphics/sprites/avatars/avatar-ship.xml
index 2285817dc..6ec286cf1 100644
--- a/graphics/sprites/npcs/xml/avatar-ship.xml
+++ b/graphics/sprites/avatars/avatar-ship.xml
@@ -4,9 +4,9 @@ Copyright (C) 2012 Evol Online -->
 
 <sprite>
     <imageset name="npc"
-              src="graphics/sprites/npcs/sprite/avatar-ship.png"
+              src="graphics/sprites/avatars/avatar-ship.png"
               width="64"
-              height="54"
+              height="40"
               offsetX="0"/>
 
     <action name="stand" imageset="npc">
diff --git a/graphics/sprites/npcs/sprite/avatar-ship.png b/graphics/sprites/npcs/sprite/avatar-ship.png
deleted file mode 100644
index fc8a2885a..000000000
--- a/graphics/sprites/npcs/sprite/avatar-ship.png
+++ /dev/null