marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Producer: Allow overloading where the producer takes components from

master
Mark 2018-12-27 19:51:19 +01:00
parent 68bb07f162
commit d0756e3b1c
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Logic.ocd/Script.c
View File

@ -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()
{