smrpgpatchbuilder 5.0.5__tar.gz → 5.0.7__tar.gz

{smrpgpatchbuilder-5.0.5 → smrpgpatchbuilder-5.0.7}/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.5/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-5.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.5
+Version: 5.0.7
 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.5 → smrpgpatchbuilder-5.0.7}/pyproject.toml

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

{smrpgpatchbuilder-5.0.5 → smrpgpatchbuilder-5.0.7}/src/smrpgpatchbuilder/datatypes/dialogs/classes.py

@@ -1,6 +1,6 @@
 """Base classes related to dialogs and dialog collections"""
 
-import re
+import warnings
 
 from smrpgpatchbuilder.datatypes.dialogs.ids.misc import (
     DIALOG_BANK_22_BEGINS,
@@ -17,7 +17,7 @@ from smrpgpatchbuilder.datatypes.scripts_common.classes import (
 from .ids.dialog_bank_ids import (
     DIALOG_BANK_22,
 )
-from .formatter import center_lines, center_marked_lines, format_dialog
+from .formatter import center_lines, center_marked_lines, format_dialog, validate_dialog
 from .utils import compress, COMPRESSION_TABLE
 
 class Dialog:
@@ -164,16 +164,6 @@ class DialogCollection:
         self._unused_ranges = []  # Reset unused ranges tracking
         new_pointer_table: list[int] = [-1] * 4096
 
-        # Convert mid-dialog standalone [await] (0x00 = null terminator) to
-        # [await][page]\n (0x03) so the game continues to the next page instead
-        # of treating it as end-of-dialog.
-        _mid_await = re.compile(r'\[await\](?!\[page\]|\[pause\]|\n|$)')
-        for bank_idx, bank_strings in enumerate(self._raw_data):
-            for str_idx, s in enumerate(bank_strings):
-                self._raw_data[bank_idx][str_idx] = _mid_await.sub(
-                    '[await][page]\n', s
-                )
-
         # Auto-format dialogs: insert line breaks and handle centering
         if self._auto_format:
             for bank_idx, bank_strings in enumerate(self._raw_data):
@@ -191,6 +181,14 @@ class DialogCollection:
                         s = format_dialog(s)
                         self._raw_data[bank_idx][str_idx] = s
 
+        # Validate all dialogs for too many newlines between [await] boundaries
+        for bank_idx, bank_strings in enumerate(self._raw_data):
+            for str_idx, s in enumerate(bank_strings):
+                for w in validate_dialog(s):
+                    warnings.warn(
+                        f"Dialog bank 0x{bank_idx + 0x22:02x} index {str_idx}: {w}\n  Text: {s!r}"
+                    )
+
         compressed_text = [
             [compress(d, self.compression_table) for d in self._raw_data[0]],
             [compress(d, self.compression_table) for d in self._raw_data[1]],

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

@@ -391,7 +391,7 @@ def validate_dialog(
             line = 0
         if line >= LINE_COUNT:
             warnings.append(
-                "More than 3 line breaks without [await] or [page]"
+                f"3 or more newlines between [await] boundaries ({line} newlines found)"
             )
             break
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 5.0.5
+Version: 5.0.7
 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.5 → smrpgpatchbuilder-5.0.7}/src/tests/dialogs/test_formatter.py

@@ -198,7 +198,7 @@ class TestValidateDialog:
         # 4 lines without await/page
         text = "Line1\nLine2\nLine3\nLine4"
         warnings = validate_dialog(text)
-        assert any("3 line breaks" in w for w in warnings)
+        assert any("3 or more newlines" in w for w in warnings)
 
     def test_no_warning_with_await(self):
         text = "Line1\nLine2\nLine3[await]\nLine4\nLine5\nLine6"