Added npc_hasItems and npc_removeInvItem(s) (aka. you can now pay for…

… your stuff)
REGoth-project · Nov 25, 2016 · 0a6caf1 · 0a6caf1
1 parent 16d8d60
commit 0a6caf1
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 9 deletions.
diff --git a/lib/ZenLib b/lib/ZenLib
diff --git a/src/logic/Inventory.cpp b/src/logic/Inventory.cpp
@@ -33,15 +33,23 @@ const std::list<Daedalus::GameState::ItemHandle>& Inventory::getItems()
     return vm.getGameState().getInventoryOf(m_NPC);
 }
 
-bool Inventory::removeItem(const std::string& symName)
+bool Inventory::removeItem(const std::string& symName, unsigned int count)
 {
-    // Get script-engine
-    Logic::ScriptEngine& vm = m_Engine.getWorldInstance(m_World).getScriptEngine();
+	// Get script-engine
+	Logic::ScriptEngine& vm = m_Engine.getWorldInstance(m_World).getScriptEngine();
+
+	return vm.getGameState().removeInventoryItem(vm.getSymbolIndexByName(symName), m_NPC, count);
+}
+
+bool Inventory::removeItem(size_t symIndex, unsigned int count)
+{
+	// Get script-engine
+	Logic::ScriptEngine& vm = m_Engine.getWorldInstance(m_World).getScriptEngine();
 
-    return vm.getGameState().removeInventoryItem(vm.getSymbolIndexByName(symName), m_NPC);
+	return vm.getGameState().removeInventoryItem(symIndex, m_NPC, count);
 }
 
-bool Inventory::removeItem(Daedalus::GameState::ItemHandle item)
+bool Inventory::removeItem(Daedalus::GameState::ItemHandle item, unsigned int count)
 {
     // Get script-engine
     Logic::ScriptEngine& vm = m_Engine.getWorldInstance(m_World).getScriptEngine();
@@ -51,7 +59,7 @@ bool Inventory::removeItem(Daedalus::GameState::ItemHandle item)
 
     Daedalus::GEngineClasses::C_Item& data = vm.getGameState().getItem(item);
 
-    return vm.getGameState().removeInventoryItem(data.instanceSymbol, m_NPC);
+    return vm.getGameState().removeInventoryItem(data.instanceSymbol, m_NPC, count);
 }
 
 Daedalus::GameState::ItemHandle Inventory::getItem(size_t symIndex)
@@ -71,3 +79,15 @@ Daedalus::GameState::ItemHandle Inventory::getItem(size_t symIndex)
     return Daedalus::GameState::ItemHandle();
 }
 
+int Inventory::getItemCount(size_t symIndex)
+{
+	// Get script-engine
+	Logic::ScriptEngine& vm = m_Engine.getWorldInstance(m_World).getScriptEngine();
+
+	Daedalus::GameState::ItemHandle item = getItem(symIndex);
+
+	if(item.isValid())
+		return vm.getGameState().getItem(item).count[0];
+
+	return 0;
+}
diff --git a/src/logic/Inventory.h b/src/logic/Inventory.h
@@ -27,8 +27,9 @@ namespace Logic
          * @param symName Instance to remove
          * @return True, if the item was successfully removed, false if not found
          */
-        bool removeItem(const std::string& symName);
-        bool removeItem(Daedalus::GameState::ItemHandle item);
+		bool removeItem(const std::string& symName, unsigned int count = 1);
+		bool removeItem(size_t symIndex, unsigned int count = 1);
+        bool removeItem(Daedalus::GameState::ItemHandle item, unsigned int count = 1);
 
         /**
          * Returns a random instance of the given item
@@ -37,6 +38,11 @@ namespace Logic
          */
         Daedalus::GameState::ItemHandle getItem(size_t symIndex);
 
+		/**
+		 * @return Count of how many items of the given type are in this inventory
+		 */
+		int getItemCount(size_t symIndex);
+
         /**
          * @param symName Name of the symbol to get the instances from
          * @return List of handles of the given instance-name inside this inventory

diff --git a/src/logic/scriptExternals/Externals.cpp b/src/logic/scriptExternals/Externals.cpp
@@ -569,6 +569,52 @@ void ::Logic::ScriptExternals::registerEngineExternals(World::WorldInstance& wor
         vm.setReturn("");
     });
 
+	vm->registerExternalFunction("npc_hasitems", [=](Daedalus::DaedalusVM& vm){
+		uint32_t iteminstance = vm.popDataValue();
+		int32_t owner = vm.popVar();
+
+		VobTypes::NpcVobInformation npc = getNPCByInstance(owner);
+
+		if(npc.isValid())
+		{
+			int count = npc.playerController->getInventory().getItemCount(iteminstance);
+			vm.setReturn(count);
+		}
+		else
+		{
+			vm.setReturn(0);
+		}
+	});
+
+	vm->registerExternalFunction("npc_removeinvitem", [=](Daedalus::DaedalusVM& vm){
+		uint32_t iteminstance = vm.popDataValue(); 
+		uint32_t owner = vm.popVar(); 
+
+		VobTypes::NpcVobInformation npc = getNPCByInstance(owner);
+
+		if(npc.isValid())
+		{
+			int count = npc.playerController->getInventory().removeItem(iteminstance);
+		}
+
+		vm.setReturn(0);
+	});
+
+	vm->registerExternalFunction("npc_removeinvitems", [=](Daedalus::DaedalusVM& vm){
+		uint32_t amount = vm.popDataValue();
+		uint32_t iteminstance = vm.popDataValue();
+		uint32_t owner = vm.popVar();
+
+		VobTypes::NpcVobInformation npc = getNPCByInstance(owner);
+
+		if(npc.isValid())
+		{
+			int count = npc.playerController->getInventory().removeItem(iteminstance, amount);
+		}
+
+		vm.setReturn(0);
+	});
+
     vm->registerExternalFunction("ai_startstate", [=](Daedalus::DaedalusVM& vm){
         std::string wpname = vm.popString();
         int32_t statebehaviour = vm.popDataValue();