smrpgpatchbuilder 6.2.6__tar.gz → 6.2.9__tar.gz

{smrpgpatchbuilder-6.2.6/src/smrpgpatchbuilder.egg-info → smrpgpatchbuilder-6.2.9}/PKG-INFO

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

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

{smrpgpatchbuilder-6.2.6 → smrpgpatchbuilder-6.2.9}/src/smrpgpatchbuilder/datatypes/levels/room_collection.py

@@ -224,6 +224,12 @@ class RoomCollection:
             else:
                 unique_npcs[0] = self._force_first_npc
             reserved_indices.add(0)
+            # Index 0 is now occupied. If no force_id NPCs bumped min_table_size,
+            # it stays 0 and the allocator below (which seeds next_index_after_forced
+            # and available_indices from min_table_size) would hand out index 0 again,
+            # overwriting force_first_npc. Reserve at least one slot for it.
+            if min_table_size == 0:
+                min_table_size = 1
 
         # Track which signatures have been placed via force_id
         sig_to_forced_index: dict[tuple, int] = {}

{smrpgpatchbuilder-6.2.6 → smrpgpatchbuilder-6.2.9}/src/smrpgpatchbuilder/datatypes/sprites/ids/sprite_palettes.py

@@ -62,8 +62,8 @@ SPAL045 = 45
 SPAL046 = 46
 SPAL047 = 47
 SPAL048 = 48
-SPAL049_WATER_FIRE_CRYSTAL_3D = 49
-SPAL050_WIND_EARTH_CRYSTAL_3D = 50
+SPAL049 = 49
+SPAL050 = 50
 SPAL051 = 51
 SPAL052 = 52
 SPAL053 = 53

{smrpgpatchbuilder-6.2.6 → smrpgpatchbuilder-6.2.9/src/smrpgpatchbuilder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smrpgpatchbuilder
-Version: 6.2.6
+Version: 6.2.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-6.2.6 → smrpgpatchbuilder-6.2.9}/src/smrpgpatchbuilder.egg-info/SOURCES.txt

@@ -238,6 +238,8 @@ src/smrpgpatchbuilder/utils/strings.py
 src/tests/animations/test_animationscripts.py
 src/tests/dialogs/__init__.py
 src/tests/dialogs/test_formatter.py
+src/tests/levels/__init__.py
+src/tests/levels/test_room_collection.py
 src/tests/monsters/test_ai.py
 src/tests/overworld/test_actionscripts.py
 src/tests/overworld/test_eventscripts.py

smrpgpatchbuilder-6.2.9/src/tests/levels/test_room_collection.py

@@ -0,0 +1,87 @@
+"""Tests for RoomCollection NPC table construction."""
+
+from smrpgpatchbuilder.datatypes.levels.classes import (
+    NPC,
+    Room,
+    RegularNPC,
+    RegularClone,
+)
+from smrpgpatchbuilder.datatypes.levels.room_collection import RoomCollection
+
+
+FORCE_FIRST_SPRITE = 799
+EMPTY_SPRITE = 1023
+ROOM_NPC_SPRITE = 100
+CLONE_NPC_SPRITE = 101
+
+
+def _build_rooms(populated_room: Room | None) -> list[Room | None]:
+    """Build a 512-length room list with one optionally-populated room.
+
+    Room 511 must be None per RoomCollection's constructor assertion.
+    """
+    rooms: list[Room | None] = [None] * 512
+    if populated_room is not None:
+        rooms[0] = populated_room
+    return rooms
+
+
+def _collection(rooms: list[Room | None]) -> RoomCollection:
+    return RoomCollection(
+        rooms,
+        force_first_npc=NPC(sprite_id=FORCE_FIRST_SPRITE),
+        empty_npc=NPC(sprite_id=EMPTY_SPRITE),
+    )
+
+
+def test_force_first_npc_survives_with_no_force_id_npcs():
+    """force_first_npc must stay at index 0 even when no room NPC has a force_id.
+
+    Regression: min_table_size stayed 0 when nothing had a force_id, so the
+    allocator seeded next_index_after_forced at 0 and overwrote force_first_npc
+    with the first standalone NPC.
+    """
+    room = Room(objects=[RegularNPC(npc=NPC(sprite_id=ROOM_NPC_SPRITE))])
+    collection = _collection(_build_rooms(room))
+
+    clone_groups = collection._collect_clone_group_requirements()
+    npc_table, _ = collection._build_sequential_placement(clone_groups)
+
+    assert npc_table[0].sprite_id == FORCE_FIRST_SPRITE
+    # The standalone room NPC must be placed after index 0, not on top of it.
+    assert ROOM_NPC_SPRITE in [npc.sprite_id for npc in npc_table[1:]]
+
+
+def test_force_first_npc_survives_with_clone_group():
+    """A clone group must not be allocated starting at index 0 over force_first_npc.
+
+    Clone groups use get_contiguous_indices, which (without the fix) would also
+    start at index 0 because next_index_after_forced was seeded from a
+    min_table_size of 0.
+    """
+    room = Room(
+        objects=[
+            RegularNPC(npc=NPC(sprite_id=ROOM_NPC_SPRITE)),
+            RegularClone(npc=NPC(sprite_id=CLONE_NPC_SPRITE)),
+        ]
+    )
+    collection = _collection(_build_rooms(room))
+
+    clone_groups = collection._collect_clone_group_requirements()
+    npc_table, _ = collection._build_sequential_placement(clone_groups)
+
+    assert npc_table[0].sprite_id == FORCE_FIRST_SPRITE
+    placed = [npc.sprite_id for npc in npc_table[1:]]
+    assert ROOM_NPC_SPRITE in placed
+    assert CLONE_NPC_SPRITE in placed
+
+
+def test_force_first_npc_survives_with_empty_rooms():
+    """force_first_npc must still occupy index 0 when no room has any NPC."""
+    collection = _collection(_build_rooms(None))
+
+    clone_groups = collection._collect_clone_group_requirements()
+    npc_table, _ = collection._build_sequential_placement(clone_groups)
+
+    assert len(npc_table) == 1
+    assert npc_table[0].sprite_id == FORCE_FIRST_SPRITE