[objects] add: Inventory::size

jd28 · Nov 26, 2024 · 0535553 · 0535553
1 parent d298346
commit 0535553
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 6 deletions.
diff --git a/docs/fake/rollnw/__init__.py b/docs/fake/rollnw/__init__.py
@@ -452,6 +452,10 @@ def remove_item(self, item: "Item") -> bool:
         """Removes an item from an inventory."""
         pass
 
+    def size(self) -> int:
+        """Gets number of items in the inventory"""
+        pass
+
 
 class ClassEntry:
     """Class level data

diff --git a/lib/nw/objects/Inventory.cpp b/lib/nw/objects/Inventory.cpp
@@ -227,6 +227,11 @@ void Inventory::set_growable(bool value)
     growable_ = value;
 }
 
+size_t Inventory::size() const noexcept
+{
+    return items.size();
+}
+
 std::pair<uint16_t, uint16_t> Inventory::slot_to_xy(InventorySlot slot) const noexcept
 {
     uint16_t x = static_cast<uint16_t>(slot.col);

diff --git a/lib/nw/objects/Inventory.hpp b/lib/nw/objects/Inventory.hpp
@@ -84,6 +84,9 @@ struct Inventory {
     /// Sets the inventory to allow adding pages dynamically (for stores)
     void set_growable(bool value);
 
+    /// Gets number of items in the inventory
+    size_t size() const noexcept;
+
     /// Converts coordinates from our page, row, col to bioware x,y cooardinates
     std::pair<uint16_t, uint16_t> slot_to_xy(InventorySlot slot) const noexcept;
 

diff --git a/rollnw-py/wrapper_objects_components.cpp b/rollnw-py/wrapper_objects_components.cpp
@@ -174,7 +174,8 @@ void init_component_inventory(py::module& m)
             }
             return pylist;
         })
-        .def("remove_item", &nw::Inventory::remove_item);
+        .def("remove_item", &nw::Inventory::remove_item)
+        .def("size", &nw::Inventory::size);
 }
 
 void init_component_levelhistory(py::module& m)

diff --git a/rollnw-stubs/__init__.pyi b/rollnw-stubs/__init__.pyi
@@ -790,6 +790,7 @@ class Inventory:
     def debug(self) -> str: ...
     def items(self) -> List["Item"]: ...
     def remove_item(self, item: "Item") -> bool: ...
+    def size(self) -> int: ...
 
 
 class InventoryItem:

diff --git a/tests/objects_player.cpp b/tests/objects_player.cpp
@@ -79,7 +79,7 @@ TEST(Player, Inventory)
     auto pl = nwk::objects().load_player("CDKEY", "daeris1");
     EXPECT_TRUE(pl);
 
-    EXPECT_EQ(pl->inventory.items.size(), 4);
+    EXPECT_EQ(pl->inventory.size(), 4);
     auto slot1 = pl->inventory.find_slot(1, 1);
     auto [x1, y1] = pl->inventory.slot_to_xy(slot1);
     EXPECT_EQ(x1, 1);
@@ -93,11 +93,11 @@ TEST(Player, Inventory)
     auto it = pl->inventory.items[0].item.as<nw::Item*>();
     EXPECT_TRUE(pl->inventory.remove_item(it));
     EXPECT_FALSE(pl->inventory.has_item(it));
-    EXPECT_EQ(pl->inventory.items.size(), 3);
+    EXPECT_EQ(pl->inventory.size(), 3);
     EXPECT_TRUE(pl->inventory.can_add_item(it));
     EXPECT_TRUE(pl->inventory.add_item(it));
     EXPECT_TRUE(pl->inventory.has_item(it));
-    EXPECT_EQ(pl->inventory.items.size(), 4);
+    EXPECT_EQ(pl->inventory.size(), 4);
 }
 
 TEST(Player, PerPartColor)

diff --git a/tests/objects_store.cpp b/tests/objects_store.cpp
@@ -43,7 +43,7 @@ TEST(Store, JsonDeserialize)
     EXPECT_EQ(ent->common.resref, "storethief002");
     EXPECT_TRUE(ent->blackmarket);
     EXPECT_EQ(ent->blackmarket_markdown, 25);
-    EXPECT_GT(ent->inventory.weapons.items.size(), 0);
+    EXPECT_GT(ent->inventory.weapons.size(), 0);
     EXPECT_EQ(ent->inventory.weapons.items[0].item.as<nw::Resref>(), "nw_wswdg001");
 }
 
@@ -73,7 +73,7 @@ TEST(Store, GffDeserialize)
     EXPECT_EQ(ent->common.resref, "storethief002");
     EXPECT_TRUE(ent->blackmarket);
     EXPECT_EQ(ent->blackmarket_markdown, 25);
-    EXPECT_TRUE(ent->inventory.weapons.items.size() > 0);
+    EXPECT_TRUE(ent->inventory.weapons.size() > 0);
     EXPECT_EQ(ent->inventory.weapons.items[0].item.as<nw::Item*>()->common.resref, "nw_wswdg001");
 }