Clean up

7 files changed, 8 insertions, 51 deletions

diff --git a/graphics/tilesets/evil-obelisk.png b/graphics/tilesets/evil-obelisk.png
deleted file mode 100644
index 803a9f32..00000000
--- a/graphics/tilesets/evil-obelisk.png
+++ /dev/null
diff --git a/graphics/tilesets/evil-obelisk.tsx b/graphics/tilesets/evil-obelisk.tsx
deleted file mode 100644
index 1da1da22..00000000
--- a/graphics/tilesets/evil-obelisk.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="evil-obelisk" tilewidth="64" tileheight="128">
- <image source="../graphics/tiles/evil-obelisk.png" width="448" height="128"/>
- <tile id="0">
-  <animation>
-   <frame tileid="1" duration="25"/>
-   <frame tileid="2" duration="25"/>
-   <frame tileid="3" duration="25"/>
-   <frame tileid="4" duration="25"/>
-   <frame tileid="5" duration="25"/>
-   <frame tileid="6" duration="25"/>
-   <frame tileid="5" duration="25"/>
-   <frame tileid="4" duration="25"/>
-   <frame tileid="3" duration="25"/>
-   <frame tileid="2" duration="25"/>
-   <frame tileid="1" duration="25"/>
-  </animation>
-  <properties>
-   <property name="animation-delay0" value="25"/>
-   <property name="animation-delay1" value="25"/>
-   <property name="animation-delay2" value="25"/>
-   <property name="animation-delay3" value="25"/>
-   <property name="animation-delay4" value="25"/>
-   <property name="animation-delay5" value="25"/>
-   <property name="animation-delay6" value="25"/>
-   <property name="animation-delay7" value="25"/>
-   <property name="animation-delay8" value="25"/>
-   <property name="animation-delay9" value="25"/>
-   <property name="animation-delay10" value="25"/>
-   <property name="animation-frame0" value="1"/>
-   <property name="animation-frame1" value="2"/>
-   <property name="animation-frame2" value="3"/>
-   <property name="animation-frame3" value="4"/>
-   <property name="animation-frame4" value="5"/>
-   <property name="animation-frame5" value="6"/>
-   <property name="animation-frame6" value="5"/>
-   <property name="animation-frame7" value="4"/>
-   <property name="animation-frame8" value="3"/>
-   <property name="animation-frame9" value="2"/>
-   <property name="animation-frame10" value="1"/>
-  </properties>
- </tile>
-</tileset>
diff --git a/graphics/tilesets/lof_woodland_village.png b/graphics/tilesets/lof_woodland_village.png
deleted file mode 100644
index fce35fce..00000000
--- a/graphics/tilesets/lof_woodland_village.png
+++ /dev/null
diff --git a/graphics/tilesets/lof_woodland_village_x2.png b/graphics/tilesets/lof_woodland_village_x2.png
deleted file mode 100644
index e8c98319..00000000
--- a/graphics/tilesets/lof_woodland_village_x2.png
+++ /dev/null
diff --git a/maps.xml b/maps.xml
index 4d651e34..451cfb31 100644
--- a/maps.xml
+++ b/maps.xml
@@ -604,8 +604,8 @@ Copyright (C) 2018 TMW2 -->
         <file name="graphics/tilesets/woodland_ground.png"/>
         <file name="graphics/tilesets/water.png"/>
         <file name="graphics/tilesets/woodland_water.png"/>
-        <file name="graphics/tilesets/lof_woodland_village.png"/>
-        <file name="graphics/tilesets/lof_woodland_village_x2.png"/>
+        <file name="graphics/tilesets/lof/woodland_village.png"/>
+        <file name="graphics/tilesets/lof/woodland_village_x2.png"/>
         <file name="graphics/tilesets/tree-x3x4.png"/>
         <file name="graphics/tilesets/desert2_old.png"/>
         <file name="graphics/tilesets/desert1.png"/>
@@ -824,7 +824,7 @@ Copyright (C) 2018 TMW2 -->
         <file name="graphics/tilesets/box.png"/>
         <file name="graphics/tilesets/box-x1x2.png"/>
         <file name="graphics/tilesets/docks.png"/>
-        <file name="graphics/tilesets/lof_woodland_village.png"/>
+        <file name="graphics/tilesets/lof/woodland_village.png"/>
         <file name="graphics/tilesets/magecity.png"/>
         <file name="graphics/tilesets/soccer_field.png"/>
         <file name="graphics/tilesets/signs_x2.png"/>
diff --git a/maps/012-1.tmx b/maps/012-1.tmx
index d9dbd204..dd9fcec7 100644
--- a/maps/012-1.tmx
+++ b/maps/012-1.tmx
@@ -62,7 +62,7 @@
  </tileset>
  <tileset firstgid="1758" source="../graphics/tilesets/ship-flags-x3x2.tsx"/>
  <tileset firstgid="1772" name="lof_woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/lof_woodland_village.png" width="512" height="512"/>
+  <image source="../graphics/tilesets/lof/woodland_village.png" width="512" height="512"/>
  </tileset>
  <tileset firstgid="2028" source="../graphics/tilesets/docks.tsx"/>
  <tileset firstgid="2188" name="Box" tilewidth="32" tileheight="32" tilecount="36" columns="6">
diff --git a/maps/017-1.tmx b/maps/017-1.tmx
index 427320ef..d0e37592 100644
--- a/maps/017-1.tmx
+++ b/maps/017-1.tmx
@@ -51,11 +51,11 @@
  <tileset firstgid="385" name="water (2)" tilewidth="32" tileheight="32" tilecount="240" columns="15">
   <image source="../graphics/tilesets/water.png" width="480" height="512"/>
  </tileset>
- <tileset firstgid="625" name="Woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
-  <image source="../graphics/tilesets/lof_woodland_village.png" width="512" height="512"/>
+ <tileset firstgid="625" name="LoF Woodland_village" tilewidth="32" tileheight="32" tilecount="256" columns="16">
+  <image source="../graphics/tilesets/lof/woodland_village.png" width="512" height="512"/>
  </tileset>
- <tileset firstgid="881" name="Woodland_village_x2" tilewidth="32" tileheight="32" tilecount="32" columns="16">
-  <image source="../graphics/tilesets/lof_woodland_village_x2.png" width="512" height="64"/>
+ <tileset firstgid="881" name="LoF Woodland_village_x2" tilewidth="32" tileheight="32" tilecount="32" columns="16">
+  <image source="../graphics/tilesets/lof/woodland_village_x2.png" width="512" height="64"/>
  </tileset>
  <tileset firstgid="913" name="tree-x3x4" tilewidth="32" tileheight="32" tilecount="120" columns="15">
   <image source="../graphics/tilesets/tree-x3x4.png" width="480" height="256"/>