Minor, technical changes to 004-2 and 004-3-1

2 files changed, 60 insertions, 20 deletions

diff --git a/maps/004-2.tmx b/maps/004-2.tmx
index 314ce1b6d..c02fe9392 100644
--- a/maps/004-2.tmx
+++ b/maps/004-2.tmx
@@ -43,17 +43,39 @@
  <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
- <tileset firstgid="10" source="../graphics/tilesets/desert1.tsx"/>
- <tileset firstgid="266" source="../graphics/tilesets/desert2.tsx"/>
- <tileset firstgid="522" source="../graphics/tilesets/desert_x2.tsx"/>
- <tileset firstgid="570" source="../graphics/tilesets/desert_x3.tsx"/>
- <tileset firstgid="618" source="../graphics/tilesets/docks.tsx"/>
- <tileset firstgid="778" source="../graphics/tilesets/trans_woodland_desert.tsx"/>
- <tileset firstgid="906" source="../graphics/tilesets/level-number.tsx"/>
- <tileset firstgid="922" source="../graphics/tilesets/desert_city.tsx"/>
- <tileset firstgid="1178" source="../graphics/tilesets/desert_castle.tsx"/>
- <tileset firstgid="1434" source="../graphics/tilesets/signs_x2.tsx"/>
- <tileset firstgid="1470" source="../graphics/tilesets/desert_x5.tsx"/>
+ <tileset firstgid="10" name="desert1" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/desert1.png" width="512" height="512"/>
+ </tileset>
+ <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_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/tilesets/desert_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="570" name="desert_x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/tilesets/desert_x3.png" width="512" height="288"/>
+ </tileset>
+ <tileset firstgid="618" name="docks" tilewidth="32" tileheight="32" tilecount="160" columns="16">
+  <image source="../graphics/tilesets/docks.png" width="512" height="320"/>
+ </tileset>
+ <tileset firstgid="778" name="trans_woodland_desert" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../graphics/tilesets/trans_woodland_desert.png" width="512" height="256"/>
+ </tileset>
+ <tileset firstgid="906" name="Level Number" tilewidth="32" tileheight="32" tilecount="16" columns="16">
+  <image source="../graphics/tilesets/level-number.png" width="512" height="32"/>
+ </tileset>
+ <tileset firstgid="922" name="desert_city" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/desert_city.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1178" name="desert_castle" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/desert_castle.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1434" name="signs_x2" tilewidth="32" tileheight="64" tilecount="36" columns="9">
+  <image source="../graphics/tilesets/signs_x2.png" width="288" height="256"/>
+ </tileset>
+ <tileset firstgid="1470" name="desert_x5" tilewidth="96" tileheight="160" tilecount="2" columns="2">
+  <image source="../graphics/tilesets/desert_x5.png" width="192" height="160"/>
+ </tileset>
  <tileset firstgid="1472" name="Tree x3x3" tilewidth="96" tileheight="96" tilecount="1" columns="1">
   <image source="../graphics/tilesets/tree-x3x3.png" width="96" height="96"/>
  </tileset>
diff --git a/maps/004-3-1.tmx b/maps/004-3-1.tmx
index a2c262f96..34a877a85 100644
--- a/maps/004-3-1.tmx
+++ b/maps/004-3-1.tmx
@@ -10,18 +10,36 @@
   <property name="overlay0image" value="graphics/images/ambient/spotlight.png"/>
   <property name="overlay0keepratio" value="true"/>
  </properties>
- <tileset firstgid="1" source="../graphics/tilesets/collision.tsx"/>
+ <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+  <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
+ </tileset>
  <tileset firstgid="10" name="cave2" tilewidth="32" tileheight="32" tilecount="144" columns="16">
   <image source="../graphics/tilesets/cave2.png" width="512" height="288"/>
  </tileset>
- <tileset firstgid="154" source="../graphics/tilesets/cave2_x2.tsx"/>
- <tileset firstgid="186" source="../graphics/tilesets/barbarians_outdoor.tsx"/>
- <tileset firstgid="189" source="../graphics/tilesets/cave2_sewer_mine.tsx"/>
- <tileset firstgid="445" source="../graphics/tilesets/desert_city_indoors.tsx"/>
- <tileset firstgid="595" source="../graphics/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="851" source="../graphics/tilesets/cave2_bilevel.tsx"/>
- <tileset firstgid="1107" source="../graphics/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="1155" source="../graphics/tilesets/cave2_base.tsx"/>
+ <tileset firstgid="154" name="cave2_x2" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+  <image source="../graphics/tilesets/cave2_x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="186" name="barbarians_outdoor" tilewidth="64" tileheight="64" tilecount="3" columns="3">
+  <image source="../graphics/tilesets/barbarians_outdoor.png" width="192" height="64"/>
+ </tileset>
+ <tileset firstgid="189" name="cave2_sewer_mine" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/cave2_sewer_mine.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="445" name="desert_city_indoors" tilewidth="32" tileheight="32" tilecount="150" columns="15">
+  <image source="../graphics/tilesets/desert_city_indoors.png" width="480" height="320"/>
+ </tileset>
+ <tileset firstgid="595" name="woodland_indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/woodland_indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="851" name="cave2_bilevel" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/cave2_bilevel.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="1107" name="woodland_indoor_x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/tilesets/woodland_indoor_x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="1155" name="cave2_base" tilewidth="32" tileheight="32" tilecount="128" columns="16">
+  <image source="../graphics/tilesets/cave2_base.png" width="512" height="256"/>
+ </tileset>
  <layer id="130" name="Ground1" width="116" height="65">
   <data encoding="csv">
 30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,30,