scope change: Removed old maps. made map 32x28

diff --git a/maps/base.tmx b/maps/base.tmx
index 078c4203feba520acbc070628cbab88004543879..b95ef3f194502b8923d1d1ea74788bebf53acfdc 100644 (file)
--- a/maps/base.tmx
+++ b/maps/base.tmx
@@ -1,46 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="10" height="8" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="11">
- <tileset firstgid="1" name="tiles1" tilewidth="16" tileheight="16" tilecount="64" columns="8">
+<map version="1.10" tiledversion="1.11.2" orientation="orthogonal" renderorder="right-down" width="32" height="28" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+ <tileset firstgid="1" name="tiles1" tilewidth="8" tileheight="8" tilecount="256" columns="16">
   <image source="../tiles1.png" width="128" height="128"/>
  </tileset>
- <objectgroup id="6" name="act">
-  <object id="7" name="1" x="99.9936" y="87.8182">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="8" name="0" x="55.625" y="40">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
- </objectgroup>
- <layer id="1" name="bg" width="10" height="8">
+ <layer id="1" name="bg" width="32" height="28">
   <data encoding="csv">
-57,58,58,59,58,58,60,58,58,61,
-55,49,49,49,49,49,49,49,49,62,
-52,49,2,49,49,49,49,2,49,25,
-55,49,49,49,49,49,49,49,49,62,
-55,49,49,49,49,49,49,49,49,62,
-53,49,2,49,49,49,49,2,49,26,
-55,49,49,49,49,49,49,49,49,62,
-63,54,54,50,54,54,51,54,54,64
-</data>
- </layer>
- <layer id="4" name="flags" width="10" height="8" opacity="0.62">
-  <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,
-2,0,0,0,0,0,0,0,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,0,0,0,0,0,0,0,2,
-2,0,0,0,0,0,0,0,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,0,0,0,0,0,0,0,2,
-2,2,2,2,2,2,2,2,2,2
+1,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,
+107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,1
 </data>
  </layer>
 </map>

diff --git a/maps/base2.tmx b/maps/base2.tmx
deleted file mode 100644 (file)
index 136b06c..0000000
--- a/maps/base2.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="10" height="8" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="11">
- <tileset firstgid="1" name="tiles1" tilewidth="16" tileheight="16" tilecount="64" columns="8">
-  <image source="../tiles1.png" width="128" height="128"/>
- </tileset>
- <objectgroup id="6" name="act">
-  <object id="7" name="1" x="67.63" y="54">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="8" name="0" x="55.625" y="40">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
- </objectgroup>
- <layer id="1" name="bg" width="10" height="8">
-  <data encoding="csv">
-57,58,58,59,58,58,60,58,58,61,
-55,49,49,2,49,49,2,49,49,62,
-52,2,49,49,49,49,49,49,2,25,
-55,49,49,2,29,29,2,49,49,62,
-55,49,49,2,29,29,2,49,49,62,
-53,2,49,49,49,49,49,49,2,26,
-55,49,49,2,49,49,2,49,49,62,
-63,54,54,50,54,54,51,54,54,64
-</data>
- </layer>
- <layer id="4" name="flags" width="10" height="8" opacity="0.62">
-  <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,
-2,0,0,2,0,0,2,0,0,2,
-2,2,0,0,0,0,0,0,2,2,
-2,0,0,2,1,1,2,0,0,2,
-2,0,0,2,1,1,2,0,0,2,
-2,2,0,0,0,0,0,0,2,2,
-2,0,0,2,0,0,2,0,0,2,
-2,2,2,2,2,2,2,2,2,2
-</data>
- </layer>
-</map>

diff --git a/maps/base3.tmx b/maps/base3.tmx
deleted file mode 100644 (file)
index 1048572..0000000
--- a/maps/base3.tmx
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="10" height="8" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="15">
- <tileset firstgid="1" name="tiles1" tilewidth="16" tileheight="16" tilecount="64" columns="8">
-  <image source="../tiles1.png" width="128" height="128"/>
- </tileset>
- <objectgroup id="6" name="act">
-  <object id="7" name="1" x="132.357" y="102.727">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="8" name="0" x="24.5341" y="27.091">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
- </objectgroup>
- <layer id="1" name="bg" width="10" height="8">
-  <data encoding="csv">
-57,58,58,59,58,58,60,58,58,61,
-55,49,49,49,49,49,49,49,49,62,
-52,49,49,49,2,2,49,49,49,25,
-55,49,2,49,49,49,49,2,49,62,
-55,49,2,49,49,49,49,2,49,62,
-53,49,49,49,2,2,49,49,49,26,
-55,49,49,49,49,49,49,49,49,62,
-63,54,54,50,54,54,51,54,54,64
-</data>
- </layer>
- <layer id="4" name="flags" width="10" height="8" opacity="0.62">
-  <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,
-2,0,0,0,0,0,0,0,0,2,
-2,0,0,0,2,2,0,0,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,0,0,2,2,0,0,0,2,
-2,0,0,0,0,0,0,0,0,2,
-2,2,2,2,2,2,2,2,2,2
-</data>
- </layer>
-</map>

diff --git a/maps/base4.tmx b/maps/base4.tmx
deleted file mode 100644 (file)
index dd580f1..0000000
--- a/maps/base4.tmx
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="10" height="8" tilewidth="16" tileheight="16" infinite="0" nextlayerid="7" nextobjectid="17">
- <tileset firstgid="1" name="tiles1" tilewidth="16" tileheight="16" tilecount="64" columns="8">
-  <image source="../tiles1.png" width="128" height="128"/>
- </tileset>
- <objectgroup id="6" name="act">
-  <object id="7" name="1" x="132.175" y="102.364">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="8" name="0" x="23.8068" y="26.5455">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="11" name="1" x="136" y="28.3636">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
-  <object id="12" name="1" x="26" y="103.818">
-   <properties>
-    <property name="flags" value="0"/>
-    <property name="type" value="1"/>
-   </properties>
-   <point/>
-  </object>
- </objectgroup>
- <layer id="1" name="bg" width="10" height="8">
-  <data encoding="csv">
-57,58,58,59,58,58,60,58,58,61,
-55,49,49,49,49,49,49,49,49,62,
-52,49,49,2,2,2,2,49,49,25,
-55,49,2,49,49,49,49,2,49,62,
-55,49,2,49,49,49,49,2,49,62,
-53,49,49,49,2,2,49,49,49,26,
-55,49,49,49,49,49,49,49,49,62,
-63,54,54,50,54,54,51,54,54,64
-</data>
- </layer>
- <layer id="4" name="flags" width="10" height="8" opacity="0.62">
-  <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,
-2,0,0,0,0,0,0,0,0,2,
-2,0,0,2,2,2,2,0,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,2,0,0,0,0,2,0,2,
-2,0,0,0,2,2,0,0,0,2,
-2,0,0,0,0,0,0,0,0,2,
-2,2,2,2,2,2,2,2,2,2
-</data>
- </layer>
-</map>

diff --git a/tiles0.png b/tiles0.png
index 9442621fbba6328c0b64825acd27b675eacd60f8..70f3f66fb79629f4da6cb568f6180d04a417ce97 100644 (file)
--- a/tiles0.png
+++ b/tiles0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cc0e68a8aa62f1bdaf4910e07001d16fe5bc565f332e9aaff56ebcb9628c3d2
-size 1532
+oid sha256:6aaf13ff557f604766dfcabc50cefbc582b168a8308d4ae5c59482ef88d96b1c
+size 1553

diff --git a/tiles1.png b/tiles1.png
index 02fb13d81b9e50654b3de00d800a3c5ab0e6841e..66f1224e0ba60c16a19876822673d8a11f5785f0 100644 (file)
--- a/tiles1.png
+++ b/tiles1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a05afb864fbef5478fccf82cfe3960ff92ef62ea284533716f83c60140d6dbb6
-size 2431
+oid sha256:fe88cec7f98ba53ca942c8ff006ce8cc932b92cf61448b726b3966586aadadb3
+size 2479