rwmap 3.1.4__tar.gz → 3.2.4__tar.gz

{rwmap-3.1.4/src/rwmap.egg-info → rwmap-3.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rwmap
-Version: 3.1.4
+Version: 3.2.4
 Summary: 一个精简的铁锈战争TMX地图操作工具
 Author: KEND
 License-Expression: GPL-3.0-or-later

{rwmap-3.1.4 → rwmap-3.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rwmap"
-version = "3.1.4"
+version = "3.2.4"
 description = "一个精简的铁锈战争TMX地图操作工具"
 readme = "README.md"
 authors = [

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/layers.py

@@ -36,8 +36,11 @@ class Layer:
         self.properties = properties or []
         self.data = data[:] if data is not None else [0] * (width * height)
 
-    def property(self, name: str) -> Property | None:
-        return next((prop for prop in self.properties if prop.name == name), None)
+    def property(self, name: str) -> Property:
+        try:
+            return next(prop for prop in self.properties if prop.name == name)
+        except StopIteration:
+            raise KeyError(f"Property '{name}' not found")
 
     def get_tile(self, key: Tuple[int, int]) -> int:
         x, y = key

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/maps.py

@@ -84,14 +84,23 @@ class Map:
         tree = ET.ElementTree(root)
         tree.write(out_path, encoding=encoding, xml_declaration=True)
 
-    def property(self, name: str) -> Property | None:
-        return next((prop for prop in self.properties if prop.name == name), None)
-
-    def layer(self, name: str) -> Layer | None:
-        return next((layer for layer in self.layers if layer.name == name), None)
-
-    def objectgroup(self, name: str) -> ObjectGroup | None:
-        return next((og for og in self.objectgroups if og.name == name), None)
+    def property(self, name: str) -> Property:
+        try:
+            return next(prop for prop in self.properties if prop.name == name)
+        except StopIteration:
+            raise KeyError(f"Property '{name}' not found")
+
+    def layer(self, name: str) -> Layer:
+        try:
+            return next((layer for layer in self.layers if layer.name == name))
+        except StopIteration:
+            raise KeyError(f"Layer '{name}' not found")
+
+    def objectgroup(self, name: str) -> ObjectGroup:
+        try:
+            return next((og for og in self.objectgroups if og.name == name))
+        except StopIteration:
+            raise KeyError(f"ObjectGroup '{name}' not found")
 
 
     def get_tileset_by_gid(self, gid: int) -> Optional[Tileset]:

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/objects.py

@@ -51,8 +51,11 @@ class Object:
         self.text = text
         self.properties = properties or []
 
-    def property(self, name: str) -> Property | None:
-        return next((prop for prop in self.properties if prop.name == name), None)
+    def property(self, name: str) -> Property:
+        try:
+            return next(prop for prop in self.properties if prop.name == name)
+        except StopIteration:
+            raise KeyError(f"Property '{name}' not found")
 
     def set(self, **kwargs: Any) -> 'Object':
         for k, v in kwargs.items():
@@ -176,8 +179,11 @@ class ObjectGroup:
         self.offsety = offsety
         self.properties = properties or []
 
-    def property(self, name: str) -> Property | None:
-        return next((prop for prop in self.properties if prop.name == name), None)
+    def property(self, name: str) -> Property:
+        try:
+            return next(prop for prop in self.properties if prop.name == name)
+        except StopIteration:
+            raise KeyError(f"Property '{name}' not found")
 
     def add(self, obj: Object) -> 'ObjectGroup':
         self.objects.append(obj)

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/rw/factories.py

@@ -105,13 +105,11 @@ def unit_add(
 
 def unit_remove(
     x: float, y: float, width: float, height: float,
-    team: int = 0,
     onlyIfEmpty: bool = False,
     name: Optional[str] = None,
     **kwargs
 ) -> Trigger:
     obj = Trigger(name=name or f"remove_{x}_{y}", type="unitRemove", x=x, y=y, width=width, height=height)
-    obj.set(team=team)
     if onlyIfEmpty:
         obj.set(onlyIfEmpty=True)
     for k, v in kwargs.items():

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/rw/rwmaps.py

@@ -11,12 +11,10 @@ class RwMap(Map):
     def __init__(self, path: Optional[str] = None) -> None:
         super().__init__(path=path)
 
-    # ---------- 触发器图层 ----------
     @property
     def triggers(self) -> List[Trigger]:
         og = self.objectgroup("Triggers")
         if og is None:
-            # 自动创建空的 Triggers 图层并添加到地图
             og = ObjectGroup(name="Triggers", objects=[])
             self.objectgroups.append(og)
         return cast(List[Trigger], og.objects)
@@ -59,19 +57,14 @@ class RwMap(Map):
         tile_size: int = 20,
         layer_names: Optional[List[str]] = None,
     ) -> "RwMap":
-        """创建一个空地图，包含指定的图层和默认的 Triggers 图层。"""
         if layer_names is None:
             layer_names = ["Ground", "Items", "Units", "Set"]
-
         m = cls()
         m.width = width
         m.height = height
         m.tilewidth = tile_size
         m.tileheight = tile_size
-
         for name in layer_names:
             m.layers.append(Layer(name=name, width=width, height=height))
-
         _ = m.triggers
-
         return m

{rwmap-3.1.4 → rwmap-3.2.4}/src/rwmap/tiles.py

@@ -26,8 +26,11 @@ class Tile:
         self.image_height = image_height
         self.image_trans = image_trans
 
-    def property(self, name: str) -> Property | None:
-        return next((prop for prop in self.properties if prop.name == name), None)
+    def property(self, name: str) -> Property:
+        try:
+            return next(prop for prop in self.properties if prop.name == name)
+        except StopIteration:
+            raise KeyError(f"Property '{name}' not found")
 
     @classmethod
     def from_xml(cls, elem: ET.Element) -> 'Tile':

{rwmap-3.1.4 → rwmap-3.2.4/src/rwmap.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rwmap
-Version: 3.1.4
+Version: 3.2.4
 Summary: 一个精简的铁锈战争TMX地图操作工具
 Author: KEND
 License-Expression: GPL-3.0-or-later