smrpgpatchbuilder 5.0.7__tar.gz → 5.0.9__tar.gz

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9}/MANIFEST.in

@@ -1,3 +1,3 @@
-global-exclude __pycache__
-global-exclude *.py[cod]
-prune src/disassembler_output
+global-exclude __pycache__
+global-exclude *.py[cod]
+prune src/disassembler_output

{smrpgpatchbuilder-5.0.7/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-5.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.7
+Version: 5.0.9
 Summary: Patchable base class support for some SMRPG concepts similar to their definitions in Lazy Shell
 Author-email: pidgezero_one <s.kischak@gmail.com>
 License-Expression: MIT

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "smrpgpatchbuilder"
-version = "5.0.7"
+version = "5.0.9"
 authors = [
   { name="pidgezero_one", email="s.kischak@gmail.com" },
 ]

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9}/src/smrpgpatchbuilder/datatypes/dialogs/formatter.py

@@ -379,16 +379,25 @@ def validate_dialog(
     tokens = _tokenize(text, char_widths)
 
     line = 0
+    after_await = False  # True when [await] seen with no visible text since
 
     for tok in tokens:
         if tok.is_page_break:
             line = 0
+            after_await = False
         elif tok.is_line_break:
-            line += 1
-            if tok.is_await:
+            if tok.is_await or after_await:
+                # \n immediately after [await] (with only control tokens between) doesn't count
                 line = 0
+            else:
+                line += 1
+            after_await = False
         elif tok.is_await:
             line = 0
+            after_await = True
+        elif tok.width_px > 0 or tok.is_variable:
+            # Visible text clears the after_await grace period
+            after_await = False
         if line >= LINE_COUNT:
             warnings.append(
                 f"3 or more newlines between [await] boundaries ({line} newlines found)"

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9}/src/smrpgpatchbuilder/datatypes/graphics/classes.py

@@ -739,7 +739,7 @@ class SpriteCollection:
         
         return bytearray(sprite_data), bytearray(image_data), bytearray(animation_pointers), anim_tile_ranges, output_tile_ranges
 
-    def assemble_from_tables(self, sprites: list[CompleteSprite], insert_whitespace=False, shared_image_groups: list[list[int]] | None = None, no_clone_sprites: list[int] | None = None) -> tuple[bytearray, bytearray, bytearray, list[tuple[int, bytearray]], list[tuple[int, bytearray]]]:
+    def assemble_from_tables(self, sprites: list[CompleteSprite], insert_whitespace=False, shared_image_groups: list[list[int]] | None = None) -> tuple[bytearray, bytearray, bytearray, list[tuple[int, bytearray]], list[tuple[int, bytearray]]]:
         # CRITICAL: Reset all banks before assembling to prevent data from previous runs
         for bank in self.uncompressed_tile_banks:
             bank.tiles = bytearray([])
@@ -1150,12 +1150,7 @@ class SpriteCollection:
                     this_mold = copy.deepcopy(m)
 
                     # create clones and use in mold
-                    # Skip clone optimization for sprites that need vanilla-compatible
-                    # animation layout (e.g., Smithy sprites used in battle events)
-                    skip_clones = no_clone_sprites is not None and sprite_index in no_clone_sprites
-                    if skip_clones and mold_index == 0:
-                        print(f"[GFX] Skipping clone optimization for sprite {sprite_index}")
-                    if not this_mold.gridplane and not skip_clones:
+                    if not this_mold.gridplane:
                         clones = find_clones(these_tiles, molds, sprite_index, mold_index)
                         these_tiles = clones
                     this_mold.tiles = these_tiles
@@ -1212,8 +1207,8 @@ class SpriteCollection:
 
         return self.assemble_from_tables_(complete_sprites, complete_images, complete_animations, output_tile_ranges)
 
-    def render(self, whitespace: bool = False, shared_image_groups: list[list[int]] | None = None, no_clone_sprites: list[int] | None = None) -> list[tuple[int, bytearray]]:
-        sprite_data, image_data, animation_pointers, animation_data, tiles = self.assemble_from_tables(self.sprites, whitespace, shared_image_groups, no_clone_sprites)
+    def render(self, whitespace: bool = False, shared_image_groups: list[list[int]] | None = None) -> list[tuple[int, bytearray]]:
+        sprite_data, image_data, animation_pointers, animation_data, tiles = self.assemble_from_tables(self.sprites, whitespace, shared_image_groups)
 
         # Zero out all sprite data ranges before writing to prevent leftover data
         zero_ranges = []

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9}/src/smrpgpatchbuilder/datatypes/levels/room_collection.py

@@ -865,6 +865,17 @@ class RoomCollection:
                 action_offset = obj.action_script - base_action_script
                 event_offset = obj.event_script - base_event_script
 
+                if event_offset < 0 or event_offset > 7:
+                    raise ValueError(
+                        f"Room {room_idx} object {obj_idx} (RegularClone):\n"
+                        f"  event_script offset {event_offset} out of range [0, 7]\n"
+                        f"  Clone event_script: {obj.event_script}\n"
+                        f"  Parent event_script: {parent.event_script}\n"
+                        f"  Base event_script: {base_event_script}\n"
+                        f"  A clone's event_script must be within 7 of the base "
+                        f"(min of parent + sibling clones); the encoding only has 3 bits."
+                    )
+
                 data[0] = (
                     ((event_offset & 0x07) << 5)
                     | ((action_offset & 0x03) << 3)

{smrpgpatchbuilder-5.0.7 → smrpgpatchbuilder-5.0.9/src/smrpgpatchbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.7
+Version: 5.0.9
 Summary: Patchable base class support for some SMRPG concepts similar to their definitions in Lazy Shell
 Author-email: pidgezero_one <s.kischak@gmail.com>
 License-Expression: MIT