smrpgpatchbuilder 4.1.6__tar.gz → 4.1.8__tar.gz

{smrpgpatchbuilder-4.1.6/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-4.1.8}/PKG-INFO

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

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

{smrpgpatchbuilder-4.1.6 → smrpgpatchbuilder-4.1.8}/src/smrpgpatchbuilder/datatypes/dialogs/__init__.py

@@ -1,6 +1,7 @@
 from .formatter import (
     calculate_text_width,
     center_lines,
+    center_marked_lines,
     format_dialog,
     format_wish,
     validate_dialog,

{smrpgpatchbuilder-4.1.6 → smrpgpatchbuilder-4.1.8}/src/smrpgpatchbuilder/datatypes/dialogs/classes.py

@@ -1,5 +1,7 @@
 """Base classes related to dialogs and dialog collections"""
 
+import re
+
 from smrpgpatchbuilder.datatypes.dialogs.ids.misc import (
     DIALOG_BANK_22_BEGINS,
     DIALOG_BANK_22_ENDS,
@@ -15,7 +17,7 @@ from smrpgpatchbuilder.datatypes.scripts_common.classes import (
 from .ids.dialog_bank_ids import (
     DIALOG_BANK_22,
 )
-from .formatter import center_lines, format_dialog
+from .formatter import center_lines, center_marked_lines, format_dialog
 from .utils import compress, COMPRESSION_TABLE
 
 class Dialog:
@@ -160,6 +162,16 @@ 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
+                )
+
         # Process [center] tags: auto-format line breaks and add centering padding
         for bank_idx, bank_strings in enumerate(self._raw_data):
             for str_idx, s in enumerate(bank_strings):
@@ -168,6 +180,10 @@ class DialogCollection:
                     s = format_dialog(s)
                     s = center_lines(s)
                     self._raw_data[bank_idx][str_idx] = s
+                elif "\n[center]" in s:
+                    s = format_dialog(s)
+                    s = center_marked_lines(s)
+                    self._raw_data[bank_idx][str_idx] = s
 
         compressed_text = [
             [compress(d, self.compression_table) for d in self._raw_data[0]],

{smrpgpatchbuilder-4.1.6 → smrpgpatchbuilder-4.1.8}/src/smrpgpatchbuilder/datatypes/dialogs/formatter.py

@@ -113,6 +113,12 @@ def _tokenize(text: str, widths: tuple[int, ...] = VANILLA_DIALOG_FONT_WIDTHS) -
             cursor += len(delay_match.group())
             continue
 
+        # 1b. Match [center] as a zero-width marker token
+        if text[cursor:cursor + 8] == "[center]":
+            tokens.append(Token(text="[center]", width_px=0))
+            cursor += 8
+            continue
+
         # 2. Match control tokens (longest first)
         matched = False
         for ctrl in _CONTROL_TOKENS:
@@ -326,6 +332,9 @@ def format_dialog(
     result = "".join(output_parts)
 
     if has_center:
+        # Trim trailing spaces before newlines, control tokens, and end of string.
+        # Centered text pads from the left; trailing spaces waste dialog space.
+        result = re.sub(r' +(?=\n|\[(?:await|page|end|select)|$)', '', result)
         result = "[center]" + result
 
     return result
@@ -488,6 +497,77 @@ def format_wish(
         return text
 
 
+def center_marked_lines(
+    text: str,
+    char_widths: tuple[int, ...] | None = None,
+    left_margin: int | None = None,
+) -> str:
+    """Center only lines that begin with [center], leaving other lines untouched.
+
+    For each line (split by bare \\n) that starts with ``[center]``:
+    1. Strip the ``[center]`` marker
+    2. Trim trailing spaces from the line content
+    3. Calculate content width and add leading-space padding to center it
+
+    Lines without ``[center]`` are passed through unchanged.
+
+    Args:
+        text: The dialog string with \\n line breaks already inserted.
+        char_widths: Font width table. Defaults to VANILLA_DIALOG_FONT_WIDTHS.
+        left_margin: Left margin in pixels. Defaults to DEFAULT_LEFT_MARGIN.
+
+    Returns:
+        The text with per-line centering applied where marked.
+    """
+    if char_widths is None:
+        char_widths = VANILLA_DIALOG_FONT_WIDTHS
+    if left_margin is None:
+        left_margin = DEFAULT_LEFT_MARGIN
+
+    space_width = _calculate_char_width(" ", char_widths)
+    available_width = (CANVAS_WIDTH - left_margin) - (left_margin + 1)
+
+    # Tokenize so we can split on bare \n while preserving control tokens
+    tokens = _tokenize(text, char_widths)
+
+    # Split tokens into lines at bare \n boundaries
+    lines: list[list[Token]] = [[]]
+    for tok in tokens:
+        if tok.is_line_break and not tok.is_await:
+            lines.append([])
+        elif tok.is_page_break or (tok.is_line_break and tok.is_await):
+            lines[-1].append(tok)
+            lines.append([])
+        else:
+            lines[-1].append(tok)
+
+    result_parts: list[str] = []
+    for line_tokens in lines:
+        # Check if line starts with [center] (skipping leading spaces)
+        line_str = "".join(t.text for t in line_tokens)
+        if line_str.lstrip(" ").startswith("[center]"):
+            # Strip [center] marker
+            center_pos = line_str.index("[center]")
+            line_content = line_str[center_pos + len("[center]"):]
+            # Trim trailing spaces before any control token or end
+            line_content = re.sub(
+                r' +(?=\n|\[(?:await|page|end|select)|$)', '', line_content
+            )
+            # Calculate centering padding from the stripped content
+            content_tokens = _tokenize(line_content, char_widths)
+            content_width = sum(t.width_px for t in content_tokens)
+            remaining = available_width - content_width
+            if remaining > 0 and space_width > 0:
+                pad_spaces = math.floor((remaining / 2) / space_width)
+            else:
+                pad_spaces = 0
+            result_parts.append(" " * pad_spaces + line_content)
+        else:
+            result_parts.append(line_str)
+
+    return "\n".join(result_parts)
+
+
 def calculate_text_width(
     text: str,
     char_widths: tuple[int, ...] | None = None,

{smrpgpatchbuilder-4.1.6 → smrpgpatchbuilder-4.1.8/src/smrpgpatchbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 4.1.6
+Version: 4.1.8
 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