state: include properties

README.md

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

maps/001/001.tmx

@@ -4,10 +4,10 @@
  <tileset firstgid="82" source="../shared/tilesets/terrain.tsx"/>
  <tileset firstgid="131" source="../shared/tilesets/interiors.tsx"/>
  <imagelayer name="interior">
-  <image source="001i.png" width="1024" height="512"/>
+  <image source="background_interior.png" width="1024" height="512"/>
  </imagelayer>
  <imagelayer name="background" visible="0">
-  <image source="001.png" width="1024" height="512"/>
+  <image source="background.png" width="1024" height="512"/>
  </imagelayer>
  <layer name="top" width="128" height="64">
   <data encoding="csv">

maps/001/state1.xml

@@ -6,14 +6,42 @@
     <subjects>
         <subject>
             <type>opencombat.simulation.subject.ManSubject</type>
-            <position>1,1</position>
+            <position>72,7</position>
             <direction>90</direction>
             <mode>standup</mode>
             <side>URSS</side>
         </subject>
         <subject>
             <type>opencombat.simulation.subject.ManSubject</type>
-            <position>10,10</position>
+            <position>72,9</position>
+            <direction>90</direction>
+            <mode>standup</mode>
+            <side>URSS</side>
+        </subject>
+        <subject>
+            <type>opencombat.simulation.subject.ManSubject</type>
+            <position>72,11</position>
+            <direction>90</direction>
+            <mode>standup</mode>
+            <side>URSS</side>
+        </subject>
+        <subject>
+            <type>opencombat.simulation.subject.ManSubject</type>
+            <position>58,54</position>
+            <direction>270</direction>
+            <mode>hiding</mode>
+            <side>DE</side>
+        </subject>
+        <subject>
+            <type>opencombat.simulation.subject.ManSubject</type>
+            <position>58,56</position>
+            <direction>270</direction>
+            <mode>hiding</mode>
+            <side>DE</side>
+        </subject>
+        <subject>
+            <type>opencombat.simulation.subject.ManSubject</type>
+            <position>58,58</position>
             <direction>270</direction>
             <mode>hiding</mode>
             <side>DE</side>

opencombat/state.py

@@ -6,12 +6,18 @@ from lxml import etree
 
 from synergine2.config import Config
 from synergine2.log import get_logger
+from synergine2_cocos2d.const import SELECTION_COLOR_RGB
 
 from opencombat.exception import StateLoadError
 from opencombat.simulation.base import TileStrategySimulation
 from opencombat.simulation.subject import TileSubject
 from opencombat.util import get_class_from_string_path
 from opencombat.util import get_text_xml_element
+from opencombat.const import FLAG, SIDE
+from opencombat.const import FLAG_DE
+from opencombat.const import DE_COLOR
+from opencombat.const import URSS_COLOR
+from opencombat.const import FLAG_URSS
 
 
 class State(object):
@@ -56,6 +62,8 @@ class State(object):
         subject: TileSubject,
         subject_element: Element,
     ) -> None:
+        subject_properties = {}
+
         subject.position = tuple(
             map(
                 int,
@@ -66,15 +74,25 @@ class State(object):
             get_text_xml_element(subject_element, 'direction'),
         )
 
-        """
-        TODO:
+        side = get_text_xml_element(subject_element, 'side')
+        if side == 'DE':
+            subject_properties.update({
+                SELECTION_COLOR_RGB: DE_COLOR,
+                FLAG: FLAG_DE,
+                SIDE: 'AXIS',
+            })
+        elif side == 'URSS':
+            subject_properties.update({
+                SELECTION_COLOR_RGB: URSS_COLOR,
+                FLAG: FLAG_URSS,
+                SIDE: 'ALLIES',
+            })
+        else:
+            raise NotImplementedError('Don\'t know "{}" side'.format(
+                side,
+            ))
 
-        properties={
-                 SELECTION_COLOR_RGB: DE_COLOR,
-                 FLAG: FLAG_DE,
-                 SIDE: 'AXIS',
-             }
-        """
+        subject.properties = subject_properties
 
 
 class StateLoader(object):

run.py

@@ -5,19 +5,11 @@ from random import seed
 
 from synergine2.log import get_default_logger
 from synergine2.config import Config
-from synergine2_cocos2d.const import SELECTION_COLOR_RGB
 from synergine2_cocos2d.util import get_map_file_path_from_dir
 from synergine2.core import Core
 from synergine2.cycle import CycleManager
 from synergine2.terminals import TerminalManager
 
-from opencombat.const import FLAG, SIDE
-from opencombat.const import FLAG_DE
-from opencombat.const import DE_COLOR
-from opencombat.const import URSS_COLOR
-from opencombat.const import FLAG_URSS
-from opencombat.simulation.subject import ManSubject
-from opencombat.simulation.subject import TankSubject
 from opencombat.simulation.base import TileStrategySimulation
 from opencombat.simulation.base import TileStrategySubjects
 from opencombat.state import StateLoaderBuilder
@@ -48,45 +40,6 @@ def main(
         state = state_loader.get_state(state_file_path)
         subjects.extend(state.subjects)
 
-    # for position in ((10, 2), (11, 3), (11, 4), (12, 5),):
-    #     man = ManSubject(
-    #         config=config,
-    #         simulation=simulation,
-    #         position=position,
-    #         properties={
-    #             SELECTION_COLOR_RGB: DE_COLOR,
-    #             FLAG: FLAG_DE,
-    #             SIDE: 'AXIS',
-    #         }
-    #     )
-    #     subjects.append(man)
-    #
-    # for position in ((30, 15), (31, 16), (32, 17), (33, 18),):
-    #     man = ManSubject(
-    #         config=config,
-    #         simulation=simulation,
-    #         position=position,
-    #         properties={
-    #             SELECTION_COLOR_RGB: URSS_COLOR,
-    #             FLAG: FLAG_URSS,
-    #             SIDE: 'ALLIES',
-    #         }
-    #     )
-    #     subjects.append(man)
-    #
-    # for position in ((38, 24),):
-    #     man = TankSubject(
-    #         config=config,
-    #         simulation=simulation,
-    #         position=position,
-    #         properties={
-    #             SELECTION_COLOR_RGB: URSS_COLOR,
-    #             FLAG: FLAG_URSS,
-    #             SIDE: 'ALLIES',
-    #         }
-    #     )
-    #     subjects.append(man)
-
     simulation.subjects = subjects
 
     core = Core(
@@ -112,7 +65,8 @@ if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Run TileStrategy')
     parser.add_argument('map_dir_path', help='map directory path')
     parser.add_argument('--seed', dest='seed', default=None)
+    parser.add_argument('--state', dest='state', default=None)
 
     args = parser.parse_args()
 
-    main(args.map_dir_path, seed_value=args.seed)
+    main(args.map_dir_path, seed_value=args.seed, state_file_path=args.state)