summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlige <gauvain.dauchy@free.fr>2017-09-03 22:02:28 +0400
committerAlige <gauvain.dauchy@free.fr>2017-09-03 22:02:28 +0400
commit39b6def2496825308cf03203ad028b269e2f306d (patch)
tree6f498a889dc765580a111f0f8f91038e20c58646
parent2ff7d17eb7819f23386c3436102826e6b72d3f88 (diff)
downloadclientdata-39b6def2496825308cf03203ad028b269e2f306d.tar.gz
clientdata-39b6def2496825308cf03203ad028b269e2f306d.tar.bz2
clientdata-39b6def2496825308cf03203ad028b269e2f306d.tar.xz
clientdata-39b6def2496825308cf03203ad028b269e2f306d.zip
Renamed legacy tilesets.
-rw-r--r--LICENSE22
-rw-r--r--graphics/legacy/tilesets/pots-x1x2.png (renamed from graphics/legacy/tilesets/pots_x2.png)bin38069 -> 38069 bytes
-rw-r--r--graphics/legacy/tilesets/pots_x2.tsx4
-rw-r--r--graphics/legacy/tilesets/woodenpump-x1x3.png (renamed from graphics/legacy/tilesets/woodenpump.png)bin4898 -> 4898 bytes
-rw-r--r--graphics/legacy/tilesets/woodenpump-x1x3.tsx (renamed from graphics/legacy/tilesets/woodenpump.tsx)16
-rw-r--r--graphics/legacy/tilesets/woodland-ground.png (renamed from graphics/legacy/tilesets/woodland_ground.png)bin286218 -> 286218 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-indoor-x1x2.png (renamed from graphics/legacy/tilesets/woodland_indoor_x2.png)bin23365 -> 23365 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-indoor-x1x3.png (renamed from graphics/legacy/tilesets/woodland_indoor_x3.png)bin54448 -> 54448 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-indoor.png (renamed from graphics/legacy/tilesets/woodland_indoor.png)bin107288 -> 107288 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-village-x1x2.png (renamed from graphics/legacy/tilesets/woodland_village_x2.png)bin21759 -> 21759 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-village-x1x3.png (renamed from graphics/legacy/tilesets/woodland_village_x3.png)bin104763 -> 104763 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-village.png (renamed from graphics/legacy/tilesets/woodland_village.png)bin163091 -> 163091 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-x1x2.png (renamed from graphics/legacy/tilesets/woodland_x2.png)bin45639 -> 45639 bytes
-rw-r--r--graphics/legacy/tilesets/woodland-x1x3.png (renamed from graphics/legacy/tilesets/woodland_x3.png)bin94389 -> 94389 bytes
-rw-r--r--graphics/legacy/tilesets/woodland_ground.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_indoor.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_indoor_x2.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_indoor_x3.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_village.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_village_x2.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_village_x3.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_x2.tsx4
-rw-r--r--graphics/legacy/tilesets/woodland_x3.tsx4
-rw-r--r--maps.xml22
-rw-r--r--maps/008-1.tmx26
-rw-r--r--maps/008-2-0.tmx12
-rw-r--r--maps/008-2-1.tmx14
-rw-r--r--maps/008-2-10.tmx14
-rw-r--r--maps/008-2-11.tmx14
-rw-r--r--maps/008-2-12.tmx10
-rw-r--r--maps/008-2-13.tmx14
-rw-r--r--maps/008-2-14.tmx14
-rw-r--r--maps/008-2-2.tmx10
-rw-r--r--maps/008-2-3.tmx14
-rw-r--r--maps/008-2-4.tmx18
-rw-r--r--maps/008-2-5.tmx10
-rw-r--r--maps/008-2-6.tmx10
-rw-r--r--maps/008-2-7.tmx14
-rw-r--r--maps/008-2-8.tmx14
-rw-r--r--maps/008-2-9.tmx14
40 files changed, 183 insertions, 139 deletions
diff --git a/LICENSE b/LICENSE
index 764576d4..79175b73 100644
--- a/LICENSE
+++ b/LICENSE
@@ -480,17 +480,17 @@ https://www.gitorious.org/evol/clientdata-beta/blobs/master/LICENSE
graphics/tilesets/water.png (Len) (CC BY-SA 3.0) (Alige, Reid)
# Legacy tilesets
- graphics/legacy/tilesets/pots_x2.png (?) (GPLv2) (-)
- graphics/legacy/tilesets/woodenpump.png (Varuna) (CC BY-SA 3.0) (-)
- graphics/legacy/tilesets/woodland_ground.png (Crush, enchilado, Wombat) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_indoor.png (Crush, Yosuhara) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_indoor_x2.png (Crush) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_indoor_x3.png (Crush) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_village.png (Crush, gumi) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_village_x2.png (Crush) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_village_x3.png (gumi, wushin) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_x2.png (Crush, Len, Saphy) (GPLv2) (-)
- graphics/legacy/tilesets/woodland_x3.png (Crush, Len, Saphy, wushin) (GPLv2) (-)
+ graphics/legacy/tilesets/pots-x1x2.png (?) (GPLv2) (-)
+ graphics/legacy/tilesets/woodenpump-x1x3.png (Varuna) (CC BY-SA 3.0) (-)
+ graphics/legacy/tilesets/woodland-ground.png (Crush, enchilado, Wombat) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-indoor.png (Crush, Yosuhara) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-indoor-x1x2.png (Crush) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-indoor-x1x3.png (Crush) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-village.png (Crush, gumi) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-village-x1x2.png (Crush) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-village-x1x3.png (gumi, wushin) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-x1x2.png (Crush, Len, Saphy) (GPLv2) (-)
+ graphics/legacy/tilesets/woodland-x1x3.png (Crush, Len, Saphy, wushin) (GPLv2) (-)
# Maps
maps/000-0.tmx (Reid) (CC BY-SA 3.0) (-)
diff --git a/graphics/legacy/tilesets/pots_x2.png b/graphics/legacy/tilesets/pots-x1x2.png
index bd6273ce..bd6273ce 100644
--- a/graphics/legacy/tilesets/pots_x2.png
+++ b/graphics/legacy/tilesets/pots-x1x2.png
Binary files differ
diff --git a/graphics/legacy/tilesets/pots_x2.tsx b/graphics/legacy/tilesets/pots_x2.tsx
deleted file mode 100644
index 3be82629..00000000
--- a/graphics/legacy/tilesets/pots_x2.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="pots_x2" tilewidth="32" tileheight="64">
- <image source="pots_x2.png" width="512" height="64"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodenpump.png b/graphics/legacy/tilesets/woodenpump-x1x3.png
index 0f718581..0f718581 100644
--- a/graphics/legacy/tilesets/woodenpump.png
+++ b/graphics/legacy/tilesets/woodenpump-x1x3.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodenpump.tsx b/graphics/legacy/tilesets/woodenpump-x1x3.tsx
index e0d74aaa..f621b272 100644
--- a/graphics/legacy/tilesets/woodenpump.tsx
+++ b/graphics/legacy/tilesets/woodenpump-x1x3.tsx
@@ -1,19 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodenpump" tilewidth="32" tileheight="96">
- <image source="woodenpump.png" width="352" height="96"/>
+<tileset name="Woodenpump" tilewidth="32" tileheight="96">
+ <image source="woodenpump-x1x3.png" width="352" height="96"/>
<tile id="0">
- <animation>
- <frame tileid="1" duration="130"/>
- <frame tileid="2" duration="130"/>
- <frame tileid="3" duration="130"/>
- <frame tileid="4" duration="130"/>
- <frame tileid="5" duration="130"/>
- <frame tileid="6" duration="130"/>
- <frame tileid="7" duration="130"/>
- <frame tileid="8" duration="130"/>
- <frame tileid="9" duration="130"/>
- <frame tileid="10" duration="130"/>
- </animation>
<properties>
<property name="animation-delay0" value="13"/>
<property name="animation-delay1" value="20"/>
diff --git a/graphics/legacy/tilesets/woodland_ground.png b/graphics/legacy/tilesets/woodland-ground.png
index 89c550f0..89c550f0 100644
--- a/graphics/legacy/tilesets/woodland_ground.png
+++ b/graphics/legacy/tilesets/woodland-ground.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_indoor_x2.png b/graphics/legacy/tilesets/woodland-indoor-x1x2.png
index e084ceab..e084ceab 100644
--- a/graphics/legacy/tilesets/woodland_indoor_x2.png
+++ b/graphics/legacy/tilesets/woodland-indoor-x1x2.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_indoor_x3.png b/graphics/legacy/tilesets/woodland-indoor-x1x3.png
index d5960e7d..d5960e7d 100644
--- a/graphics/legacy/tilesets/woodland_indoor_x3.png
+++ b/graphics/legacy/tilesets/woodland-indoor-x1x3.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_indoor.png b/graphics/legacy/tilesets/woodland-indoor.png
index 937f6e47..937f6e47 100644
--- a/graphics/legacy/tilesets/woodland_indoor.png
+++ b/graphics/legacy/tilesets/woodland-indoor.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_village_x2.png b/graphics/legacy/tilesets/woodland-village-x1x2.png
index 9d853b0b..9d853b0b 100644
--- a/graphics/legacy/tilesets/woodland_village_x2.png
+++ b/graphics/legacy/tilesets/woodland-village-x1x2.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_village_x3.png b/graphics/legacy/tilesets/woodland-village-x1x3.png
index 837546d5..837546d5 100644
--- a/graphics/legacy/tilesets/woodland_village_x3.png
+++ b/graphics/legacy/tilesets/woodland-village-x1x3.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_village.png b/graphics/legacy/tilesets/woodland-village.png
index d9296417..d9296417 100644
--- a/graphics/legacy/tilesets/woodland_village.png
+++ b/graphics/legacy/tilesets/woodland-village.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_x2.png b/graphics/legacy/tilesets/woodland-x1x2.png
index 6cad428d..6cad428d 100644
--- a/graphics/legacy/tilesets/woodland_x2.png
+++ b/graphics/legacy/tilesets/woodland-x1x2.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_x3.png b/graphics/legacy/tilesets/woodland-x1x3.png
index 3d09d085..3d09d085 100644
--- a/graphics/legacy/tilesets/woodland_x3.png
+++ b/graphics/legacy/tilesets/woodland-x1x3.png
Binary files differ
diff --git a/graphics/legacy/tilesets/woodland_ground.tsx b/graphics/legacy/tilesets/woodland_ground.tsx
deleted file mode 100644
index 4fb5b80e..00000000
--- a/graphics/legacy/tilesets/woodland_ground.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_ground" tilewidth="32" tileheight="32">
- <image source="woodland_ground.png" width="512" height="512"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_indoor.tsx b/graphics/legacy/tilesets/woodland_indoor.tsx
deleted file mode 100644
index 40da2817..00000000
--- a/graphics/legacy/tilesets/woodland_indoor.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_indoor" tilewidth="32" tileheight="32">
- <image source="woodland_indoor.png" width="512" height="512"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_indoor_x2.tsx b/graphics/legacy/tilesets/woodland_indoor_x2.tsx
deleted file mode 100644
index 9ccfa896..00000000
--- a/graphics/legacy/tilesets/woodland_indoor_x2.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_indoor_x2" tilewidth="32" tileheight="64">
- <image source="woodland_indoor_x2.png" width="512" height="192"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_indoor_x3.tsx b/graphics/legacy/tilesets/woodland_indoor_x3.tsx
deleted file mode 100644
index 9692d1e1..00000000
--- a/graphics/legacy/tilesets/woodland_indoor_x3.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_indoor_x3" tilewidth="32" tileheight="96">
- <image source="woodland_indoor_x3.png" width="512" height="288"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_village.tsx b/graphics/legacy/tilesets/woodland_village.tsx
deleted file mode 100644
index 3d8e2828..00000000
--- a/graphics/legacy/tilesets/woodland_village.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village" tilewidth="32" tileheight="32">
- <image source="woodland_village.png" width="512" height="512"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_village_x2.tsx b/graphics/legacy/tilesets/woodland_village_x2.tsx
deleted file mode 100644
index 37a6ba20..00000000
--- a/graphics/legacy/tilesets/woodland_village_x2.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village_x2" tilewidth="32" tileheight="64">
- <image source="woodland_village_x2.png" width="512" height="64"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_village_x3.tsx b/graphics/legacy/tilesets/woodland_village_x3.tsx
deleted file mode 100644
index 6721c7de..00000000
--- a/graphics/legacy/tilesets/woodland_village_x3.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_village_x3" tilewidth="32" tileheight="96">
- <image source="woodland_village_x3.png" width="704" height="288"/>
-</tileset> \ No newline at end of file
diff --git a/graphics/legacy/tilesets/woodland_x2.tsx b/graphics/legacy/tilesets/woodland_x2.tsx
deleted file mode 100644
index f5527b12..00000000
--- a/graphics/legacy/tilesets/woodland_x2.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_x2" tilewidth="32" tileheight="64">
- <image source="woodland_x2.png" width="512" height="128"/>
-</tileset>
diff --git a/graphics/legacy/tilesets/woodland_x3.tsx b/graphics/legacy/tilesets/woodland_x3.tsx
deleted file mode 100644
index 0c65bf05..00000000
--- a/graphics/legacy/tilesets/woodland_x3.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="woodland_x3" tilewidth="32" tileheight="96">
- <image source="woodland_x3.png" width="512" height="192"/>
-</tileset>
diff --git a/maps.xml b/maps.xml
index 29514171..d77174af 100644
--- a/maps.xml
+++ b/maps.xml
@@ -339,19 +339,19 @@ Copyright (C) 2012-2017 Evol Online -->
</map>
<atlas name="legacy-woodland">
- <file name="graphics/legacy/tilesets/woodenpump.png"/>
- <file name="graphics/legacy/tilesets/woodland_ground.png"/>
- <file name="graphics/legacy/tilesets/woodland_x2.png"/>
- <file name="graphics/legacy/tilesets/woodland_x3.png"/>
- <file name="graphics/legacy/tilesets/woodland_village.png"/>
- <file name="graphics/legacy/tilesets/woodland_village_x2.png"/>
- <file name="graphics/legacy/tilesets/woodland_village_x3.png"/>
+ <file name="graphics/legacy/tilesets/woodenpump-x1x3.png"/>
+ <file name="graphics/legacy/tilesets/woodland-ground.png"/>
+ <file name="graphics/legacy/tilesets/woodland-village.png"/>
+ <file name="graphics/legacy/tilesets/woodland-village-x1x2.png"/>
+ <file name="graphics/legacy/tilesets/woodland-village-x1x3.png"/>
+ <file name="graphics/legacy/tilesets/woodland-x1x2.png"/>
+ <file name="graphics/legacy/tilesets/woodland-x1x3.png"/>
</atlas>
<atlas name="legacy-woodland-indoor">
- <file name="graphics/legacy/tilesets/pots_x2.png"/>
- <file name="graphics/legacy/tilesets/woodland_indoor.png"/>
- <file name="graphics/legacy/tilesets/woodland_indoor_x2.png"/>
- <file name="graphics/legacy/tilesets/woodland_indoor_x3.png"/>
+ <file name="graphics/legacy/tilesets/pots-x1x2.png"/>
+ <file name="graphics/legacy/tilesets/woodland-indoor.png"/>
+ <file name="graphics/legacy/tilesets/woodland-indoor-x1x2.png"/>
+ <file name="graphics/legacy/tilesets/woodland-indoor-x1x3.png"/>
</atlas>
<!-- / Legacy -->
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,