From d0756e3b1c05935aec6b732211fd091b2f9ff9f1 Mon Sep 17 00:00:00 2001
From: Mark <markh4b@hotmail.com>
Date: Thu, 27 Dec 2018 19:51:19 +0100
Subject: [PATCH] Producer: Allow overloading where the producer takes
 components from

---
 .../Producer.ocd/Logic.ocd/Script.c           | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Logic.ocd/Script.c b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Logic.ocd/Script.c
index 8ca9670cc..6596710e4 100644
--- a/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Logic.ocd/Script.c
+++ b/planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Logic.ocd/Script.c
@@ -691,7 +691,7 @@ func CheckComponents(id product, bool remove)
 		{
 			for (var i = 0; i < mat_cost; i++)
 			{
-				var obj = FindObject(Find_Container(this), Find_ID(mat_id));
+				var obj = FindObject(this->Find_AvailableToProducer(), Find_ID(mat_id));
 				// First try to remove some objects from the stack.
 				if (obj->~IsStackable())
 				{
@@ -712,14 +712,14 @@ func CheckComponents(id product, bool remove)
 
 public func GetAvailableComponentAmount(id material)
 {
+	var contents = FindObjects(this->Find_AvailableToProducer(), Find_ID(material));
 	// Normal object?
 	if (!material->~IsStackable())
 	{
-		return ContentsCount(material);
+		return GetLength(contents);
 	}
 	// If not, we need to check stacked objects.
 	var real_amount = 0;
-	var contents = FindObjects(Find_Container(this), Find_ID(material));
 	for (var obj in contents)
 	{
 		var count = obj->~GetStackCount() ?? 1;
@@ -754,7 +754,7 @@ public func CheckFuel(id product, bool remove)
 	{
 		var fuel_amount = 0;
 		// Find fuel in this producer.
-		for (var fuel in FindObjects(Find_Container(this), Find_Func("IsFuel")))
+		for (var fuel in FindObjects(this->Find_AvailableToProducer(), Find_Func("IsFuel")))
 		{
 			fuel_amount += fuel->~GetFuelAmount();
 		}
@@ -765,7 +765,7 @@ public func CheckFuel(id product, bool remove)
 		else if (remove)
 		{
 			// Convert existing objects.
-			for (var fuel in FindObjects(Find_Container(this), Find_Func("IsFuel")))
+			for (var fuel in FindObjects(this->Find_AvailableToProducer(), Find_Func("IsFuel")))
 			{
 				// Extract the fuel amount from stored objects
 				var fuel_extracted = fuel->~GetFuelAmount(fuel_needed);
@@ -785,6 +785,18 @@ public func CheckFuel(id product, bool remove)
 	return true;
 }
 
+/**
+	Overloadable function, for finding objects that are available to
+	the producer (e.g. certain producers might take objects from their
+	surrounding, instead of their inventory).
+
+	Defaults to being contained in the producer.
+ */
+func Find_AvailableToProducer()
+{
+	return Find_Container(this);
+}
+
 
 func CheckForPower()
 {