tilemap-editor 4.1.0__tar.gz → 4.3.0__tar.gz

{tilemap_editor-4.1.0/src/tilemap_editor.egg-info → tilemap_editor-4.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 4.1.0
+Version: 4.3.0
 Summary: Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools
 Author: tilemap editor contributors
 License: Proprietary

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tilemap-editor"
-version = "4.1.0"
+version = "4.3.0"
 description = "Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools"
 readme = "README.md"
 requires-python = ">=3.10"

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/editor.py

@@ -40,6 +40,7 @@ from widgets.ui.particle_config_dialog import ParticleConfigDialog
 from widgets.ui.property_editor import PropertyEditor
 from widgets.ui.sidebar_container import SidebarContainer, ToolbarAction
 from widgets.ui.theme import COLORS, THEMES, get_theme_manager, set_theme
+from widgets.ui.tool_manager import ToolKind, ToolManager
 from widgets.ui.tileset_type_dialog import TilesetTypeDialog
 from widgets.ui.toolbar import Toolbar
 from widgets.ui.tooltip import TooltipManager
@@ -138,27 +139,31 @@ _launch_standalone_module = launch_standalone
 
 
 class Editor:
-    def __init__(self, size: Optional[Tuple[int, int]] = None, fps=60):
+    def __init__(
+        self,
+        size: Optional[Tuple[int, int]] = None,
+        fps=60,
+        theme: Optional[str] = None,
+    ):
         self.base_path, self.data_root, self.config = _load_project_config()
         logger.info(f"Project base_path: {self.base_path}")
         logger.info(f"Data root: {self.data_root}")
 
-        theme_name = self.config.get("theme", "dark")
-        if theme_name in THEMES:
-            set_theme(theme_name)
-            logger.info(f"Applied theme: {theme_name}")
+        theme_name = theme or self.config.get("theme", "dark")
+        tm = get_theme_manager()
+        if not tm.set_theme(theme_name):
+            logger.warning(f"Theme '{theme_name}' not found, falling back to dark")
+            tm.set_theme("dark")
 
         pygame.init()
         pygame.display.set_caption("Pure Pygame Editor")
 
         self.fps = fps
         self.running = False
-        self.pan_mode = False
         self.autotile_mode = False
-        self.eraser_mode = False
-        self.select_mode = False
         self.node_editing_mode = False
         self.show_nodes = False
+        self.tool_manager = ToolManager()
         self._prev_tool = None
 
         if isinstance(size, tuple) and len(size) == 2:
@@ -712,6 +717,8 @@ class Editor:
         next_idx = (current_idx + 1) % len(theme_names)
         new_theme = theme_names[next_idx]
         set_theme(new_theme)
+        from utils.icon_manager import icon_manager
+        icon_manager.clear_cache()
         self.notifications.notify(f"Theme: {new_theme}")
 
         settings_file = Path.cwd() / "settings.json"
@@ -1199,9 +1206,7 @@ class Editor:
                     self.node_editing_mode = not self.node_editing_mode
                     if self.node_editing_mode:
                         self.show_nodes = False
-                        self.pan_mode = False
-                        self.select_mode = False
-                        self.eraser_mode = False
+                        self.tool_manager.deactivate()
                     continue
                 elif event.key == pygame.K_n and (ctrl_held or meta_held):
                     self.open_map_setup()
@@ -1210,27 +1215,22 @@ class Editor:
                     self.perform_load()
                     continue
                 elif event.key == pygame.K_SPACE and (ctrl_held or meta_held):
-                    if self.pan_mode:
-                        self.pan_mode = False
-                        if getattr(self, "_prev_tool", None) == "select":
-                            self.select_mode = True
-                        elif getattr(self, "_prev_tool", None) == "eraser":
-                            self.eraser_mode = True
-                        elif getattr(self, "_prev_tool", None) == "nodes":
+                    if self.tool_manager.is_active(ToolKind.PAN):
+                        restored = self.tool_manager.restore_previous()
+                        if restored is None and self._prev_tool == "nodes":
                             self.node_editing_mode = True
+                            self._prev_tool = None
                     else:
-                        if self.select_mode:
+                        if self.tool_manager.is_active(ToolKind.SELECT):
                             self._prev_tool = "select"
-                        elif self.eraser_mode:
+                        elif self.tool_manager.is_active(ToolKind.ERASER):
                             self._prev_tool = "eraser"
                         elif self.node_editing_mode:
                             self._prev_tool = "nodes"
                         else:
                             self._prev_tool = None
-                        self.pan_mode = True
-                        self.select_mode = False
-                        self.eraser_mode = False
                         self.node_editing_mode = False
+                        self.tool_manager.activate(ToolKind.PAN)
                     continue
                 elif event.key == pygame.K_g and (ctrl_held or meta_held):
                     self.toggle_grid()

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/layers.py

@@ -4,8 +4,9 @@ Supports multiple layers with independent tile and object data.
 """
 
 import random
-from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, Any
-from ttypes.tilemap import TypeTile, TypeObject
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Tuple
+
+from ttypes.tilemap import TypeObject, TypeTile
 
 if TYPE_CHECKING:
     from widgets.autotiler import AutotileRule
@@ -78,11 +79,16 @@ class Layer:
         existing_positions = [p for p in positions if p in self.tiles]
         return self._autotile_tiles(rules, existing_positions)
 
-    def _autotile_tiles(
-        self, rules: List["AutotileRule"], positions: List[Tuple[int, int]]
-    ) -> int:
+    def _autotile_tiles(self, rules: List["AutotileRule"], positions: List[Tuple[int, int]]) -> int:
         """
         Internal helper to update specific tiles according to autotile rules.
+
+        Group membership is determined by:
+        1. The tile's ``autotile_group`` field (if present)
+        2. Legacy fallback: (tileset_index, variant_id) lookup in variant_to_group
+
+        When a rule matches, the tile's variant is re-rolled from the rule's
+        variant_ids (removing the early-out that prevented re-autotile).
         """
         if self.locked or self.layer_type != "tile":
             return 0
@@ -90,17 +96,12 @@ class Layer:
         if not rules or not positions:
             return 0
 
-        rules_hash = hash(
-            tuple(
-                (r.group_id, r.tileset_index, tuple(sorted(r.variant_ids)))
-                for r in rules
-            )
-        )
+        rules_hash = hash(tuple((r.group_id, r.tileset_index, tuple(sorted(r.variant_ids))) for r in rules))
 
         if self._autotile_cache["rules_hash"] != rules_hash:
-            variant_to_group = {}
+            variant_to_group: Dict[Tuple[int, int], str] = {}
             rules_by_group: Dict[str, List["AutotileRule"]] = {}
-            significant_offsets = set()
+            significant_offsets: Set[Tuple[int, int]] = set()
 
             for rule in rules:
                 gid = rule.group_id
@@ -132,6 +133,13 @@ class Layer:
 
         changes_count = 0
 
+        def _get_group(t: dict) -> Optional[str]:
+            """Get group_id for a tile: autotile_group field > legacy variant lookup."""
+            ag = t.get("autotile_group")
+            if ag is not None:
+                return ag
+            return variant_to_group.get((t["ttype"], t["variant"]))
+
         for pos in positions:
             if pos not in self.tiles:
                 continue
@@ -140,10 +148,14 @@ class Layer:
             ttype = tile["ttype"]
             current_variant = tile["variant"]
 
-            target_group_id = variant_to_group.get((ttype, current_variant))
+            target_group_id = _get_group(tile)
             if not target_group_id:
                 continue
 
+            group_rules = rules_by_group.get(target_group_id)
+            if not group_rules:
+                continue
+
             actual_neighbors = []
             for dx, dy in [
                 (-1, -1),
@@ -158,33 +170,34 @@ class Layer:
                 npos = (pos[0] + dx, pos[1] + dy)
                 if npos in self.tiles:
                     n_tile = self.tiles[npos]
-                    n_group = variant_to_group.get((n_tile["ttype"], n_tile["variant"]))
-
+                    n_group = _get_group(n_tile)
                     if n_group == target_group_id:
                         actual_neighbors.append((dx, dy))
 
-            neighbor_offsets_set = {
-                n for n in actual_neighbors if n in significant_offsets
-            }
+            neighbor_offsets_set = {n for n in actual_neighbors if n in significant_offsets}
 
             matched_rule: Optional["AutotileRule"] = None
-            group_rules = rules_by_group.get(target_group_id, [])
-
+            new_variant: Optional[int] = None
             for rule in group_rules:
-                if (
-                    rule.neighbors == neighbor_offsets_set
-                    and rule.tileset_index == ttype
-                ):
+                if rule.neighbors == neighbor_offsets_set and rule.tileset_index == ttype:
                     matched_rule = rule
                     break
 
             if matched_rule and matched_rule.variant_ids:
-                if current_variant in matched_rule.variant_ids:
-                    continue
+                # only reroll if current variant isnt already
+                # in the matched rule's set to prevents re-randomization
+                # of neighbors whose pattern hasnt actually changed.
+                if current_variant not in matched_rule.variant_ids:
+                    new_variant = random.choice(matched_rule.variant_ids)
+                else:
+                    new_variant = current_variant
+
+                if new_variant != current_variant:
+                    tile["variant"] = new_variant
+                    changes_count += 1
 
-                new_variant = random.choice(matched_rule.variant_ids)
-                tile["variant"] = new_variant
-                changes_count += 1
+                if "autotile_group" not in tile:
+                    tile["autotile_group"] = matched_rule.group_id
 
         return changes_count
 
@@ -221,12 +234,7 @@ class Layer:
         while queue:
             curr = queue.pop(0)
 
-            if (
-                curr[0] < 0
-                or curr[0] >= map_size[0]
-                or curr[1] < 0
-                or curr[1] >= map_size[1]
-            ):
+            if curr[0] < 0 or curr[0] >= map_size[0] or curr[1] < 0 or curr[1] >= map_size[1]:
                 continue
 
             curr_tile = self.tiles.get(curr)
@@ -459,9 +467,7 @@ class LayerManager:
         if not manager.layers:
             manager.create_layer("Default")
 
-        if manager.active_layer_idx < 0 or manager.active_layer_idx >= len(
-            manager.layers
-        ):
+        if manager.active_layer_idx < 0 or manager.active_layer_idx >= len(manager.layers):
             manager.active_layer_idx = 0
 
         return manager

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap.py

@@ -1,7 +1,7 @@
 from json import dump as JSONDump
 from json import load as JSONLoad
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple, Union
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple, Union
 
 from pygame import Rect
 
@@ -271,11 +271,22 @@ class Tilemap:
             },
         }
 
+        ttype_to_firstgid: List[int] = []
         if hasattr(self.editor, "tileset_widget") and self.editor.tileset_widget:
+            firstgid = 0
+            tile_w, tile_h = self.tile_size
             for ts in self.editor.tileset_widget.tilesets:
                 path_str = to_project_path(ts.path, map_dir)
 
-                ts_data: Dict[str, Any] = {"path": path_str, "type": ts.tileset_type}
+                ts_surf = ts.surface
+                tile_count = (ts_surf.get_width() // tile_w) * (ts_surf.get_height() // tile_h)
+
+                ttype_to_firstgid.append(firstgid)
+
+                ts_data: Dict[str, Any] = {
+                    "path": path_str, "type": ts.tileset_type,
+                    "tile_count": tile_count, "firstgid": firstgid,
+                }
                 if ts.properties:
                     ts_data["properties"] = ts.properties
                 if ts.tile_properties:
@@ -284,6 +295,7 @@ class Tilemap:
                     ts_data["animation"] = ts.animation
 
                 save_data["resources"]["tilesets"].append(ts_data)
+                firstgid += tile_count
 
         if hasattr(self.editor, "autotiler") and self.editor.autotiler:
             if "groups" not in save_data["project_state"]:
@@ -324,11 +336,17 @@ class Tilemap:
 
             for loc, tile in layer.tiles.items():
                 key = serialize_point(loc)
+                ttype = tile["ttype"]
+                variant = tile["variant"]
                 tile_data: Dict[str, Any] = {
                     "pos": serialize_point(tile["pos"]),
-                    "ttype": tile["ttype"],
-                    "variant": tile["variant"],
+                    "ttype": ttype,
+                    "variant": variant,
                 }
+                if "autotile_group" in tile:
+                    tile_data["autotile_group"] = tile["autotile_group"]
+                if ttype_to_firstgid:
+                    tile_data["gid"] = ttype_to_firstgid[ttype] + variant
                 if "properties" in tile:
                     tile_data["properties"] = tile["properties"]
                 layer_data["tiles"][key] = tile_data
@@ -355,11 +373,17 @@ class Tilemap:
         if first_layer:
             for loc, tile in first_layer.tiles.items():
                 key = serialize_point(loc)
+                ttype = tile["ttype"]
+                variant = tile["variant"]
                 tile_data: Dict[str, Any] = {
                     "pos": serialize_point(tile["pos"]),
-                    "ttype": tile["ttype"],
-                    "variant": tile["variant"],
+                    "ttype": ttype,
+                    "variant": variant,
                 }
+                if "autotile_group" in tile:
+                    tile_data["autotile_group"] = tile["autotile_group"]
+                if ttype_to_firstgid:
+                    tile_data["gid"] = ttype_to_firstgid[ttype] + variant
                 save_data["data"]["ongrid"][key] = tile_data
 
         with open(target_path, "w") as f:
@@ -659,6 +683,8 @@ class Tilemap:
             tile_copy["pos"] = pos
             if "properties" in tile_data:
                 tile_copy["properties"] = tile_data["properties"]
+            if "autotile_group" in tile_data:
+                tile_copy["autotile_group"] = tile_data["autotile_group"]
             self._normalize_ttype(tile_copy)
             layer.tiles[pos] = tile_copy
 

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/ToolMove.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#e0e0e0"><circle cx="8" cy="8" r="2"/><path d="M8 1a1 1 0 0 0-.691.291l-2 2 1.414 1.414 1.293-1.293 1.293 1.293 1.414-1.414-2-2A1 1 0 0 0 8 1zM3.309 5.291l-2 2a1 1 0 0 0 0 1.414l2 2 1.414-1.414L3.43 7.998l1.293-1.293-1.414-1.414zm9.414 0-1.414 1.414 1.293 1.293-1.293 1.293 1.414 1.414 2-2a1 1 0 0 0 0-1.414l-2-2zm-6 6-1.414 1.414 2 2a1 1 0 0 0 1.414 0l2-2-1.414-1.414-1.293 1.293-1.293-1.293z"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><g fill="#ffffff"><circle cx="8" cy="8" r="2"/><path d="M8 1a1 1 0 0 0-.691.291l-2 2 1.414 1.414 1.293-1.293 1.293 1.293 1.414-1.414-2-2A1 1 0 0 0 8 1zM3.309 5.291l-2 2a1 1 0 0 0 0 1.414l2 2 1.414-1.414L3.43 7.998l1.293-1.293-1.414-1.414zm9.414 0-1.414 1.414 1.293 1.293-1.293 1.293 1.414 1.414 2-2a1 1 0 0 0 0-1.414l-2-2zm-6 6-1.414 1.414 2 2a1 1 0 0 0 1.414 0l2-2-1.414-1.414-1.293 1.293-1.293-1.293z"/></g></svg>

tilemap_editor-4.3.0/src/tilemap_editor/assets/icons/checked.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#ffffff" rx="2.33"/><path fill="#ffffff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/duplicate.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m5 1v11h9v-6h-5v-5zm5 0v4h4zm-8 3v11h2 8v-2h-8v-9z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="m5 1v11h9v-6h-5v-5zm5 0v4h4zm-8 3v11h2 8v-2h-8v-9z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/error.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4" fill="#ff5f5f"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="4" fill="#ffffff"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/file.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1v14h12v-9h-5v-5zm8 0v4h4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="m2 1v14h12v-9h-5v-5zm8 0v4h4z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/filedead.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ff5f5f" d="M2 1v14h12V6H9V1zm8 0v4h4zM5 7.793l.646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.707.707L5 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .707-.707zm6 0 .646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.706.707L11 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .706-.707zM3.5 11h9a.5.5 0 0 1 0 1H8a2 2 0 0 1-4 0h-.5a.5.5 0 0 1 0-1zM5 12a1 1 0 0 0 2 0z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M2 1v14h12V6H9V1zm8 0v4h4zM5 7.793l.646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.707.707L5 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .707-.707zm6 0 .646-.646a.353.353 0 0 1 .707.707l-.646.646.646.646a.353.353 0 0 1-.706.707L11 9.207l-.646.646a.353.353 0 0 1-.707-.706l.646-.647-.646-.646a.353.353 0 0 1 .706-.707zM3.5 11h9a.5.5 0 0 1 0 1H8a2 2 0 0 1-4 0h-.5a.5.5 0 0 1 0-1zM5 12a1 1 0 0 0 2 0z"/></svg>

tilemap_editor-4.3.0/src/tilemap_editor/assets/icons/fit.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="8" fill-opacity=".4"/><path fill="#ffffff" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zm0 3.166A1 1 0 0 1 9.526 5v7h-2V6.87l-1.445.962-1-1.6z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/folder.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M2 2a1 1 0 0 0-1 1v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-4a1 1 0 0 1-1-1V3a1 1 0 0 0-1-1z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/grid.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8eef97" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2zm0 2h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zM3 7h2v2H3zm4 0h2v2H7zm4 0h2v2h-2zm-8 4h2v2H3zm4 0h2v2H7zm4 0h2v2h-2z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/image.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m2 1a1 1 0 0 0 -1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-12a1 1 0 0 0 -1-1zm1 2h10v8h-10zm6 2-1.5 2.5-.70117 1.168-.099609-.16797-.89844-1.5-.90039 1.5-.90039 1.5h1.8008.19922 1.5996 1.4004 3l-1.5-2.5-1.5-2.5z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="m2 1a1 1 0 0 0 -1 1v12a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-12a1 1 0 0 0 -1-1zm1 2h10v8h-10zm6 2-1.5 2.5-.70117 1.168-.099609-.16797-.89844-1.5-.90039 1.5-.90039 1.5h1.8008.19922 1.5996 1.4004 3l-1.5-2.5-1.5-2.5z"/></svg>

tilemap_editor-4.3.0/src/tilemap_editor/assets/icons/info.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 4h2v2H7zm0 3h2v5H7z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/load.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M3 2a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h9c1.105 0 1.818-.91 2-2l1-6a1 1 0 0 0-1-1H6c-.552 0-.909.455-1 1l-1 6c-.091.545-.448 1-1 1a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h2a1 1 0 0 1 1 1 1 1 0 0 0 1 1h5a1 1 0 0 0-1-1H7a2 2 0 0 0-2-2H3z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/loop.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M8 1v2H6a5 5 0 0 0-4 8l1.414-1.414A3 3 0 0 1 6 5h2v2l4-3-4-3zm6 4-1.414 1.414A3 3 0 0 1 10 11H8V9l-4 3 4 3v-2h2a5 5 0 0 0 4-8z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M8 1v2H6a5 5 0 0 0-4 8l1.414-1.414A3 3 0 0 1 6 5h2v2l4-3-4-3zm6 4-1.414 1.414A3 3 0 0 1 10 11H8V9l-4 3 4 3v-2h2a5 5 0 0 0 4-8z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/pan.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M11 2a1 1 0 0 0-2 0v6H8V3a1 1 0 0 0-2 0v8.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2V4a1 1 0 0 0-2 0v4h-1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M11 2a1 1 0 0 0-2 0v6H8V3a1 1 0 0 0-2 0v8.05l-2.5-1.8A1 1 0 0 0 1.875 11L6 15h6a2 2 0 0 0 2-2V4a1 1 0 0 0-2 0v4h-1z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/pause.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm6 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M4 3a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1zm6 0a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h2a1 1 0 0 0 1-1V4a1 1 0 0 0-1-1z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/pencil.svg

@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="m3.99 16.854-1.314 3.504a.75.75 0 0 0 .966.965l3.503-1.314a3 3 0 0 0 1.068-.687L18.36 9.175s-.354-1.061-1.414-2.122c-1.06-1.06-2.122-1.414-2.122-1.414L4.677 15.786a3 3 0 0 0-.687 1.068zm12.249-12.63 1.383-1.383c.248-.248.579-.406.925-.348.487.08 1.232.322 1.934 1.025.703.703.945 1.447 1.025 1.934.058.346-.1.677-.348.925L19.774 7.76s-.353-1.06-1.414-2.12c-1.06-1.062-2.121-1.415-2.121-1.415z" fill="#000000"/></svg>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="m3.99 16.854-1.314 3.504a.75.75 0 0 0 .966.965l3.503-1.314a3 3 0 0 0 1.068-.687L18.36 9.175s-.354-1.061-1.414-2.122c-1.06-1.06-2.122-1.414-2.122-1.414L4.677 15.786a3 3 0 0 0-.687 1.068zm12.249-12.63 1.383-1.383c.248-.248.579-.406.925-.348.487.08 1.232.322 1.934 1.025.703.703.945 1.447 1.025 1.934.058.346-.1.677-.348.925L19.774 7.76s-.353-1.06-1.414-2.12c-1.06-1.062-2.121-1.415-2.121-1.415z" fill="#ffffff"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/play.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M4 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 4 4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M4 12a1 1 0 0 0 1.555.832l6-4a1 1 0 0 0 0-1.664l-6-4A1 1 0 0 0 4 4z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/plus.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z"/></svg>

tilemap_editor-4.3.0/src/tilemap_editor/assets/icons/radio.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><circle cx="8" cy="8" r="7" fill="#ffffff"/><circle cx="8" cy="8" r="4" fill="#ffffff"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/reset.svg

@@ -1,2 +1,2 @@
 <?xml version="1.0" ?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 512 512" data-name="Layer 1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"><path d="M64,256H34A222,222,0,0,1,430,118.15V85h30V190H355V160h67.27A192.21,192.21,0,0,0,256,64C150.13,64,64,150.13,64,256Zm384,0c0,105.87-86.13,192-192,192A192.21,192.21,0,0,1,89.73,352H157V322H52V427H82V393.85A222,222,0,0,0,478,256Z"/></svg>
+<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 512 512" data-name="Layer 1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"><path d="M64,256H34A222,222,0,0,1,430,118.15V85h30V190H355V160h67.27A192.21,192.21,0,0,0,256,64C150.13,64,64,150.13,64,256Zm384,0c0,105.87-86.13,192-192,192A192.21,192.21,0,0,1,89.73,352H157V322H52V427H82V393.85A222,222,0,0,0,478,256Z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/save.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M3 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2V4l-3-3h-1v6H3zm1 0v5h3V1zm4 8a1 1 0 0 1 0 4 1 1 0 0 1 0-4z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/stop.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="10" height="10" x="3" y="3" fill="#e0e0e0" rx="1"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="10" height="10" x="3" y="3" fill="#ffffff" rx="1"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/tilemap.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#8da5f3" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zM1 10v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zM1 13v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zm3 0v2h2V7zM1 10v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zM1 13v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2zm3 0v2h2v-2z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/tileset.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#e0e0e0" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm5 1v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8zm-8 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M1 1v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zm3 0v2h2V1zM1 4v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zm3 0v2h2V4zM1 7v2h2V7zm3 0v2h2V7zm5 1v7h5a1 1 0 0 0 1-1V9a1 1 0 0 0-1-1v4l-1-1-1 1V8zm-8 2v2h2v-2zm3 0v2h2v-2zm-3 3v2h2v-2zm3 0v2h2v-2z"/></svg>

tilemap_editor-4.3.0/src/tilemap_editor/assets/icons/unchecked.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><rect width="14" height="14" x="1" y="1" fill="#ffffff" rx="2.33"/><path fill="#ffffff" d="M11.5 3.734 5.89 9.346 4.185 7.665l-1.5 1.499 3.204 3.18L13 5.235z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/warning.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffdd65" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 3h2v7H7zm0 8h2v2H7z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><path fill="#ffffff" d="M8 1a7 7 0 0 0 0 14A7 7 0 0 0 8 1zM7 3h2v7H7zm0 8h2v2H7z"/></svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/zoomin.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<title>zoomin</title>
-<path d="M16.906 20.188l5.5 5.5-2.25 2.281-5.75-5.781c-1.406 0.781-3.031 1.219-4.719 1.219-5.344 0-9.688-4.344-9.688-9.688s4.344-9.688 9.688-9.688 9.719 4.344 9.719 9.688c0 2.5-0.969 4.781-2.5 6.469zM2.688 13.719c0 3.875 3.125 6.969 7 6.969 3.844 0 7-3.094 7-6.969s-3.156-6.969-7-6.969c-3.875 0-7 3.094-7 6.969zM10.813 12.625h3.875v2.219h-3.875v3.844h-2.219v-3.844h-3.844v-2.219h3.844v-3.875h2.219v3.875z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<title>zoomin</title>
+<path d="M16.906 20.188l5.5 5.5-2.25 2.281-5.75-5.781c-1.406 0.781-3.031 1.219-4.719 1.219-5.344 0-9.688-4.344-9.688-9.688s4.344-9.688 9.688-9.688 9.719 4.344 9.719 9.688c0 2.5-0.969 4.781-2.5 6.469zM2.688 13.719c0 3.875 3.125 6.969 7 6.969 3.844 0 7-3.094 7-6.969s-3.156-6.969-7-6.969c-3.875 0-7 3.094-7 6.969zM10.813 12.625h3.875v2.219h-3.875v3.844h-2.219v-3.844h-3.844v-2.219h3.844v-3.875h2.219v3.875z"></path>
 </svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/assets/icons/zoomout.svg

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<title>zoomout</title>
-<path d="M16.906 20.188l5.5 5.5-2.25 2.281-5.75-5.781c-1.406 0.781-3.031 1.219-4.719 1.219-5.344 0-9.688-4.344-9.688-9.688s4.344-9.688 9.688-9.688 9.719 4.344 9.719 9.688c0 2.5-0.969 4.781-2.5 6.469zM2.688 13.719c0 3.875 3.125 6.969 7 6.969 3.844 0 7-3.094 7-6.969s-3.156-6.969-7-6.969c-3.875 0-7 3.094-7 6.969zM4.438 12.625h10.531v2.219h-10.531v-2.219z"></path>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#ffffff" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<title>zoomout</title>
+<path d="M16.906 20.188l5.5 5.5-2.25 2.281-5.75-5.781c-1.406 0.781-3.031 1.219-4.719 1.219-5.344 0-9.688-4.344-9.688-9.688s4.344-9.688 9.688-9.688 9.719 4.344 9.719 9.688c0 2.5-0.969 4.781-2.5 6.469zM2.688 13.719c0 3.875 3.125 6.969 7 6.969 3.844 0 7-3.094 7-6.969s-3.156-6.969-7-6.969c-3.875 0-7 3.094-7 6.969zM4.438 12.625h10.531v2.219h-10.531v-2.219z"></path>
 </svg>

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor/cli.py

@@ -43,6 +43,11 @@ def main() -> None:
         "--size", default="1500x900", help="Window size as WIDTHxHEIGHT"
     )
     run_parser.add_argument("--fps", type=int, default=60, help="Editor FPS")
+    run_parser.add_argument(
+        "--theme",
+        default=None,
+        help='Theme name or path to .json theme file (e.g. "molokai", "path/to/custom.json")',
+    )
 
     args = parser.parse_args()
 
@@ -74,7 +79,7 @@ def _run_editor(args) -> None:
     try:
         with error_context("cli_main"):
             size = _parse_size(args.size)
-            editor = Editor(size=size, fps=max(1, args.fps))
+            editor = Editor(size=size, fps=max(1, args.fps), theme=args.theme)
             editor.run()
     except KeyboardInterrupt:
         print("\nEditor interrupted by user")

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0/src/tilemap_editor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tilemap-editor
-Version: 4.1.0
+Version: 4.3.0
 Summary: Pygame tilemap editor with SVG icons, professional UI, and sprite animation tools
 Author: tilemap editor contributors
 License: Proprietary

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/tilemap_editor.egg-info/SOURCES.txt

@@ -179,6 +179,7 @@ src/widgets/ui/collision_layer_mask.py
 src/widgets/ui/collision_layer_sidebar.py
 src/widgets/ui/confirm_dialog.py
 src/widgets/ui/dialog_base.py
+src/widgets/ui/drag_tracker.py
 src/widgets/ui/draw_utils.py
 src/widgets/ui/fileinput.py
 src/widgets/ui/label.py
@@ -196,12 +197,16 @@ src/widgets/ui/sidebar_container.py
 src/widgets/ui/status_bar.py
 src/widgets/ui/theme.py
 src/widgets/ui/tileset_type_dialog.py
+src/widgets/ui/tool_manager.py
 src/widgets/ui/toolbar.py
 src/widgets/ui/tooltip.py
 tests/test_animation_library_grid_offset.py
 tests/test_collision_layer_mask.py
 tests/test_collision_layer_sidebar.py
+tests/test_drag_tracker.py
 tests/test_editor_pan_mode.py
+tests/test_gid_collision.py
+tests/test_layers_autotile.py
 tests/test_project_paths.py
 tests/test_render_scale.py
 tests/test_serialization_regression.py

{tilemap_editor-4.1.0 → tilemap_editor-4.3.0}/src/ttypes/tilemap.py

@@ -5,6 +5,8 @@ class TypeTile(TypedDict, total=True):
     pos: Tuple[int, int]
     ttype: int
     variant: int
+    autotile_group: NotRequired[str]
+    gid: NotRequired[int]
     properties: NotRequired[Dict[str, Any]]
 
 
@@ -35,6 +37,8 @@ class TypeTileSerealized(TypedDict, total=True):
     pos: str
     ttype: str
     variant: int
+    autotile_group: NotRequired[str]
+    gid: NotRequired[int]
     properties: NotRequired[Dict[str, Any]]
 
 
@@ -62,6 +66,8 @@ class TypeLayerSerialized(TypedDict, total=True):
 class TypeTilesetSerialized(TypedDict, total=True):
     path: str
     type: str
+    tile_count: NotRequired[int]
+    firstgid: NotRequired[int]
     properties: NotRequired[Dict[str, Any]]
     tile_properties: NotRequired[Dict[str, Dict[str, Any]]]
     animation: NotRequired[dict]