troops in map for placement

README.md

@@ -33,7 +33,7 @@ You also need a running redis server (used db number is `0`, soon configurable).
 
 Start troops selection GUI with:
 
-    python select_troops.py --country URSS --country DE
+    python select_troops.py --country USSR --country DE
 
 Select troops for every countries then generate s troops file.
 

maps/001/state1.xml

@@ -16,7 +16,7 @@
                 </item>
                 <item>
                     <key>FLAG</key>
-                    <value>FLAG_URSS</value>
+                    <value>FLAG_USSR</value>
                 </item>
                 <item>
                     <key>SIDE</key>
@@ -36,7 +36,7 @@
                 </item>
                 <item>
                     <key>FLAG</key>
-                    <value>FLAG_URSS</value>
+                    <value>FLAG_USSR</value>
                 </item>
                 <item>
                     <key>SIDE</key>
@@ -56,7 +56,7 @@
                 </item>
                 <item>
                     <key>FLAG</key>
-                    <value>FLAG_URSS</value>
+                    <value>FLAG_USSR</value>
                 </item>
                 <item>
                     <key>SIDE</key>

opencombat/const.py

@@ -2,14 +2,23 @@
 
 COLLECTION_ALIVE = 'ALIVE'
 
+SELECTION_COLOR_RGB = 'SELECTION_COLOR_RGB'
+
 FLAG = 'FLAG'
 FLAG_DE = 'FLAG_DE'
-FLAG_URSS = 'FLAG_URSS'
+FLAG_USSR = 'FLAG_USSR'
 
 SIDE = 'SIDE'
+SIDE_ALLIES = 'SIDE_ALLIES'
+SIDE_AXIS = 'SIDE_ALLIES'
+
+COUNTRY = 'COUNTRY'
+COUNTRY_USSR = 'USSR'
+COUNTRY_DE = 'DE'
+
 COMBAT_MODE = 'COMBAT_MODE'
 COMBAT_MODE_DEFEND = 'COMBAT_MODE_DEFEND'
 COMBAT_MODE_HIDE = 'COMBAT_MODE_HIDE'
 
 DE_COLOR = (0, 81, 211)
-URSS_COLOR = (204, 0, 0)
+USSR_COLOR = (204, 0, 0)

opencombat/game/const.py

@@ -6,4 +6,4 @@ FLAG_DE = 'DE'
 FLAG_COLORS = {
     FLAG_DE
 }
-FLAG_URSS = 'URSS'
+FLAG_USSR = 'USSR'

opencombat/simulation/base.py

@@ -1,5 +1,14 @@
 # coding: utf-8
 from opencombat.const import COLLECTION_ALIVE
+from opencombat.const import COUNTRY_USSR
+from opencombat.const import FLAG_USSR
+from opencombat.const import SIDE_ALLIES
+from opencombat.const import COUNTRY_DE
+from opencombat.const import USSR_COLOR
+from opencombat.const import DE_COLOR
+from opencombat.const import SIDE
+from opencombat.const import FLAG
+from opencombat.const import SELECTION_COLOR_RGB
 from opencombat.simulation.physics import TilePhysics
 from synergine2.config import Config
 from synergine2.simulation import SubjectBehaviour
@@ -14,6 +23,23 @@ class TileStrategySimulation(XYZSimulation):
 
     ]
 
+    @classmethod
+    def get_default_properties_for_country(cls, country: str) -> dict:
+        if country == COUNTRY_USSR:
+            return {
+                SELECTION_COLOR_RGB: USSR_COLOR,
+                FLAG: FLAG_USSR,
+                SIDE: SIDE_ALLIES,
+            }
+        elif country == COUNTRY_DE:
+            return {
+                SELECTION_COLOR_RGB: DE_COLOR,
+                FLAG: FLAG_USSR,
+                SIDE: SIDE_ALLIES,
+            }
+
+        raise NotImplementedError('Unknown country "{}"'.format(country))
+
     def __init__(
         self,
         config: Config,

opencombat/state.py

@@ -14,6 +14,9 @@ from opencombat.util import get_class_from_string_path
 from opencombat.util import pretty_xml
 from opencombat.util import get_text_xml_element
 from opencombat.xml import XmlValidator
+from opencombat.const import SIDE
+from opencombat.const import FLAG
+from opencombat.const import SELECTION_COLOR_RGB
 
 
 class State(object):
@@ -93,9 +96,9 @@ class State(object):
 
     def _get_decode_properties_map(self) -> typing.Dict[str, typing.Callable[[str], typing.Any]]:  # nopep8
         return {
-            'SELECTION_COLOR_RGB': lambda v: tuple(map(int, v.split(','))),
-            'FLAG': str,
-            'SIDE': str,
+            SELECTION_COLOR_RGB: lambda v: tuple(map(int, v.split(','))),
+            FLAG: str,
+            SIDE: str,
         }
 
 
@@ -179,9 +182,9 @@ class StateDumper(object):
 
     def _get_encode_properties_map(self) -> typing.Dict[str, typing.Callable[[typing.Any], str]]:  # nopep8:
         return {
-            'SELECTION_COLOR_RGB': lambda v: ','.join(map(str, v)),
-            'FLAG': str,
-            'SIDE': str,
+            SELECTION_COLOR_RGB: lambda v: ','.join(map(str, v)),
+            FLAG: str,
+            SIDE: str,
         }
 
 

opencombat/strategy/teams.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <teams>
-    <team id="std_team" country="URSS">
-        <name>Standard URSS team</name>
+    <team id="std_team" country="USSR">
+        <name>Standard USSR team</name>
         <units>
             <unit>
                 <id>std_soldier</id>

opencombat/strategy/troops.py

@@ -60,9 +60,13 @@ class Troop(object):
 
             for unit in team.units:
                 subject = unit.class_(self._config, self._simulation)
+                properties = \
+                    self._simulation.get_default_properties_for_country(
+                        country,
+                    )
+                subject.properties.update(properties)
                 subjects.append(subject)
 
-        # TODO BS 2018-06-25: place subjects on map, set side, color, etc
         return subjects
 
 

opencombat/strategy/units.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <units>
-    <unit id="std_soldier" country="URSS">
+    <unit id="std_soldier" country="USSR">
         <name>Standard soldier</name>
         <type>opencombat.simulation.subject.ManSubject</type>
     </unit>

select_troops.py

@@ -1,5 +1,6 @@
 # coding: utf-8
 import argparse
+import sys
 import typing
 from tkinter import Tk
 
@@ -62,6 +63,14 @@ if __name__ == '__main__':
     )
     args = parser.parse_args()
 
+    if not args.countries:
+        print(
+            'You must choose one or more countries with parameters '
+            '--country, eg. `--country USSR --country DE`',
+            file=sys.stderr,
+        )
+        exit(1)
+
     main(
         units_file_path=args.units_file_path,
         teams_file_path=args.teams_file_path,

tests/fixtures/state_ok.xml

@@ -16,7 +16,7 @@
                 </item>
                 <item>
                     <key>FLAG</key>
-                    <value>FLAG_URSS</value>
+                    <value>FLAG_USSR</value>
                 </item>
                 <item>
                     <key>SIDE</key>

tests/fixtures/teams.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <teams>
-    <team id="std_team" country="URSS">
-        <name>Standard URSS team</name>
+    <team id="std_team" country="USSR">
+        <name>Standard USSR team</name>
         <units>
             <unit>
                 <id>std_soldier</id>

tests/fixtures/units.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <units>
-    <unit id="std_soldier" country="URSS">
+    <unit id="std_soldier" country="USSR">
         <name>Standard soldier</name>
         <type>opencombat.simulation.subject.ManSubject</type>
     </unit>

tests/strategy/test_teams.py

@@ -46,7 +46,7 @@ def test_team_stash__ok__get_teams(
 
     assert 'std_team' == stash.teams[0].id
     assert 'Standard team' == stash.teams[0].name
-    assert 'URSS' == stash.teams[0].country
+    assert 'USSR' == stash.teams[0].country
     assert stash.teams[0].units
     assert 4 == len(stash.teams[0].units)
     assert isinstance(stash.teams[0].units[0], UnitModel)
@@ -76,7 +76,7 @@ def test_teams_stash__ok__get_unit(
         'tests/fixtures/teams.xml',
         unit_stash=unit_stash,
     )
-    assert stash.get_team('std_team', 'URSS')
+    assert stash.get_team('std_team', 'USSR')
 
 
 def test_teams_stash__error__get_team_wrong_country(
@@ -104,4 +104,4 @@ def test_teams_stash__error__get_team_wrong_id(
     )
 
     with pytest.raises(NotFoundException):
-        stash.get_team('unknown', 'URSS')
+        stash.get_team('unknown', 'USSR')

tests/strategy/test_units.py

@@ -31,7 +31,7 @@ def test_units_stash__ok__get_units(
 
     assert 'std_soldier' == stash.units[0].id
     assert 'Standard soldier' == stash.units[0].name
-    assert 'URSS' == stash.units[0].country
+    assert 'USSR' == stash.units[0].country
     assert ManSubject == stash.units[0].class_
 
     assert 'std_soldier' == stash.units[1].id
@@ -47,7 +47,7 @@ def test_units_stash__ok__get_unit(
         config,
         'tests/fixtures/units.xml',
     )
-    assert stash.get_unit('std_soldier', 'URSS')
+    assert stash.get_unit('std_soldier', 'USSR')
 
 
 def test_units_stash__error__get_unit_wrong_country(
@@ -71,4 +71,4 @@ def test_units_stash__error__get_unit_wrong_id(
     )
 
     with pytest.raises(NotFoundException):
-        stash.get_unit('unknown', 'URSS')
+        stash.get_unit('unknown', 'USSR')

tests/test_state.py

@@ -16,8 +16,10 @@ from opencombat.const import FLAG
 from opencombat.const import 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.const import USSR_COLOR
+from opencombat.const import FLAG_USSR
+from opencombat.const import SIDE_ALLIES
+from opencombat.const import SIDE_AXIS
 
 
 class MyStateLoader(StateLoader):
@@ -44,16 +46,16 @@ def simulation_for_dump(config) -> TileStrategySimulation:
     man1.properties = OrderedDict([
         (SELECTION_COLOR_RGB, DE_COLOR),
         (FLAG, FLAG_DE),
-        (SIDE, 'AXIS'),
+        (SIDE, SIDE_AXIS),
     ])
 
     man2 = ManSubject(config, simulation)
     man2.position = (16, 8)
     man2.direction = 197
     man2.properties = OrderedDict([
-        (SELECTION_COLOR_RGB, URSS_COLOR),
-        (FLAG, FLAG_URSS),
-        (SIDE, 'ALLIES'),
+        (SELECTION_COLOR_RGB, USSR_COLOR),
+        (FLAG, FLAG_USSR),
+        (SIDE, SIDE_ALLIES),
     ])
 
     subjects.append(man1)
@@ -116,7 +118,7 @@ def test_state__ok__subjects(
 
     assert {
                'SELECTION_COLOR_RGB': (204, 0, 0),
-               'FLAG': 'FLAG_URSS',
+               'FLAG': 'FLAG_USSR',
                'SIDE': 'ALLIES',
            } == state.subjects[0].properties
     assert {
@@ -170,7 +172,7 @@ def test_state__ok__dump(
                 </item>
                 <item>
                     <key>FLAG</key>
-                    <value>FLAG_URSS</value>
+                    <value>FLAG_USSR</value>
                 </item>
                 <item>
                     <key>SIDE</key>