smrpgpatchbuilder 7.1.7__tar.gz → 7.1.8__tar.gz

{smrpgpatchbuilder-7.1.7/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-7.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 7.1.7
+Version: 7.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
@@ -115,7 +115,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py packetdisassembler --rom "
 ```
 
 These will produce: 
-- `./src/disassembler_output/items.items.py`
+- `./src/disassembler_output/items/items.py`
 - `./src/disassembler_output/enemy_attacks/attacks.py`
 - `./src/disassembler_output/spells/spells.py`
 - `./src/disassembler_output/packets/packets.py`
@@ -586,7 +586,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py itemassembler -r path/to/y
 ```
 Writes to:
 ```
-./src/disassembler_output/items.items.py
+./src/disassembler_output/items/items.py
 ```
 
 Examples - NokNokShell, Muku Cookie, and Fire Bomb:

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/README.md

@@ -99,7 +99,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py packetdisassembler --rom "
 ```
 
 These will produce: 
-- `./src/disassembler_output/items.items.py`
+- `./src/disassembler_output/items/items.py`
 - `./src/disassembler_output/enemy_attacks/attacks.py`
 - `./src/disassembler_output/spells/spells.py`
 - `./src/disassembler_output/packets/packets.py`
@@ -570,7 +570,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py itemassembler -r path/to/y
 ```
 Writes to:
 ```
-./src/disassembler_output/items.items.py
+./src/disassembler_output/items/items.py
 ```
 
 Examples - NokNokShell, Muku Cookie, and Fire Bomb:

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/pyproject.toml

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

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/smrpgpatchbuilder/datatypes/overworld_scripts/event_scripts/commands/commands.py

@@ -192,7 +192,7 @@ class EndLoop(UsableEventScriptCommand, EventScriptCommandNoArgs):
         `0xD7`
 
     ## Size
-        2 bytes
+        1 byte
 
     Args:
         identifier (str | None): Give this command a label if you want another command to jump to it.
@@ -453,7 +453,7 @@ class RememberLastObject(UsableEventScriptCommand, EventScriptCommandNoArgs):
         `0xFD 0x32`
 
     ## Size
-        1 byte
+        2 bytes
 
     Args:
         identifier (str | None): Give this command a label if you want another command to jump to it.
@@ -5204,10 +5204,10 @@ class FreezeCamera(UsableEventScriptCommand, EventScriptCommandNoArgs):
         `Freeze screen`
 
     ## Opcode
-        `0x31`
+        `0xFD 0x31`
 
     ## Size
-        1 byte
+        2 bytes
 
     Args:
         identifier (str | None): Give this command a label if you want another command to jump to it.
@@ -5223,10 +5223,10 @@ class UnfreezeCamera(UsableEventScriptCommand, EventScriptCommandNoArgs):
         `Unfreeze screen`
 
     ## Opcode
-        `0x30`
+        `0xFD 0x30`
 
     ## Size
-        1 byte
+        2 bytes
 
     Args:
         identifier (str | None): Give this command a label if you want another command to jump to it.

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/smrpgpatchbuilder/datatypes/scripts_common/classes.py

@@ -325,7 +325,7 @@ class Script(Generic[ScriptCommandT]):
         return self._contents
 
     def append(self, command: ScriptCommandT) -> None:
-        """Set the list of script commands."""
+        """Append a command to the end of the script."""
         self._contents.append(command)
 
     def extend(self, commands: list[ScriptCommandT]) -> None:
@@ -360,7 +360,7 @@ class Script(Generic[ScriptCommandT]):
             -1,
         )
         if index == -1:
-            raise IdentifierException("{identifier} not found")
+            raise IdentifierException(f"{identifier} not found")
         return index
 
     def set_contents(self, script: list[ScriptCommandT] | None = None) -> None:
@@ -415,13 +415,13 @@ class Script(Generic[ScriptCommandT]):
         """insert a command to this script immediately before the command matching the unique
         identifier specified."""
         index: int = self.get_index_of_identifier(identifier)
-        self._insert(index + 1, command)
+        self._insert(index, command)
 
     def insert_after_identifier(self, identifier: str, command: ScriptCommandT) -> None:
         """insert a command to this script immediately after the command matching the unique
         identifier specified."""
         index: int = self.get_index_of_identifier(identifier)
-        self._insert(index, command)
+        self._insert(index + 1, command)
 
     def replace_at_index(self, index: int, content: ScriptCommandT) -> None:
         """Replace the command at the specified list index within the script."""
@@ -568,7 +568,7 @@ class ScriptBank(Generic[ScriptT]):
             if key not in self.addresses:
                 if "ILLEGAL_JUMP_" in key:
                     destination.set_address((int(key[-4:], 16) & 0xFFFF))
-                    return
+                    continue
                 else:
                     raise IdentifierException(f"couldn't find destination {key}")
             destination.set_address(self.addresses[key] & 0xFFFF)

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8/src/smrpgpatchbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 7.1.7
+Version: 7.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
@@ -115,7 +115,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py packetdisassembler --rom "
 ```
 
 These will produce: 
-- `./src/disassembler_output/items.items.py`
+- `./src/disassembler_output/items/items.py`
 - `./src/disassembler_output/enemy_attacks/attacks.py`
 - `./src/disassembler_output/spells/spells.py`
 - `./src/disassembler_output/packets/packets.py`
@@ -586,7 +586,7 @@ PYTHONPATH=src python src/smrpgpatchbuilder/manage.py itemassembler -r path/to/y
 ```
 Writes to:
 ```
-./src/disassembler_output/items.items.py
+./src/disassembler_output/items/items.py
 ```
 
 Examples - NokNokShell, Muku Cookie, and Fire Bomb:

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/smrpgpatchbuilder.egg-info/SOURCES.txt

@@ -248,4 +248,5 @@ src/tests/levels/test_room_collection.py
 src/tests/minecart/test_minecart.py
 src/tests/monsters/test_ai.py
 src/tests/overworld/test_actionscripts.py
-src/tests/overworld/test_eventscripts.py
+src/tests/overworld/test_eventscripts.py
+src/tests/scripts_common/test_script_helpers.py

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/tests/animations/test_animationscripts.py

@@ -339,93 +339,93 @@ test_cases = [
         expected_bytes=[0x2F, 0x00, 0x40, 0x00],
     ),
     Case(
-        label="SetAMEM8BitTo7E1x",
+        label="SetAMEM8BitToAbsolute7E",
         commands_factory=lambda: [
-            SetAMEM8BitTo7E1x(0x60, 0x7EFAC3),
+            SetAMEM8BitToAbsolute7E(0x60, 0x7EFAC3),
         ],
         expected_bytes=[0x20, 0x10, 0xC3, 0xFA],
     ),
     Case(
-        label="SetAMEM16BitTo7E1x",
+        label="SetAMEM16BitToAbsolute7E",
         commands_factory=lambda: [
-            SetAMEM16BitTo7E1x(0x60, 0x7EE022),
+            SetAMEM16BitToAbsolute7E(0x60, 0x7EE022),
         ],
         expected_bytes=[0x21, 0x10, 0x22, 0xE0],
     ),
     Case(
-        label="Set7E1xToAMEM8Bit",
+        label="SetAbsolute7EToAMEM8Bit",
         commands_factory=lambda: [
-            Set7E1xToAMEM8Bit(0x7EE001, 0x60),
+            SetAbsolute7EToAMEM8Bit(0x7EE001, 0x60),
         ],
         expected_bytes=[0x22, 0x10, 0x01, 0xE0],
     ),
     Case(
-        label="Set7E1xToAMEM16Bit",
+        label="SetAbsolute7EToAMEM16Bit",
         commands_factory=lambda: [
-            Set7E1xToAMEM16Bit(0x7EE022, 0x60),
+            SetAbsolute7EToAMEM16Bit(0x7EE022, 0x60),
         ],
         expected_bytes=[0x23, 0x10, 0x22, 0xE0],
     ),
     Case(
-        label="JmpIfAMEM8BitEquals7E1x",
+        label="JmpIfAMEM8BitEqualsAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM8BitEquals7E1x(0x61, 0x7EE003, ["jmp"]),
+            JmpIfAMEM8BitEqualsAbsolute7E(0x61, 0x7EE003, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x24, 0x11, 0x03, 0xE0, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM16BitEquals7E1x",
+        label="JmpIfAMEM16BitEqualsAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM16BitEquals7E1x(0x61, 0x7EE005, ["jmp"]),
+            JmpIfAMEM16BitEqualsAbsolute7E(0x61, 0x7EE005, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x25, 0x11, 0x05, 0xE0, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM8BitNotEquals7E1x",
+        label="JmpIfAMEM8BitNotEqualsAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM8BitNotEquals7E1x(0x60, 0x7EFA00, ["jmp"]),
+            JmpIfAMEM8BitNotEqualsAbsolute7E(0x60, 0x7EFA00, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x26, 0x10, 0x00, 0xFA, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM16BitNotEquals7E1x",
+        label="JmpIfAMEM16BitNotEqualsAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM16BitNotEquals7E1x(0x62, 0x7EFA00, ["jmp"]),
+            JmpIfAMEM16BitNotEqualsAbsolute7E(0x62, 0x7EFA00, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x27, 0x12, 0x00, 0xFA, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM8BitLessThan7E1x",
+        label="JmpIfAMEM8BitLessThanAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM8BitLessThan7E1x(0x63, 0x7E0F00, ["jmp"]),
+            JmpIfAMEM8BitLessThanAbsolute7E(0x63, 0x7E0F00, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x28, 0x13, 0x00, 0x0F, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM16BitLessThan7E1x",
+        label="JmpIfAMEM16BitLessThanAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM16BitLessThan7E1x(0x61, 0x7EE100, ["jmp"]),
+            JmpIfAMEM16BitLessThanAbsolute7E(0x61, 0x7EE100, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x29, 0x11, 0x00, 0xE1, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM8BitGreaterOrEqualThan7E1x",
+        label="JmpIfAMEM8BitGreaterOrEqualThanAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM8BitGreaterOrEqualThan7E1x(0x60, 0x7E1000, ["jmp"]),
+            JmpIfAMEM8BitGreaterOrEqualThanAbsolute7E(0x60, 0x7E1000, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[0x2A, 0x10, 0x00, 0x10, 0x08, 0xC0, 0x11],
     ),
     Case(
-        label="JmpIfAMEM16BitGreaterOrEqualThan7E1x",
+        label="JmpIfAMEM16BitGreaterOrEqualThanAbsolute7E",
         commands_factory=lambda: [
-            JmpIfAMEM16BitGreaterOrEqualThan7E1x(0x65, 0x7E0200, ["jmp"]),
+            JmpIfAMEM16BitGreaterOrEqualThanAbsolute7E(0x65, 0x7E0200, ["jmp"]),
             ReturnSubroutine(identifier="jmp"),
         ],
         expected_bytes=[
@@ -439,23 +439,23 @@ test_cases = [
         ],
     ),
     Case(
-        label="IncAMEM8BitBy7E1x",
-        commands_factory=lambda: [IncAMEM8BitBy7E1x(0x67, 0x7E3100)],
+        label="IncAMEM8BitByAbsolute7E",
+        commands_factory=lambda: [IncAMEM8BitByAbsolute7E(0x67, 0x7E3100)],
         expected_bytes=[0x2C, 0x17, 0x00, 0x31],
     ),
     Case(
-        label="IncAMEM16BitBy7E1x",
-        commands_factory=lambda: [IncAMEM16BitBy7E1x(0x66, 0x7E1000)],
+        label="IncAMEM16BitByAbsolute7E",
+        commands_factory=lambda: [IncAMEM16BitByAbsolute7E(0x66, 0x7E1000)],
         expected_bytes=[0x2D, 0x16, 0x00, 0x10],
     ),
     Case(
-        label="DecAMEM8BitBy7E1x",
-        commands_factory=lambda: [DecAMEM8BitBy7E1x(0x61, 0x7EA000)],
+        label="DecAMEM8BitByAbsolute7E",
+        commands_factory=lambda: [DecAMEM8BitByAbsolute7E(0x61, 0x7EA000)],
         expected_bytes=[0x2E, 0x11, 0x00, 0xA0],
     ),
     Case(
-        label="DecAMEM16BitBy7E1x",
-        commands_factory=lambda: [DecAMEM16BitBy7E1x(0x64, 0x7E0F00)],
+        label="DecAMEM16BitByAbsolute7E",
+        commands_factory=lambda: [DecAMEM16BitByAbsolute7E(0x64, 0x7E0F00)],
         expected_bytes=[0x2F, 0x14, 0x00, 0x0F],
     ),
     Case(

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/tests/dialogs/test_formatter.py

@@ -127,10 +127,11 @@ class TestTokenize:
         assert tokens[0].is_variable
         assert tokens[0].width_px == 16  # 2 * (7+1)
 
-    def test_long_variable_token(self):
+    def test_filename_token(self):
         tokens = _tokenize("[filename]")
         assert len(tokens) == 1
-        assert tokens[0].is_long_variable
+        assert tokens[0].is_variable
+        assert tokens[0].width_px == 80  # 8 chars * widest letter width
 
     def test_mixed_text(self):
         tokens = _tokenize("Hello world[await]\n")

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/tests/monsters/test_ai.py

@@ -2,7 +2,7 @@ import pytest
 
 from dataclasses import dataclass
 
-from disassembler_output.spells.spells import CharacterSpell, EnemySpell
+from smrpgpatchbuilder.datatypes.spells.classes import CharacterSpell, EnemySpell
 from smrpgpatchbuilder.datatypes.enemy_attacks.classes import EnemyAttack
 from smrpgpatchbuilder.datatypes.items.classes import RegularItem
 from smrpgpatchbuilder.datatypes.monster_scripts import *

{smrpgpatchbuilder-7.1.7 → smrpgpatchbuilder-7.1.8}/src/tests/overworld/test_actionscripts.py

@@ -1854,14 +1854,14 @@ test_cases = [
     Case(
         "Valid unknown command",
         commands_factory=lambda: [
-            A_UnknownCommand(bytearray([0x24, 0xAB, 0xCD, 0xFE, 0x69])),
+            A_UnknownCommand(bytearray([0x25, 0xAB, 0xCD, 0xFE, 0x69])),
         ],
-        expected_bytes=[0x24, 0xAB, 0xCD, 0xFE, 0x69],
+        expected_bytes=[0x25, 0xAB, 0xCD, 0xFE, 0x69],
     ),
     Case(
         "Unknown command with wrong length should fail",
-        commands_factory=lambda: [A_UnknownCommand(bytearray([0x24, 0xAB, 0xCD]))],
-        exception="opcode 0x24 expects 5 total bytes (inclusive), got 3 bytes instead",
+        commands_factory=lambda: [A_UnknownCommand(bytearray([0x25, 0xAB, 0xCD]))],
+        exception="opcode 0x25 expects 5 total bytes (inclusive), got 3 bytes instead",
         exception_type=InvalidCommandArgumentException,
     ),
     Case(

smrpgpatchbuilder-7.1.8/src/tests/scripts_common/test_script_helpers.py

@@ -0,0 +1,45 @@
+import pytest
+
+from smrpgpatchbuilder.datatypes.scripts_common.classes import (
+    IdentifierException,
+    Script,
+    ScriptBank,
+    ScriptCommandNoArgs,
+    TransformableIdentifier,
+)
+
+
+class _Cmd(ScriptCommandNoArgs):
+    _opcode = 0xFE
+
+
+def _labels(script: Script) -> list[str]:
+    return [cmd.identifier.label for cmd in script.contents]
+
+
+def test_insert_before_identifier_inserts_before():
+    script = Script([_Cmd(identifier="first"), _Cmd(identifier="second")])
+    script.insert_before_identifier("second", _Cmd(identifier="new"))
+    assert _labels(script) == ["first", "new", "second"]
+
+
+def test_insert_after_identifier_inserts_after():
+    script = Script([_Cmd(identifier="first"), _Cmd(identifier="second")])
+    script.insert_after_identifier("first", _Cmd(identifier="new"))
+    assert _labels(script) == ["first", "new", "second"]
+
+
+def test_get_index_of_identifier_error_includes_name():
+    script = Script([_Cmd(identifier="only")])
+    with pytest.raises(IdentifierException, match="nonexistent not found"):
+        script.get_index_of_identifier("nonexistent")
+
+
+def test_illegal_jump_does_not_skip_remaining_destinations():
+    bank = ScriptBank(None)
+    bank.addresses["real_label"] = 0x0C0B
+    illegal = TransformableIdentifier("ILLEGAL_JUMP_1234")
+    real = TransformableIdentifier("real_label")
+    bank._set_identifier_addresses([illegal, real])
+    assert illegal.address == 0x1234
+    assert real.address == 0x0C0B