summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/minimaps/005-2.pngbin0 -> 756 bytes
-rw-r--r--graphics/minimaps/005-3.pngbin0 -> 652 bytes
-rw-r--r--graphics/minimaps/005-4.pngbin0 -> 700 bytes
-rw-r--r--graphics/minimaps/005-5.pngbin0 -> 817 bytes
-rw-r--r--graphics/minimaps/005-6.pngbin0 -> 641 bytes
-rw-r--r--graphics/minimaps/005-7.pngbin0 -> 775 bytes
-rw-r--r--graphics/minimaps/007-1.pngbin0 -> 9383 bytes
-rw-r--r--maps/005-2.tmx6
-rw-r--r--maps/005-3.tmx6
-rw-r--r--maps/005-4.tmx6
-rw-r--r--maps/005-5.tmx4
-rw-r--r--maps/005-6.tmx4
-rw-r--r--maps/005-7.tmx4
-rw-r--r--maps/007-1.tmx8
14 files changed, 25 insertions, 13 deletions
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
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
Binary files differ
diff --git a/maps/005-2.tmx b/maps/005-2.tmx
index bb41fa7b..d83265f8 100644
--- a/maps/005-2.tmx
+++ b/maps/005-2.tmx
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
- <property name="name" value="Merchant Guild"/>
+ <property name="minimap" value="graphics/minimaps/005-2.png"/>
+ <property name="music" value="magick - real.ogg"/>
+ <property name="name" value="Saxso's House"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
diff --git a/maps/005-3.tmx b/maps/005-3.tmx
index 1a8d0fa9..b0ff537e 100644
--- a/maps/005-3.tmx
+++ b/maps/005-3.tmx
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
- <property name="name" value="Merchant Guild"/>
+ <property name="minimap" value="graphics/minimaps/005-3.png"/>
+ <property name="music" value="magick - real.ogg"/>
+ <property name="name" value="Storage House"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
diff --git a/maps/005-4.tmx b/maps/005-4.tmx
index 133b808a..dd551007 100644
--- a/maps/005-4.tmx
+++ b/maps/005-4.tmx
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
- <property name="name" value="Merchant Guild"/>
+ <property name="minimap" value="graphics/minimaps/005-4.png"/>
+ <property name="music" value="magick - real.ogg"/>
+ <property name="name" value="Armor Shop"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
<image source="../graphics/tilesets/collision.png" width="96" height="96"/>
diff --git a/maps/005-5.tmx b/maps/005-5.tmx
index fc6542a0..9bde57f1 100644
--- a/maps/005-5.tmx
+++ b/maps/005-5.tmx
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
+ <property name="minimap" value="graphics/minimaps/005-5.png"/>
+ <property name="music" value="magick - real.ogg"/>
<property name="name" value="Merchant Guild"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-6.tmx b/maps/005-6.tmx
index dbd05531..fbaeb9b2 100644
--- a/maps/005-6.tmx
+++ b/maps/005-6.tmx
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
+ <property name="minimap" value="graphics/minimaps/005-6.png"/>
+ <property name="music" value="magick - real.ogg"/>
<property name="name" value="Candor Magic House"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/005-7.tmx b/maps/005-7.tmx
index d75022ce..9b12684f 100644
--- a/maps/005-7.tmx
+++ b/maps/005-7.tmx
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextobjectid="27">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
+ <property name="minimap" value="graphics/minimaps/005-7.png"/>
+ <property name="music" value="magick - real.ogg"/>
<property name="name" value="Training House"/>
</properties>
<tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
diff --git a/maps/007-1.tmx b/maps/007-1.tmx
index 559b2372..7de75414 100644
--- a/maps/007-1.tmx
+++ b/maps/007-1.tmx
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="7">
+<map version="1.0" tiledversion="2018.02.14" orientation="orthogonal" renderorder="right-down" width="200" height="200" tilewidth="32" tileheight="32" infinite="0" nextobjectid="7">
<properties>
- <property name="minimap" value=""/>
- <property name="music" value="cavesong.ogg"/>
+ <property name="minimap" value="graphics/minimaps/007-1.png"/>
+ <property name="music" value="dariunas - the forest.ogg"/>
<property name="name" value="Tulimshar Mining Camp"/>
<property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
<property name="overlay0keepratio" value="true"/>
@@ -1037,7 +1037,7 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
- <layer name="Over1" width="200" height="200" visible="0">
+ <layer name="Over1" width="200" height="200">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,