Renamed legacy tilesets.

16 files changed, 159 insertions, 63 deletions

diff --git a/maps/008-1.tmx b/maps/008-1.tmx
index 9361a6be..c130c553 100644
--- a/maps/008-1.tmx
+++ b/maps/008-1.tmx
@@ -9,13 +9,25 @@
   <property name="overlay0scrollX" value="0.2"/>
   <property name="overlay0scrollY" value="0.1"/>
  </properties>
- <tileset firstgid="1" source="../graphics/legacy/tilesets/woodland_ground.tsx"/>
- <tileset firstgid="257" source="../graphics/legacy/tilesets/woodland_x2.tsx"/>
- <tileset firstgid="289" source="../graphics/legacy/tilesets/woodland_x3.tsx"/>
- <tileset firstgid="321" source="../graphics/legacy/tilesets/woodland_village.tsx"/>
- <tileset firstgid="577" source="../graphics/legacy/tilesets/woodland_village_x2.tsx"/>
- <tileset firstgid="593" source="../graphics/legacy/tilesets/woodland_village_x3.tsx"/>
- <tileset firstgid="659" source="../graphics/legacy/tilesets/woodenpump.tsx"/>
+ <tileset firstgid="1" name="Ground" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-ground.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="257" name="Woodland x1x3" tilewidth="32" tileheight="64" tilecount="32" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-x1x2.png" width="512" height="128"/>
+ </tileset>
+ <tileset firstgid="289" name="Woodland x1x3" tilewidth="32" tileheight="96" tilecount="32" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-x1x3.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="321" name="Woodland Village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-village.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="577" name="Woodland Village x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-village-x1x2.png" width="512" height="64"/>
+ </tileset>
+ <tileset firstgid="593" name="Woodland Village x1x3" tilewidth="32" tileheight="96" tilecount="66" columns="22">
+  <image source="../graphics/legacy/tilesets/woodland-village-x1x3.png" width="704" height="288"/>
+ </tileset>
+ <tileset firstgid="659" source="../graphics/legacy/tilesets/woodenpump-x1x3.tsx"/>
  <tileset firstgid="670" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
   <image source="../graphics/tilesets/collision.png" width="96" height="96"/>
  </tileset>
diff --git a/maps/008-2-0.tmx b/maps/008-2-0.tmx
index 6a7d80f9..080d8583 100644
--- a/maps/008-2-0.tmx
+++ b/maps/008-2-0.tmx
@@ -8,9 +8,15 @@
  <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="59" height="53">
   <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,
diff --git a/maps/008-2-1.tmx b/maps/008-2-1.tmx
index 7ab458e3..e3b16a73 100644
--- a/maps/008-2-1.tmx
+++ b/maps/008-2-1.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Merchant Guild"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer 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,
diff --git a/maps/008-2-10.tmx b/maps/008-2-10.tmx
index 15253fdd..0ee270d8 100644
--- a/maps/008-2-10.tmx
+++ b/maps/008-2-10.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald City Hall"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="72" height="57">
   <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,58,58,
diff --git a/maps/008-2-11.tmx b/maps/008-2-11.tmx
index 3f14d2c1..bf31249e 100644
--- a/maps/008-2-11.tmx
+++ b/maps/008-2-11.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald City Hall"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="71" height="60">
   <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,58,
diff --git a/maps/008-2-12.tmx b/maps/008-2-12.tmx
index 733fcbd7..04d83c1e 100644
--- a/maps/008-2-12.tmx
+++ b/maps/008-2-12.tmx
@@ -5,11 +5,15 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald Clinic"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="100" height="100">
   <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,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,
diff --git a/maps/008-2-13.tmx b/maps/008-2-13.tmx
index 31831a38..129ed19e 100644
--- a/maps/008-2-13.tmx
+++ b/maps/008-2-13.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald Clinic"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="100" height="100">
   <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,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,
diff --git a/maps/008-2-14.tmx b/maps/008-2-14.tmx
index 81007dfd..a25cb453 100644
--- a/maps/008-2-14.tmx
+++ b/maps/008-2-14.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald Clinic"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="100" height="100">
   <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,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,
diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx
index c8e26779..647ac0f4 100644
--- a/maps/008-2-2.tmx
+++ b/maps/008-2-2.tmx
@@ -5,11 +5,15 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="76" height="60">
   <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,58,58,58,58,58,58,
diff --git a/maps/008-2-3.tmx b/maps/008-2-3.tmx
index cb7072f0..0720ea0a 100644
--- a/maps/008-2-3.tmx
+++ b/maps/008-2-3.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="91" height="59">
   <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,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,58,
diff --git a/maps/008-2-4.tmx b/maps/008-2-4.tmx
index 21631500..8431d0eb 100644
--- a/maps/008-2-4.tmx
+++ b/maps/008-2-4.tmx
@@ -5,13 +5,21 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
- <tileset firstgid="362" source="../graphics/legacy/tilesets/pots_x2.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
+ <tileset firstgid="362" name="Pots x1x2" tilewidth="32" tileheight="64" tilecount="16" columns="16">
+  <image source="../graphics/legacy/tilesets/pots-x1x2.png" width="512" height="64"/>
+ </tileset>
  <layer name="Ground1" width="68" height="59">
   <data encoding="csv">
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
diff --git a/maps/008-2-5.tmx b/maps/008-2-5.tmx
index 66bcbbfb..87d466d7 100644
--- a/maps/008-2-5.tmx
+++ b/maps/008-2-5.tmx
@@ -5,11 +5,15 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="The Rusty Pick"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="56" height="61">
   <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,
diff --git a/maps/008-2-6.tmx b/maps/008-2-6.tmx
index 842fa187..d457dda0 100644
--- a/maps/008-2-6.tmx
+++ b/maps/008-2-6.tmx
@@ -5,11 +5,15 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Two Guys One Bed"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
  <layer name="Ground1" width="60" height="57">
   <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,
diff --git a/maps/008-2-7.tmx b/maps/008-2-7.tmx
index 9cd714a1..924627c6 100644
--- a/maps/008-2-7.tmx
+++ b/maps/008-2-7.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald Apothecary"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="62" height="55">
   <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,
diff --git a/maps/008-2-8.tmx b/maps/008-2-8.tmx
index a30fad24..0820d065 100644
--- a/maps/008-2-8.tmx
+++ b/maps/008-2-8.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Hurnscald Forge"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="64" height="62">
   <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,
diff --git a/maps/008-2-9.tmx b/maps/008-2-9.tmx
index 89bc8118..2d953e64 100644
--- a/maps/008-2-9.tmx
+++ b/maps/008-2-9.tmx
@@ -5,12 +5,18 @@
   <property name="manaplus version" value="2"/>
   <property name="name" value="Jack's Abode"/>
  </properties>
- <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3">
+ <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/legacy/tilesets/woodland_indoor.tsx"/>
- <tileset firstgid="266" source="../graphics/legacy/tilesets/woodland_indoor_x2.tsx"/>
- <tileset firstgid="314" source="../graphics/legacy/tilesets/woodland_indoor_x3.tsx"/>
+ <tileset firstgid="10" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor.png" width="512" height="512"/>
+ </tileset>
+ <tileset firstgid="266" name="Indoor x1x2" tilewidth="32" tileheight="64" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x2.png" width="512" height="192"/>
+ </tileset>
+ <tileset firstgid="314" name="Indoor x1x3" tilewidth="32" tileheight="96" tilecount="48" columns="16">
+  <image source="../graphics/legacy/tilesets/woodland-indoor-x1x3.png" width="512" height="288"/>
+ </tileset>
  <layer name="Ground1" width="61" height="60">
   <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,