architecture of troop selection

opencombat/gui.py

@@ -0,0 +1,17 @@
+# coding: utf-8
+from logging import Logger
+from tkinter import Tk
+
+from synergine2.config import Config
+from synergine2.log import get_logger
+
+
+class Gui(object):
+    def __init__(
+        self,
+        config: Config,
+        master: Tk,
+    ) -> None:
+        self._config = config
+        self._logger = get_logger(self.__class__.__name__, config)
+        self._master = master

opencombat/strategy/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

opencombat/strategy/manager.py

@@ -0,0 +1,20 @@
+# coding: utf-8
+from synergine2.config import Config
+from synergine2.log import get_logger
+
+from opencombat.strategy.selection.troops import TroopClassBuilder
+
+
+class TroopManager(object):
+    def __init__(
+        self,
+        config: Config,
+        units_file_path: str,
+        teams_file_path: str,
+    ) -> None:
+        self._config = config
+        self._logger = get_logger('TroopManager', config)
+
+        builder = TroopClassBuilder(config)
+        self._unit_stash = builder.get_unit_stash(units_file_path)
+        self._team_stash = builder.get_team_stash(teams_file_path)

opencombat/strategy/selection/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

opencombat/strategy/selection/gui.py

@@ -0,0 +1,24 @@
+# coding: utf-8
+from tkinter import Tk
+from tkinter import Label
+from tkinter import W
+
+from synergine2.config import Config
+
+from opencombat.gui import Gui
+from opencombat.strategy.manager import TroopManager
+
+
+class SelectTroopsGui(Gui):
+    def __init__(
+        self,
+        config: Config,
+        master: Tk,
+        troop_manager: TroopManager,
+    ) -> None:
+        super().__init__(config, master)
+        self._master.title('Troops selection')
+        self.label = Label(master, text="Hello")
+
+        # Layout
+        self.label.grid(row=0, column=0, sticky=W)

opencombat/strategy/selection/troops.py

@@ -0,0 +1,32 @@
+# coding: utf-8
+from synergine2.config import Config
+from synergine2.log import get_logger
+
+from opencombat.strategy.unit.stash import UnitStash
+from opencombat.util import get_class_from_string_path
+
+
+class TroopClassBuilder(object):
+    def __init__(
+        self,
+        config: Config,
+    ) -> None:
+        self._logger = get_logger('TroopManagerBuilder', config)
+        self._config = config
+
+    def get_unit_stash(
+        self,
+        units_file_path: str,
+    ) -> UnitStash:
+        class_address = self._config.resolve(
+            'global.unit_stash',
+            'opencombat.strategy.unit.stash.UnitStash',
+        )
+        class_ = get_class_from_string_path(
+            self._config,
+            class_address,
+        )
+        return class_(
+            self._config,
+            units_file_path,
+        )

opencombat/strategy/team/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

opencombat/strategy/team/model.py

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+
+class UnitModel(object):
+    def __init__(
+        self,
+        name: str,
+    ) -> None:
+        self._name = name
+
+    @property
+    def name(self) -> str:
+        return self._name

opencombat/strategy/team/stash.py

@@ -0,0 +1,19 @@
+# coding: utf-8
+import typing
+
+from opencombat.strategy.unit.model import TeamModel
+
+
+class TeamStash(object):
+    def __init__(
+        self,
+        teams_file_path: str,
+    ) -> None:
+        # TODO Load xml, validate
+        self._teams = None  # typing.List[TeamModel]
+
+    def get_teams(self) -> typing.List[TeamModel]:
+        pass
+
+    def get_team(self, unit_id: str) -> TeamModel:
+        pass

opencombat/strategy/teams.xml

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

opencombat/strategy/unit/__init__.py

@@ -0,0 +1 @@
+# coding: utf-8

opencombat/strategy/unit/model.py

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+
+class TeamModel(object):
+    def __init__(
+        self,
+        name: str,
+    ) -> None:
+        self._name = name
+
+    @property
+    def name(self) -> str:
+        return self._name

opencombat/strategy/unit/stash.py

@@ -0,0 +1,19 @@
+# coding: utf-8
+import typing
+
+from opencombat.strategy.team.model import UnitModel
+
+
+class UnitStash(object):
+    def __init__(
+        self,
+        units_file_path: str,
+    ) -> None:
+        # TODO Load xml, validate
+        self._units = None  # typing.List[UnitModel]
+
+    def get_units(self) -> typing.List[UnitModel]:
+        pass
+
+    def get_unit(self, unit_id: str) -> UnitModel:
+        pass

opencombat/strategy/units.xml

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

run.py

@@ -71,7 +71,9 @@ def main(
     core.run()
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description='Run TileStrategy')
+    parser = argparse.ArgumentParser(
+        description='Run a map'
+    )
     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)

select_troops.py

@@ -0,0 +1,61 @@
+# coding: utf-8
+import argparse
+import typing
+from tkinter import Tk
+
+from synergine2.config import Config
+
+from opencombat.strategy.manager import TroopManager
+from opencombat.strategy.selection.gui import SelectTroopsGui
+
+
+def main(
+    units_file_path: str,
+    teams_file_path: str,
+    countries: typing.List[str],
+) -> None:
+    config = Config()
+    config.load_yaml('config.yaml')
+
+    troop_manager = TroopManager(
+        config,
+        units_file_path=units_file_path,
+        teams_file_path=teams_file_path,
+    )
+
+    master = Tk()
+    gui = SelectTroopsGui(
+        config,
+        master=master,
+        troop_manager=troop_manager,
+    )
+    master.mainloop()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        description='Display troops selection gui',
+    )
+    parser.add_argument(
+        '--units',
+        dest='units_file_path',
+        default='opencombat/strategy/units.xml',
+    )
+    parser.add_argument(
+        '--teams',
+        dest='teams_file_path',
+        default='opencombat/strategy/teams.xml',
+    )
+    parser.add_argument(
+        '--country',
+        action='append',
+        dest='countries',
+        default=['URSS', 'DE'],
+    )
+    args = parser.parse_args()
+
+    main(
+        units_file_path=args.units_file_path,
+        teams_file_path=args.teams_file_path,
+        countries=args.countries,
+    )