summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--maps.xml3
-rw-r--r--maps/003-1-2.tmx10
2 files changed, 7 insertions, 6 deletions
diff --git a/maps.xml b/maps.xml
index c9ea2a68..2022e69f 100644
--- a/maps.xml
+++ b/maps.xml
@@ -1113,9 +1113,6 @@ Copyright (C) 2018 TMW2 -->
<file name="graphics/tilesets/desert_city_indoors_x3.png"/>
<file name="graphics/tilesets/desert_city_indoors.png"/>
<file name="graphics/tilesets/desert_city_x2.png"/>
- <file name="graphics/tilesets/inn.png"/>
- <file name="graphics/tilesets/inn_x2.png"/>
- <file name="graphics/tilesets/inn_x3.png"/>
<file name="graphics/tilesets/ship-base.png"/>
<file name="graphics/tilesets/signs_x2.png"/>
<file name="graphics/tilesets/ship-mast.png"/>
diff --git a/maps/003-1-2.tmx b/maps/003-1-2.tmx
index 56d07dac..4a1bfbcf 100644
--- a/maps/003-1-2.tmx
+++ b/maps/003-1-2.tmx
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.3" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37">
+<map version="1.2" tiledversion="1.2.2" orientation="orthogonal" renderorder="right-down" width="70" height="68" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="37">
<properties>
<property name="license" value="CC BY-SA 3.0"/>
<property name="manaplus version" value="2"/>
@@ -13,8 +13,12 @@
<tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
<image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
</tileset>
- <tileset firstgid="266" source="../graphics/tilesets/desert2.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/desert_castle.tsx"/>
+ <tileset firstgid="266" name="desert2" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert2.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="522" name="desert_castle" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+ <image source="../graphics/tilesets/desert_castle.png" width="512" height="512"/>
+ </tileset>
<layer id="1" name="Ground1" width="70" height="68">
<data encoding="csv">
58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,