Merge branch 'master' of gitlab.com:TMW2/clientdata

9 files changed, 66 insertions, 25 deletions

diff --git a/LICENSE b/LICENSE
index 555ef340..1980e45b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -102,6 +102,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/equipment/weapons/woodensword.png (Len)                  (CC BY-SA 3.0)        (Reid)
 
 ## Generic
+    graphics/items/generic/amethyst.png (Crush, Enchilado)                  (CC BY-SA 3.0)        (Saulc)
     graphics/items/generic/box-aquada.png (Hal9000)                         (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/box-croconut.png (Hal9000)                       (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/box-fish.png (Hal9000)                           (CC BY-SA 3.0)        (Reid)
@@ -109,8 +110,10 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/generic/carp.png (Reid)                                  (CC BY-SA 3.0)        (-)
     graphics/items/generic/coral.png (Reid)                                 (CC BY-SA 3.0)        (Enchilado)
     graphics/items/generic/crocclaw.png (Reid)                              (CC BY-SA 3.0)        (Enchilado)
+    graphics/items/generic/diamond.png (Crush, Enchilado)                   (CC BY-SA 3.0)        (-)
     graphics/items/generic/dish-poisoned.png (Hal9000)                      (CC BY-SA 3.0)        (Alige)
     graphics/items/generic/eggshell-half.png (Reid)                         (CC BY-SA 3.0)        (-)
+    graphics/items/generic/emerald.png (Crush, Enchilado)                   (CC BY-SA 3.0)        (Saulc)
     graphics/items/generic/fur.png (Crush)                                  (CC BY-SA 3.0)        (Alige)
     graphics/items/generic/key-ship.png (Hal9000)                           (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/letter-stamp.png (Reid)                          (CC BY-SA 3.0)        (-)
@@ -120,13 +123,16 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/items/generic/pioufeathers.png (Reid)                          (CC BY-SA 3.0)        (Fother_J)
     graphics/items/generic/pumpkin.png (Enchilado)                          (CC BY-SA 3.0)        (-)
     graphics/items/generic/rattotail.png (Reid)                             (CC BY-SA 3.0)        (Alige)
+    graphics/items/generic/ruby.png (Crush, Enchilado)                      (CC BY-SA 3.0)        (Saulc)
     graphics/items/generic/fishingrod.png (Reid)                            (CC BY-SA 3.0)        (-)
+    graphics/items/generic/sapphire.png (Crush, Enchilado)                  (CC BY-SA 3.0)        (Saulc)
     graphics/items/generic/smalltentacles.png (Coolkid782)                  (CC BY-SA 3.0)        (Reid)
     graphics/items/generic/squichyclaws.png (Reid)                          (CC BY-SA 3.0)        (-)
     graphics/items/generic/teeth-bat.png (Enchilado)                        (CC BY-SA 3.0)        (Alige)
     graphics/items/generic/teeth-ratto.png (Reid)                           (CC BY-SA 3.0)        (Alige)
     graphics/items/generic/tentacles.png (Reid)                             (CC BY-SA 3.0)        (-)
     graphics/items/generic/tongue.png (Enchilado)                           (CC BY-SA 3.0)        (Alige)
+    graphics/items/generic/topaz.png (Crush, Enchilado)                  (CC BY-SA 3.0)        (Saulc)
     graphics/items/generic/tortugashell.png (Reid)                          (CC BY-SA 3.0)        (-)
     graphics/items/generic/tortugashell-fragment.png (Reid)                 (CC BY-SA 3.0)        (-)
     graphics/items/generic/wing-bat.png (Crush)                             (CC BY-SA 3.0)        (-)
@@ -353,9 +359,16 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/icons/poison.png (FotherJ)                             (CC BY-SA 3.0)        (-)
     graphics/sprites/icons/spell-protection.png (Reid)                      (CC BY-SA 3.0)        (Alige)
 ## Monsters
+    graphics/sprites/monsters/archant.png (?, Wombat)                       (GPLv2)               (-)
+    graphics/sprites/monsters/bandit.png (Alige, Skipy, Wombat)             (GPLv2)               (-)
+    graphics/sprites/monsters/banditlord.png (Alige, Skipy, Wombat)         (GPLv2)               (-)
+    graphics/sprites/monsters/bat.png (neoriceisgood)                       (GPLv2)               (-)
+    graphics/sprites/monsters/bif.png (Saulc)                               (CC BY-SA 3.0)        (Polaczek)
+    graphics/sprites/monsters/bigbif.png (Saulc)                            (CC BY-SA 3.0)        (Polaczek)
     graphics/sprites/monsters/blub.png (Reid)                               (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/blub-little.png (Coolkid782)                  (CC BY-SA 3.0)        (Reid)
     graphics/sprites/monsters/blub-toppy.png (Reid)                         (CC BY-SA 3.0)        (-)
+    graphics/sprites/monsters/candorscorpion (?, Saulc)                     (GPLv2)               (Saulc)
     graphics/sprites/monsters/crafty.png (Bagzie)                           (CC BY-SA 3.0)        (Reid)
     graphics/sprites/monsters/croc.png (Reid)                               (CC BY-SA 3.0)        (Coolkid782, Enchilado)
     graphics/sprites/monsters/crocotree.png (Hal9000)                       (CC BY-SA 3.0)        (-)
@@ -370,6 +383,7 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
     graphics/sprites/monsters/plushroom.png (Reid)                          (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/pumpkish.png (Aeonchild)                      (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/ratto.png (Coolkid782)                        (CC BY-SA 3.0)        (-)
+    graphics/sprites/monsters/smallbif.png (Saulc)                          (CC BY-SA 3.0)        (Polaczek)
     graphics/sprites/monsters/tipiou.png (Bagzie)                           (CC BY-SA 3.0)        (-)
     graphics/sprites/monsters/tortuga.png (Coolkid782)                      (CC BY-SA 3.0)        (Reid)
     graphics/sprites/monsters/oceanpirate.png (Saulc)                       (CC BY-SA 3.0)        (Saulc)
diff --git a/graphics/items/usable/food/.gitkeep b/graphics/items/usable/food/.gitkeep
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/graphics/items/usable/food/.gitkeep
diff --git a/graphics/sprites/monsters/alphamouboo.xml b/graphics/sprites/monsters/alphamouboo.xml
index 78b7e775..0b160c6b 100644
--- a/graphics/sprites/monsters/alphamouboo.xml
+++ b/graphics/sprites/monsters/alphamouboo.xml
@@ -1,7 +1,11 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW 2 Moubootaur Legends -->
 <sprite>
 
-  <imageset name="base" src="graphics/sprites/monsters/alphamouboo.png" width="80" height="80" />
+  <imageset name="base" src="graphics/sprites/monsters/alphamouboo.png" 
+            width="80" 
+            height="80" />
 
   <action name="stand" imageset="base">
     <animation direction="down">
@@ -78,5 +82,4 @@
       <end />
     </animation>
   </action>
-
 </sprite>
diff --git a/graphics/sprites/monsters/archant.xml b/graphics/sprites/monsters/archant.xml
index 40486be3..42b3a5a0 100644
--- a/graphics/sprites/monsters/archant.xml
+++ b/graphics/sprites/monsters/archant.xml
@@ -1,6 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW 2 Moubootaur Legends -->
+
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/archant.png" width="24" height="30"/>
+  <imageset name="base" src="graphics/sprites/monsters/archant.png" 
+            width="24" 
+            height="30"/>
+            
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetX="0" offsetY="2"/>
@@ -15,6 +21,7 @@
       <frame index="30" offsetX="-1" offsetY="-3"/>
     </animation>
   </action>
+  
   <action name="walk" imageset="base">
     <animation direction="down">
       <sequence start="1" end="4" delay="75" offsetX="0" offsetY="2"/>
@@ -29,6 +36,7 @@
       <sequence start="31" end="34" delay="75" offsetX="-1" offsetY="-3"/>
     </animation>
   </action>
+  
   <action name="dead" imageset="base">
     <animation direction="down">
       <frame index="9" offsetX="0" offsetY="2"/>
@@ -43,6 +51,7 @@
       <frame index="39" offsetX="-1" offsetY="-3"/>
     </animation>
   </action>
+  
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="5" end="8" delay="75" offsetX="0" offsetY="2"/>
diff --git a/graphics/sprites/monsters/bif.xml b/graphics/sprites/monsters/bif.xml
index d0cde417..e977a9af 100644
--- a/graphics/sprites/monsters/bif.xml
+++ b/graphics/sprites/monsters/bif.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <sprite>
 
-  <imageset name="base" src="graphics/sprites/monsters/bif.png|W" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/bif.png|W" 
+            width="32" 
+            height="32" />
 
   <action name="stand" imageset="base">
     <animation>
diff --git a/graphics/sprites/monsters/bigbif.xml b/graphics/sprites/monsters/bigbif.xml
index 7e1470e1..6bb7c548 100644
--- a/graphics/sprites/monsters/bigbif.xml
+++ b/graphics/sprites/monsters/bigbif.xml
@@ -1,7 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW 2 Moubootaur Legends -->
+
 <sprite>
 
-  <imageset name="base" src="graphics/sprites/monsters/bigbif.png|W" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/bigbif.png|W" 
+            width="32" 
+            height="32" />
 
   <action name="stand" imageset="base">
     <animation>
diff --git a/graphics/sprites/monsters/candorscorpion.xml b/graphics/sprites/monsters/candorscorpion.xml
index d8bda6e8..223c3c11 100644
--- a/graphics/sprites/monsters/candorscorpion.xml
+++ b/graphics/sprites/monsters/candorscorpion.xml
@@ -1,6 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW 2 Moubootaur Legends -->
+
 <sprite>
-  <imageset name="base" src="graphics/sprites/monsters/candorscorpion.png" width="48" height="45"/>
+  <imageset name="base" src="graphics/sprites/monsters/candorscorpion.png" 
+            width="48" 
+            height="45"/>
+            
   <action name="stand" imageset="base">
     <animation direction="down">
       <frame index="0" offsetY="2"/>
@@ -15,6 +21,7 @@
       <frame index="30" offsetY="2"/>
     </animation>
   </action>
+  
   <action name="walk" imageset="base">
     <animation direction="down">
       <sequence start="1" end="4" delay="75" offsetY="2"/>
@@ -29,6 +36,7 @@
       <sequence start="31" end="34" delay="75" offsetY="2"/>
     </animation>
   </action>
+  
   <action name="dead" imageset="base">
     <animation direction="down">
       <frame index="9" offsetY="2"/>
@@ -43,6 +51,7 @@
       <frame index="39" offsetY="2"/>
     </animation>
   </action>
+  
   <action name="attack" imageset="base">
     <animation direction="down">
       <sequence start="5" end="8" delay="75" offsetY="2"/>
diff --git a/graphics/sprites/monsters/smallbif.xml b/graphics/sprites/monsters/smallbif.xml
index 13b8ac9f..26225567 100644
--- a/graphics/sprites/monsters/smallbif.xml
+++ b/graphics/sprites/monsters/smallbif.xml
@@ -1,7 +1,12 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Author: Saulc
+Copyright (C) 2018 TMW 2 Moubootaur Legends -->
+
 <sprite>
 
-  <imageset name="base" src="graphics/sprites/monsters/smallbif.png|W" width="32" height="32" />
+  <imageset name="base" src="graphics/sprites/monsters/smallbif.png|W" 
+            width="32" 
+            height="32" />
 
   <action name="stand" imageset="base">
     <animation>
diff --git a/items.xml b/items.xml
index b9f37293..8d088690 100644
--- a/items.xml
+++ b/items.xml
@@ -1175,13 +1175,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 		weight="20"
 		sellProtected="true"
 		maxFloorOffset="4"/>
-	<item id="729"
-		image="generic/fur.png"
-		name="Fluffy Fur"
-		description="This soft fur is used to make warm clothing."
-		type="generic"
-		weight="2"
-		maxFloorOffset="8"/>
+	<!-- id 729 is free -->
 	<!-- id 730 is free -->
 	<item id="731"
 		image="generic/diamond.png"
@@ -3017,7 +3011,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	</item>
 	<item id="1805"
 		image="equipment/feet/cottonboots.png|W"
-		name="Cotton Boots"
+		name="%Color% Cotton Boots"
 		description="A pair of quality %Color% cotton boots."
 		defense="12"
 		level="14"
@@ -3165,7 +3159,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	<!-- |W:#a4b2b2,ffffff -->
 	<item id="2005"
 		image="equipment/hands/cottongloves.png|W"
-		name="Cotton Gloves"
+		name="%Color% Cotton Gloves"
 		description="A pair of comfy %Color% cotton gloves."
 		defense="10"
 		level="6"
@@ -3190,8 +3184,8 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	</item>
 	<item id="2007"
 		image="equipment/hands/cottongloves.png|W:#87876c,bbc39c,edf4e1,ffffff"
-		name="Silk Gloves"
-		description="Soft and graceful silk gloves which doesn't restrain magic."
+		name="%Color% Silk Gloves"
+		description="Soft and graceful %Color% silk gloves which doesn't restrain magic."
 		defense="1"
 		level="1"
 		type="equip-arms"
@@ -3386,7 +3380,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	</item>
 	<item id="2207"
 		image="equipment/legs/cottontrousers.png|W"
-		name="Cotton Trousers"
+		name="%Color% Cotton Trousers"
 		description="Ankle-length %Color% trousers made of cotton."
 		defense="70"
 		level="20"
@@ -3411,7 +3405,7 @@ Colors for dyeable equipments or items are set up by itemcolors.xml.
 	</item>
 	<item id="2209"
 		image="equipment/legs/cottonskirt.png|W"
-		name="Cotton Skirt"
+		name="%Color% Cotton Skirt"
 		description="A %Color% cotton skirt made of linen cloth."
 		defense="20"
 		level="5"