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

20 files changed, 13 insertions, 10 deletions

diff --git a/.tools/contributors.sh b/.tools/contributors.sh
index 487c3cb4..6761f77b 100755
--- a/.tools/contributors.sh
+++ b/.tools/contributors.sh
@@ -7,7 +7,7 @@ clientdata_init
 aptget_update
 aptget_install git-core gcc ca-certificates libxml2-utils make xsltproc
 rm -rf tools
-gitclone https://gitlab.com/evol evol-tools.git tools
+gitclone https://gitlab.com/TMW2 evol-tools.git tools
 
 cd tools/contrib_xsl
 
diff --git a/.tools/deploy.sh b/.tools/deploy.sh
index 7184f4b8..1b42d445 100755
--- a/.tools/deploy.sh
+++ b/.tools/deploy.sh
@@ -7,7 +7,7 @@ clientdata_init
 aptget_update
 aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python
 rm -rf tools
-gitclone https://gitlab.com/evol evol-tools.git tools
+gitclone https://gitlab.com/TMW2 evol-tools.git tools
 
 cd clientdata
 rm -rf public
@@ -16,7 +16,7 @@ mkdir public
 cd ..
 
 rm -rf music
-gitclone https://gitlab.com/evol evol-music.git music
+gitclone https://gitlab.com/TMW2 evol-music.git music
 
 cd tools/update
 
diff --git a/.tools/imagemagiccheck.sh b/.tools/imagemagiccheck.sh
index c298e576..5f3868d7 100755
--- a/.tools/imagemagiccheck.sh
+++ b/.tools/imagemagiccheck.sh
@@ -7,7 +7,7 @@ clientdata_init
 aptget_update
 aptget_install git-core gcc ca-certificates imagemagick
 rm -rf tools
-gitclone https://gitlab.com/evol evol-tools.git tools
+gitclone https://gitlab.com/TMW2 evol-tools.git tools
 
 cd tools/imagescheck
 
diff --git a/.tools/licensecheck.sh b/.tools/licensecheck.sh
index 750caed1..f8dedf64 100755
--- a/.tools/licensecheck.sh
+++ b/.tools/licensecheck.sh
@@ -7,7 +7,7 @@ clientdata_init
 aptget_update
 aptget_install git-core gcc ca-certificates grep
 rm -rf tools
-gitclone https://gitlab.com/evol evol-tools.git tools
+gitclone https://gitlab.com/TMW2 evol-tools.git tools
 
 cd tools/licensecheck
 
diff --git a/.tools/testxml.sh b/.tools/testxml.sh
index eb0cd412..7296f759 100755
--- a/.tools/testxml.sh
+++ b/.tools/testxml.sh
@@ -7,7 +7,7 @@ clientdata_init
 aptget_update
 aptget_install git-core zip gcc zlib1g-dev ca-certificates libxml2-utils python python-pyvorbis python-ogg python-pil
 rm -rf tools
-gitclone https://gitlab.com/evol evol-tools.git tools
+gitclone https://gitlab.com/TMW2 evol-tools.git tools
 
 cd tools/testxml
 
diff --git a/README.md b/README.md
index e69de29b..c138e477 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1 @@
+# Client Data for TMW2
diff --git a/graphics/images/loginwallpaper_800x600.png b/graphics/images/loginwallpaper_800x600.png
new file mode 100644
index 00000000..4a975744
--- /dev/null
+++ b/graphics/images/loginwallpaper_800x600.png
diff --git a/graphics/images/spit23loginwallpaper_800x600.png b/graphics/images/spit23loginwallpaper_800x600.png
index a1fe4f83..f3b18c80 100644
--- a/graphics/images/spit23loginwallpaper_800x600.png
+++ b/graphics/images/spit23loginwallpaper_800x600.png
diff --git a/graphics/minimaps/002-1.png b/graphics/minimaps/002-1.png
new file mode 100644
index 00000000..ee172b91
--- /dev/null
+++ b/graphics/minimaps/002-1.png
diff --git a/graphics/minimaps/002-2.png b/graphics/minimaps/002-2.png
new file mode 100644
index 00000000..f91b1557
--- /dev/null
+++ b/graphics/minimaps/002-2.png
diff --git a/graphics/minimaps/003-1.png b/graphics/minimaps/003-1.png
new file mode 100644
index 00000000..01aec378
--- /dev/null
+++ b/graphics/minimaps/003-1.png
diff --git a/graphics/minimaps/003-2.png b/graphics/minimaps/003-2.png
new file mode 100644
index 00000000..99c3aec8
--- /dev/null
+++ b/graphics/minimaps/003-2.png
diff --git a/graphics/minimaps/005-1.png b/graphics/minimaps/005-1.png
new file mode 100644
index 00000000..d4736266
--- /dev/null
+++ b/graphics/minimaps/005-1.png
diff --git a/graphics/minimaps/008-1.png b/graphics/minimaps/008-1.png
new file mode 100644
index 00000000..4d99bf3d
--- /dev/null
+++ b/graphics/minimaps/008-1.png
diff --git a/maps/002-1.tmx b/maps/002-1.tmx
index 4ace3f6f..8fb40f60 100644
--- a/maps/002-1.tmx
+++ b/maps/002-1.tmx
@@ -4,7 +4,7 @@
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
-  <property name="minimap" value="graphics/minimaps/000-2-1.png"/>
+  <property name="minimap" value="graphics/minimaps/002-1.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Second Deck"/>
  </properties>
diff --git a/maps/002-2.tmx b/maps/002-2.tmx
index 323aaf69..36f3c38c 100644
--- a/maps/002-2.tmx
+++ b/maps/002-2.tmx
@@ -4,7 +4,7 @@
   <property name="actorsfix" value="1"/>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="1"/>
-  <property name="minimap" value="graphics/minimaps/000-2-2.png"/>
+  <property name="minimap" value="graphics/minimaps/002-2.png"/>
   <property name="music" value="bartk - in the forest of the birches.ogg"/>
   <property name="name" value="Hold"/>
  </properties>
diff --git a/maps/003-1.tmx b/maps/003-1.tmx
index a1f8f9a3..dc0b2048 100644
--- a/maps/003-1.tmx
+++ b/maps/003-1.tmx
@@ -3,7 +3,7 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value="graphics/minimaps/000-1.png"/>
+  <property name="minimap" value="graphics/minimaps/003-1.png"/>
   <property name="music" value="bartk - the adventure begins.ogg"/>
   <property name="name" value="Tulimshar"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
diff --git a/maps/003-2.tmx b/maps/003-2.tmx
index 590846d8..1f358726 100644
--- a/maps/003-2.tmx
+++ b/maps/003-2.tmx
@@ -3,6 +3,7 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
+  <property name="minimap" value="graphics/minimaps/003-2.png"/>
   <property name="name" value="Tulimshar Guild "/>
  </properties>
  <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-1.tmx b/maps/005-1.tmx
index ad5f3ac9..016242d5 100644
--- a/maps/005-1.tmx
+++ b/maps/005-1.tmx
@@ -3,7 +3,7 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value="graphics/minimaps/000-1.png"/>
+  <property name="minimap" value="graphics/minimaps/005-1.png"/>
   <property name="music" value="bartk - the adventure begins.ogg"/>
   <property name="name" value="Candor Island"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index c130c553..377b6e77 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -3,6 +3,7 @@
  <properties>
   <property name="license" value="CC BY-SA 3.0"/>
   <property name="manaplus version" value="2"/>
+  <property name="minimap" value="graphics/minimaps/008-1.png"/>
   <property name="name" value="Hurnscald"/>
   <property name="overlay0image" value="graphics/images/ambient/cloud.png"/>
   <property name="overlay0parallax" value="1.0"/>