placement with troops

config.yaml

@@ -31,6 +31,8 @@ global:
     units_schema: "opencombat/strategy/units.xsd"
     troop_dumper: "opencombat.strategy.troops.TroopDumper"
     troop_schema: "opencombat/strategy/troops.xsd"
+    units: "opencombat/strategy/units.xml"
+    teams: "opencombat/strategy/teams.xml"
     cache_dir_path: 'cache'
     include_path:
       maps:

opencombat/strategy/troops.py

@@ -8,6 +8,7 @@ from synergine2.config import Config
 from synergine2.log import get_logger
 
 from opencombat.simulation.base import TileStrategySimulation
+from opencombat.simulation.subject import TileSubject
 from opencombat.strategy.team.model import TeamModel
 from opencombat.strategy.team.stash import TeamStash
 from opencombat.strategy.unit.stash import UnitStash
@@ -15,6 +16,56 @@ from opencombat.util import get_class_from_string_path, pretty_xml
 from opencombat.xml import XmlValidator
 
 
+class Troop(object):
+    def __init__(
+        self,
+        config: Config,
+        state_root: Element,
+        simulation: TileStrategySimulation,
+    ) -> None:
+        self._config = config
+        self._state_root = state_root
+        self._subjects = None  # type: typing.List[TileSubject]
+        self._simulation = simulation
+        self._builder = TroopClassBuilder(config)
+
+    @property
+    def subjects(self) -> typing.List[TileSubject]:
+        if self._subjects is None:
+            self._subjects = self.get_computed_subjects()
+
+        return self._subjects
+
+    def get_computed_subjects(self) -> typing.List[TileSubject]:
+        units_file_path = self._config.get(
+            'global.units',
+            'opencombat/strategy/units.xml',
+        )
+        teams_file_path = self._config.get(
+            'global.teams',
+            'opencombat/strategy/teams.xml',
+        )
+
+        team_stash = self._builder.get_team_stash(
+            units_file_path,
+            teams_file_path,
+        )
+
+        # Parse team, build Subjects
+        subjects = []  # type: typing.List[TileSubject]
+        for troop in self._state_root.findall('troop'):
+            country = troop.attrib['country']
+            team_id = troop.attrib['team_id']
+            team = team_stash.get_team(team_id, country)
+
+            for unit in team.units:
+                subject = unit.class_(self._config, self._simulation)
+                subjects.append(subject)
+
+        # TODO BS 2018-06-25: place subjects on map, set side, color, etc
+        return subjects
+
+
 class TroopDumper(object):
     def __init__(
         self,
@@ -126,7 +177,7 @@ class TroopLoader(object):
 
         schema_file_path = self._config.get(
             'global.troop_schema',
-            'opencombat/strategy/troop.xsd',
+            'opencombat/strategy/troops.xsd',
         )
         self._xml_validator = XmlValidator(
             config,

opencombat/strategy/troops.xsd

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+    <xs:element name="troops" type="troopstype"/>
+
+    <xs:complexType name="troopstype">
+        <xs:sequence>
+            <xs:element name="troop" type="trooptype" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="trooptype">
+        <xs:attribute name="country" type="xs:string" use="required"/>
+        <xs:attribute name="team_id" type="xs:string" use="required"/>
+    </xs:complexType>
+
+</xs:schema>

run.py

@@ -14,6 +14,7 @@ from synergine2.terminals import TerminalManager
 from opencombat.simulation.base import TileStrategySimulation
 from opencombat.simulation.base import TileStrategySubjects
 from opencombat.state import StateConstructorBuilder
+from opencombat.strategy.troops import TroopConstructorBuilder
 from opencombat.terminal.base import CocosTerminal
 
 
@@ -57,7 +58,7 @@ def main(
     elif troops_file_path:
         troop_loader_builder = TroopConstructorBuilder(config, simulation)
         troop_loader = troop_loader_builder.get_troop_loader()
-        troops = troop_loader.get_troops(troops_file_path)
+        troops = troop_loader.get_troop(troops_file_path)
         subjects.extend(troops.subjects)
 
     simulation.subjects = subjects