combat mode in state

maps/001/state1.xml

@@ -8,7 +8,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>72,7</position>
             <direction>90</direction>
-            <mode>standup</mode>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -28,7 +28,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>72,9</position>
             <direction>90</direction>
-            <mode>standup</mode>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -48,7 +48,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>72,11</position>
             <direction>90</direction>
-            <mode>standup</mode>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -68,7 +68,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>58,54</position>
             <direction>270</direction>
-            <mode>hiding</mode>
+            <combat_mode>hiding</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -88,7 +88,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>58,56</position>
             <direction>270</direction>
-            <mode>hiding</mode>
+            <combat_mode>hiding</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -108,7 +108,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>58,58</position>
             <direction>270</direction>
-            <mode>hiding</mode>
+            <combat_mode>hiding</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>

opencombat/const.py

@@ -8,7 +8,8 @@ FLAG_URSS = 'FLAG_URSS'
 
 SIDE = 'SIDE'
 COMBAT_MODE = 'COMBAT_MODE'
-COMBAT_MODE_DEFENSE = 'COMBAT_MODE_DEFENSE'
+COMBAT_MODE_DEFEND = 'COMBAT_MODE_DEFEND'
+COMBAT_MODE_HIDE = 'COMBAT_MODE_HIDE'
 
 DE_COLOR = (0, 81, 211)
 URSS_COLOR = (204, 0, 0)

opencombat/simulation/subject.py

@@ -7,7 +7,7 @@ from opencombat.user_action import UserAction
 from synergine2_xyz.move.intention import MoveToIntention
 
 from opencombat.const import COLLECTION_ALIVE
-from opencombat.const import COMBAT_MODE_DEFENSE
+from opencombat.const import COMBAT_MODE_DEFEND
 from opencombat.simulation.base import BaseSubject
 from opencombat.simulation.move import MoveBehaviour
 from opencombat.simulation.move import MoveWithRotationBehaviour
@@ -29,7 +29,7 @@ class TileSubject(BaseSubject):
         COLLECTION_ALIVE,
     ]
     visible_opponent_ids = shared.create_self('visible_opponent_ids', lambda: [])
-    combat_mode = shared.create_self('combat_mode', COMBAT_MODE_DEFENSE)
+    combat_mode = shared.create_self('combat_mode', COMBAT_MODE_DEFEND)
     behaviour_selector_class = TileBehaviourSelector
 
     direction = shared.create_self('direction', 0)

opencombat/state.py

@@ -67,6 +67,9 @@ class State(object):
         subject.direction = float(
             get_text_xml_element(subject_element, 'direction'),
         )
+        # TODO BS 2018-06-20: Maybe need apply this mode no ?
+        subject.combat_mode = \
+            get_text_xml_element(subject_element, 'combat_mode')
 
         properties_element = subject_element.find('properties')
         decode_properties_map = self._get_decode_properties_map()
@@ -152,6 +155,12 @@ class StateDumper(object):
             direction_element = etree.SubElement(subject_element, 'direction')
             direction_element.text = str(subject.direction)
 
+            combat_mode_element = etree.SubElement(
+                subject_element,
+                'combat_mode',
+            )
+            combat_mode_element.text = str(subject.combat_mode)
+
             properties_element = etree.SubElement(
                 subject_element,
                 'properties',

opencombat/state.xsd

@@ -23,11 +23,10 @@
         </xs:sequence>
     </xs:complexType>
 
-    <xs:simpleType name="modetype" final="restriction">
+    <xs:simpleType name="combatmodetype" final="restriction">
         <xs:restriction base="xs:string">
-            <xs:enumeration value="standup"/>
-            <xs:enumeration value="defending"/>
-            <xs:enumeration value="hiding"/>
+            <xs:enumeration value="COMBAT_MODE_DEFEND"/>
+            <xs:enumeration value="COMBAT_MODE_HIDE"/>
         </xs:restriction>
     </xs:simpleType>
 
@@ -60,7 +59,7 @@
             <xs:element name="type" type="xs:string" minOccurs="1" />
             <xs:element name="position" type="positiontype" minOccurs="1"/>
             <xs:element name="direction" type="directiontype" minOccurs="1"/>
-            <xs:element name="mode" type="modetype" minOccurs="1"/>
+            <xs:element name="combat_mode" type="combatmodetype" minOccurs="1"/>
             <xs:element name="properties" type="propertiestype" minOccurs="1"/>
         </xs:sequence>
     </xs:complexType>

tests/fixtures/state_error_schema.xml

@@ -8,13 +8,13 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>1,1</position>
             <direction>90</direction>
-            <mode>standup</mode>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
         </subject>
         <subjectFOO>
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>10,10</position>
             <direction>270</direction>
-            <mode>hiding</mode>
+            <combat_mode>hiding</combat_mode>
         </subjectFOO>
     </subjects>
 </state>

tests/fixtures/state_ok.xml

@@ -8,7 +8,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>1,1</position>
             <direction>90</direction>
-            <mode>standup</mode>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -28,7 +28,7 @@
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>10,10</position>
             <direction>270</direction>
-            <mode>hiding</mode>
+            <combat_mode>COMBAT_MODE_HIDE</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>

tests/test_state.py

@@ -111,6 +111,9 @@ def test_state__ok__subjects(
     assert 90.0 == state.subjects[0].direction
     assert 270.0 == state.subjects[1].direction
 
+    assert 'COMBAT_MODE_DEFEND' == state.subjects[0].combat_mode
+    assert 'COMBAT_MODE_HIDE' == state.subjects[1].combat_mode
+
     assert {
                'SELECTION_COLOR_RGB': (204, 0, 0),
                'FLAG': 'FLAG_URSS',
@@ -139,6 +142,7 @@ def test_state__ok__dump(
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>10,11</position>
             <direction>42</direction>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>
@@ -158,6 +162,7 @@ def test_state__ok__dump(
             <type>opencombat.simulation.subject.ManSubject</type>
             <position>16,8</position>
             <direction>197</direction>
+            <combat_mode>COMBAT_MODE_DEFEND</combat_mode>
             <properties>
                 <item>
                     <key>SELECTION_COLOR_RGB</key>