move maps folder

README.md

@@ -25,7 +25,7 @@ You also need a running redis server (used db number is `0`, soon configurable).
 
 Example run:
 
-    python run.py opencombat/maps/003
+    python run.py maps/003
 
 # Actual keys
 

opencombat/gui/base.py

@@ -67,7 +67,9 @@ class BackgroundLayer(cocos.layer.Layer):
         self.layer_manager = layer_manager
         self.background_sprite = background_sprite
         self.last_interior_draw_timestamp = 0
-        self.interior_manager = InteriorManager(TileMap('opencombat/maps/003/003.tmx'))
+        self.interior_manager = InteriorManager(TileMap(
+            layer_manager.middleware.get_map_file_path(),
+        ))
 
     def draw(self, *args, **kwargs):
         super().draw(*args, **kwargs)
@@ -86,8 +88,10 @@ class BackgroundLayer(cocos.layer.Layer):
                 where_positions=subject_grid_positions)
 
             if interiors:
-                # FIXME: hardcoded
-                image = Image.open('opencombat/maps/003/background.png')
+                image = Image.open(os.path.join(
+                    self.layer_manager.middleware.map_dir_path,
+                    'background.png',
+                ))
                 image_fake_file = io.BytesIO()
                 # FIXME: tile height/width !
                 self.interior_manager.update_image_for_interiors(image, interiors, 8, 8)

opencombat/maps/004/004.tmx

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="2017.07.26" orientation="orthogonal" renderorder="left-up" width="15" height="5" tilewidth="8" tileheight="8" nextobjectid="4">
- <tileset firstgid="1" source="trees_64x64.tsx"/>
- <tileset firstgid="10" source="terrain.tsx"/>
- <imagelayer name="background" visible="0">
-  <image source="background.png" width="24" height="40"/>
- </imagelayer>
- <layer name="terrain" width="15" height="5" opacity="0.5">
-  <data encoding="base64">
-   CgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAoAAAALAAAACwAAAAsAAAAKAAAACgAAAAsAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAsAAAAKAAAACgAAAAsAAAALAAAACwAAAAoAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAA
-  </data>
- </layer>
- <layer name="ground" width="15" height="5">
-  <data encoding="base64">
-   CgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAoAAAALAAAACwAAAAsAAAAKAAAACgAAAAsAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAsAAAAKAAAACgAAAAsAAAALAAAACwAAAAoAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAALAAAACwAAAAsAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAA
-  </data>
- </layer>
- <layer name="top" width="15" height="5">
-  <data encoding="base64">
-   AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-  </data>
- </layer>
-</map>

opencombat/maps/004/terrain.tsx

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="terrain" tilewidth="8" tileheight="8" spacing="1" tilecount="49" columns="7">
- <image source="terrain.png" width="64" height="64"/>
- <tile id="0">
-  <properties>
-   <property name="name" type="str" value="Grass"/>
-   <property name="traversable_by_man" type="bool" value="true"/>
-   <property name="traversable_by_vehicle" type="bool" value="true"/>
-  </properties>
- </tile>
- <tile id="1">
-  <properties>
-   <property name="name" type="str" value="Wood wall"/>
-   <property name="traversable_by_man" type="bool" value="false"/>
-   <property name="traversable_by_vehicle" type="bool" value="false"/>
-  </properties>
- </tile>
-</tileset>

opencombat/maps/004/trees_64x64.tsx

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tileset name="trees_64x64" tilewidth="64" tileheight="64" tilecount="9" columns="3">
- <image source="trees_64x64.png" width="192" height="192"/>
-</tileset>