improve python prototypes

Author: malytomas

python/bot/bot.py

@@ -1,23 +1,33 @@
 import random
 from uwapi import *
 
+
 class Bot:
     is_configured: bool = False
-    work_step: int = 0 # save some cpu cycles by splitting work over multiple steps
+    work_step: int = 0  # save some cpu cycles by splitting work over multiple steps
 
     def __init__(self):
         uw_events.on_update(self.on_update)
 
     def attack_nearest_enemies(self):
-        own_units = [x for x in uw_world.entities().values() if x.own() and x.Unit is not None and x.proto().data.get("dps", 0) > 0]
+        own_units = [
+            x
+            for x in uw_world.entities().values()
+            if x.own() and x.Unit is not None and x.proto().data.get("dps", 0) > 0
+        ]
         if not own_units:
             return
-        enemy_units = [x for x in uw_world.entities().values() if x.enemy() and x.Unit is not None]
+        enemy_units = [
+            x for x in uw_world.entities().values() if x.enemy() and x.Unit is not None
+        ]
         if not enemy_units:
             return
         for own in own_units:
             if len(uw_commands.orders(own.id)) == 0:
-                enemy = min(enemy_units, key=lambda x: uw_map.distance_estimate(own.pos(), x.pos()))
+                enemy = min(
+                    enemy_units,
+                    key=lambda x: uw_map.distance_estimate(own.pos(), x.pos()),
+                )
                 uw_commands.order(own.id, uw_commands.fight_to_entity(enemy.id))
 
     def assign_random_recipes(self):
@@ -35,7 +45,7 @@ def configure(self):
         self.is_configured = True
 
         uw_game.set_player_name("bot-py")
-        uw_game.player_join_force(0) # create new force
+        uw_game.player_join_force(0)  # create new force
         uw_game.set_force_color(1, 0, 0)
         # todo choose race
 
@@ -48,7 +58,7 @@ def on_update(self, stepping: bool):
             return
 
         self.work_step += 1
-        match self.work_step % 10: # save some cpu cycles by splitting work over multiple steps
+        match self.work_step % 10:  # save some cpu cycles by splitting work over multiple steps
             case 1:
                 self.attack_nearest_enemies()
             case 5:

python/uwapi/entity.py

@@ -81,3 +81,6 @@ def unit_upgrades(self) -> UwUnitUpgrades:
             if self.type() == UwPrototypeTypeEnum.Unit
             else _make_empty_UwUnitUpgrades()
         )
+
+    def tagged(self, tag: int) -> bool:
+        return self.proto().tagged(tag)

python/uwapi/prototypes.py

@@ -11,6 +11,20 @@ class Prototype:
     type: UwPrototypeTypeEnum = UwPrototypeTypeEnum.Nothing
     name: str = ""
     data: Dict[str, Any] = field(default_factory=dict)
+    tags: List[int] = field(default_factory=list)
+    tagsNames: List[str] = field(default_factory=list)
+    json: str = ""
+
+    def tagged(self, tag: int) -> bool:
+        return tag in self.tags
+
+    def _load(self) -> None:
+        self.type = uw_interop.uwPrototypeType(self.id)
+        self.json = uw_interop.uwPrototypeJson(self.id)
+        self.data = json.loads(self.json)
+        self.name = self.data.get("name", "")
+        self.tags = self.data.get("tags", [])
+        self.tagsNames = self.data.get("tagsNames", [])
 
 
 class Prototypes:
@@ -33,15 +47,33 @@ def type(self, id: int) -> UwPrototypeTypeEnum:
             return p.type
         return UwPrototypeTypeEnum.Nothing
 
+    def name(self, id: int) -> str:
+        p = self._all.get(id, None)
+        return p.name if p is not None else ""
+
+    def json(self, id: int) -> str:
+        p = self._all.get(id, None)
+        return p.json if p is not None else ""
+
+    def definitions(self) -> Dict[str, Any]:
+        return self._definitions
+
+    def hashString(self, name: str) -> int:
+        return uw_interop.uwHashString(name)
+
+    def tagId(self, name: str) -> int:
+        try:
+            return self._definitions["tagsNames"].index(name)
+        except ValueError:
+            raise KeyError(f"tag name '{name}' not found")
+
     def _load(self) -> None:
         uw_interop.uwLog(UwSeverityEnum.Info, "loading prototypes")
-        self._all: Dict[int, Prototype] = {}
-        self._definitions: Dict[str, Any] = {}
+        self._all.clear()
+        self._definitions.clear()
         for id in uw_interop.uwAllPrototypes().ids:
             p = Prototype(id)
-            p.type = uw_interop.uwPrototypeType(id)
-            p.data = json.loads(uw_interop.uwPrototypeJson(id))
-            p.name = p.data["name"]
+            p._load()
             self._all[id] = p
         self._definitions = json.loads(uw_interop.uwDefinitionsJson())
         uw_interop.uwLog(UwSeverityEnum.Info, "prototypes loaded")

python/uwapi/world.py

@@ -114,9 +114,9 @@ def _update_policies(self) -> None:
             if not e.ForeignPolicy:
                 continue
             fp = e.ForeignPolicy
-            if fp.forces[0] == self._my_force_id:
+            if fp.forces[0] == self._my_player.forceEntityId:
                 self._policies[fp.forces[1]] = fp.policy
-            if fp.forces[1] == self._my_force_id:
+            if fp.forces[1] == self._my_player.forceEntityId:
                 self._policies[fp.forces[0]] = fp.policy
 
     def _update_overview(self, stepping: bool) -> None:
@@ -127,7 +127,7 @@ def _update_overview(self, stepping: bool) -> None:
 
     def _update(self, stepping: bool) -> None:
         tmp = uw_interop.uwMyPlayer()
-        self._my_force_id = tmp[1].forceEntityId if tmp[0] else 0
+        self._my_player = tmp[1] if tmp[0] else _make_empty_UwMyPlayer()
         self._my_force_statistics = uw_interop.uwMyForceStatistics()
         self._update_removed()
         self._update_fresh()