add BasicInventory

Akagoria · Feb 13, 2025 · 814c08b · 814c08b
1 parent b572926
commit 814c08b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/code/bits/InventoryState.cc b/code/bits/InventoryState.cc
@@ -6,32 +6,36 @@
 
 namespace akgr {
 
-  namespace {
-
-    void add_item_to(const DataReference<ItemData>& data, std::vector<InventoryItemState>& items, int32_t count)
-    {
-      if (auto iterator = std::find_if(items.begin(), items.end(), [&data](const InventoryItemState& state) { return data.id == state.data.id; }); iterator != items.end()) {
-        iterator->count += count;
-      } else {
-        items.push_back({ data, count });
-      }
-    }
+  /*
+   * BasicInventoryState
+   */
 
+  void BasicInventoryState::add_item(const DataReference<ItemData>& data, int32_t count)
+  {
+    if (auto iterator = std::find_if(items.begin(), items.end(), [&data](const InventoryItemState& state) { return data.id == state.data.id; }); iterator != items.end()) {
+      iterator->count += count;
+    } else {
+      items.push_back({ data, count });
+    }
   }
 
-  void InventoryState::add_item(const DataReference<ItemData>& data, int32_t count)
+  /*
+   * InventoryState
+   */
+
+  void InventoryState::add_regular_item(const DataReference<ItemData>& data, int32_t count)
   {
-    add_item_to(data, items, count);
+    regular.add_item(data, count);
   }
 
   void InventoryState::add_quest_item(const DataReference<ItemData>& data, int32_t count)
   {
-    add_item_to(data, quest_items, count);
+    quest.add_item(data, count);
   }
 
   void InventoryState::transfer_to_quest_items(const DataReference<ItemData>& data, int32_t count)
   {
-    if (auto iterator = std::find_if(items.begin(), items.end(), [&data](const InventoryItemState& state) { return data.id == state.data.id; }); iterator != items.end()) {
+    if (auto iterator = std::find_if(quest.items.begin(), quest.items.end(), [&data](const InventoryItemState& state) { return data.id == state.data.id; }); iterator != quest.items.end()) {
       assert(iterator->count >= count);
       iterator->count -= count;
       add_quest_item(data, count);

diff --git a/code/bits/InventoryState.h b/code/bits/InventoryState.h
@@ -18,18 +18,29 @@ namespace akgr {
     return ar | state.data | state.count;
   }
 
-  struct InventoryState {
+  struct BasicInventoryState {
     std::vector<InventoryItemState> items;
-    std::vector<InventoryItemState> quest_items;
 
     void add_item(const DataReference<ItemData>& data, int32_t count = 1);
+  };
+
+  template<typename Archive>
+  Archive& operator|(Archive& ar, gf::MaybeConst<BasicInventoryState, Archive>& state) {
+    return ar | state.items;
+  }
+
+  struct InventoryState {
+    BasicInventoryState regular;
+    BasicInventoryState quest;
+
+    void add_regular_item(const DataReference<ItemData>& data, int32_t count = 1);
     void add_quest_item(const DataReference<ItemData>& data, int32_t count = 1);
     void transfer_to_quest_items(const DataReference<ItemData>& data, int32_t count = 1);
   };
 
   template<typename Archive>
   Archive& operator|(Archive& ar, gf::MaybeConst<InventoryState, Archive>& state) {
-    return ar | state.items | state.quest_items;
+    return ar | state.regular | state.quest;
   }
 
 }

diff --git a/code/bits/WorldModel.cc b/code/bits/WorldModel.cc
@@ -163,7 +163,7 @@ namespace akgr {
     for (auto& item : state.items) {
       if (item.status.test(ItemStatus::Picked)) {
         need_update = true;
-        state.hero.inventory.add_item(item.data);
+        state.hero.inventory.add_regular_item(item.data);
         check_quest_farm(item.data->label.tag);
       }
     }
@@ -324,7 +324,7 @@ namespace akgr {
           auto& quest_state = std::get<FarmQuestState>(quest.features);
           quest_state.amount = 0;
 
-          for (auto& item : state.hero.inventory.items) {
+          for (auto& item : state.hero.inventory.regular.items) {
             if (quest_data.item->label.id == item.data->label.id) {
               quest_state.amount += item.count;