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

Conflicts:
	maps/007-1.tmx

29 files changed, 11 insertions, 1 deletions

diff --git a/graphics/minimaps/000-2-0.png b/graphics/minimaps/000-2-0.png
deleted file mode 100644
index e6c37658..00000000
--- a/graphics/minimaps/000-2-0.png
+++ /dev/null
diff --git a/graphics/minimaps/000-2-1.png b/graphics/minimaps/000-2-1.png
deleted file mode 100644
index 42cabc53..00000000
--- a/graphics/minimaps/000-2-1.png
+++ /dev/null
diff --git a/graphics/minimaps/000-2-2.png b/graphics/minimaps/000-2-2.png
deleted file mode 100644
index 93d89ab6..00000000
--- a/graphics/minimaps/000-2-2.png
+++ /dev/null
diff --git a/graphics/minimaps/000-2-3.png b/graphics/minimaps/000-2-3.png
deleted file mode 100644
index 77090211..00000000
--- a/graphics/minimaps/000-2-3.png
+++ /dev/null
diff --git a/graphics/minimaps/000-2-4.png b/graphics/minimaps/000-2-4.png
deleted file mode 100644
index 4252f2ab..00000000
--- a/graphics/minimaps/000-2-4.png
+++ /dev/null
diff --git a/graphics/minimaps/001-2-6.png b/graphics/minimaps/001-2-6.png
deleted file mode 100644
index 2f973d7d..00000000
--- a/graphics/minimaps/001-2-6.png
+++ /dev/null
diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png
index ee172b91..e93acd94 100644
--- a/graphics/minimaps/002-1.png
+++ b/graphics/minimaps/002-1.png
diff --git a/graphics/minimaps/002-2.png b/graphics/minimaps/002-2.png
index f91b1557..deb594da 100644
--- a/graphics/minimaps/002-2.png
+++ b/graphics/minimaps/002-2.png
diff --git a/graphics/minimaps/002-3.png b/graphics/minimaps/002-3.png
index 89ca9305..592e8244 100644
--- a/graphics/minimaps/002-3.png
+++ b/graphics/minimaps/002-3.png
diff --git a/graphics/minimaps/002-4.png b/graphics/minimaps/002-4.png
index cbd27744..47b329ca 100644
--- a/graphics/minimaps/002-4.png
+++ b/graphics/minimaps/002-4.png
diff --git a/graphics/minimaps/003-1-2.png b/graphics/minimaps/003-1-2.png
new file mode 100644
index 00000000..f47cea41
--- /dev/null
+++ b/graphics/minimaps/003-1-2.png
diff --git a/graphics/minimaps/003-1-3.png b/graphics/minimaps/003-1-3.png
new file mode 100644
index 00000000..03105c70
--- /dev/null
+++ b/graphics/minimaps/003-1-3.png
diff --git a/graphics/minimaps/003-13.png b/graphics/minimaps/003-13.png
new file mode 100644
index 00000000..98da88db
--- /dev/null
+++ b/graphics/minimaps/003-13.png
diff --git a/graphics/minimaps/003-3.png b/graphics/minimaps/003-3.png
new file mode 100644
index 00000000..e8cc7b5d
--- /dev/null
+++ b/graphics/minimaps/003-3.png
diff --git a/graphics/minimaps/003-4.png b/graphics/minimaps/003-4.png
new file mode 100644
index 00000000..1e4641b4
--- /dev/null
+++ b/graphics/minimaps/003-4.png
diff --git a/graphics/minimaps/003-5.png b/graphics/minimaps/003-5.png
new file mode 100644
index 00000000..203203ce
--- /dev/null
+++ b/graphics/minimaps/003-5.png
diff --git a/graphics/minimaps/003-6.png b/graphics/minimaps/003-6.png
new file mode 100644
index 00000000..6519ef25
--- /dev/null
+++ b/graphics/minimaps/003-6.png
diff --git a/graphics/minimaps/003-7.png b/graphics/minimaps/003-7.png
new file mode 100644
index 00000000..2088ee4d
--- /dev/null
+++ b/graphics/minimaps/003-7.png
diff --git a/graphics/minimaps/003-8.png b/graphics/minimaps/003-8.png
new file mode 100644
index 00000000..f6d9004f
--- /dev/null
+++ b/graphics/minimaps/003-8.png
diff --git a/graphics/minimaps/004-1.png b/graphics/minimaps/004-1.png
new file mode 100644
index 00000000..ce7cd6f5
--- /dev/null
+++ b/graphics/minimaps/004-1.png
diff --git a/graphics/minimaps/005-2.png b/graphics/minimaps/005-2.png
new file mode 100644
index 00000000..17f3f013
--- /dev/null
+++ b/graphics/minimaps/005-2.png
diff --git a/graphics/minimaps/005-3.png b/graphics/minimaps/005-3.png
new file mode 100644
index 00000000..3a5286d2
--- /dev/null
+++ b/graphics/minimaps/005-3.png
diff --git a/graphics/minimaps/005-4.png b/graphics/minimaps/005-4.png
new file mode 100644
index 00000000..1b7b52e7
--- /dev/null
+++ b/graphics/minimaps/005-4.png
diff --git a/graphics/minimaps/005-5.png b/graphics/minimaps/005-5.png
new file mode 100644
index 00000000..6d80e6fc
--- /dev/null
+++ b/graphics/minimaps/005-5.png
diff --git a/graphics/minimaps/005-6.png b/graphics/minimaps/005-6.png
new file mode 100644
index 00000000..c48c871b
--- /dev/null
+++ b/graphics/minimaps/005-6.png
diff --git a/graphics/minimaps/005-7.png b/graphics/minimaps/005-7.png
new file mode 100644
index 00000000..ca7fe741
--- /dev/null
+++ b/graphics/minimaps/005-7.png
diff --git a/graphics/minimaps/007-1.png b/graphics/minimaps/007-1.png
new file mode 100644
index 00000000..29ee4fc9
--- /dev/null
+++ b/graphics/minimaps/007-1.png
diff --git a/graphics/sprites/equipment/chest/lightplatemail-male.xml b/graphics/sprites/equipment/chest/lightplatemail-male.xml
index 236c10d6..de736295 100644
--- a/graphics/sprites/equipment/chest/lightplatemail-male.xml
+++ b/graphics/sprites/equipment/chest/lightplatemail-male.xml
@@ -3,7 +3,7 @@
 Copyright (C) 2018 TMW2 -->
 <sprite>
     <imageset name="base"
-              src="graphics/sprites/equipment/chest/lightplatemail-female.png"
+              src="graphics/sprites/equipment/chest/lightplatemail-male.png"
               width="64"
               height="64"/>
 
diff --git a/graphics/sprites/equipment/legs/jeanschaps-female.xml b/graphics/sprites/equipment/legs/jeanschaps-female.xml
new file mode 100644
index 00000000..1910799c
--- /dev/null
+++ b/graphics/sprites/equipment/legs/jeanschaps-female.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Incomplete -->
+<sprite>
+    <imageset name="base"
+              src="graphics/sprites/equipment/legs/jeanschaps-female.png"
+              width="64"
+              height="64"/>
+
+    <include file="races/human-male.xml"/>
+</sprite>