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

Removed liquid container logic from pump. 

Previously, sharing the logic made sense, because both objects used variables to store the liquid. Now, the liquid container stores liquid in an object - this is not desirable in the pump because it would create and remove objects for no good reason (only so that it has a virtual liquid storage) every time it pumps. Consequently, liquid objects cannot enter a pump anymore.
liquid_container
Mark 2016-02-26 23:17:38 +01:00
parent fa0af84686
commit 52884fb685
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.ocd/Libraries.ocd/LiquidControl.ocd/Liquid.ocd/Script.c
View File

@ -46,7 +46,7 @@ protected func RejectEntrance(object into)
func CannotEnter(object into)
{
// Enters liquid containers only, will be removed anyway if the liquid object is "empty"
if (into->~IsLiquidContainer() || into->~IsLiquidPump())
if (into->~IsLiquidContainer())
{
return !(into->TransferLiquidItem(this));
}

37
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
View File

@ -29,29 +29,13 @@ local power_used; // the amount of power currently consumed or (if negative) pro
local clog_count; // increased when the pump doesn't find liquid or can't insert it. When it reaches max_clog_count, it will put the pump into temporary idle mode.
local max_clog_count = 5; // note that even when max_clog_count is reached, the pump will search through offsets (but in idle mode)
local stored_material_name; //contained liquid
local stored_material_amount;
/** This object is a liquid pump, thus pipes can be connected. */
public func IsLiquidPump() { return true; }
public func IsLiquidContainer() { return false; }
public func LiquidContainerAccepts(string liquid_name){ return !!GetSourceObject();} // Pump accepts every liquid as long as it has a source object.
public func TransferLiquidItem(object source)
{
if (source && source.IsLiquid != nil)
{
if (!GetLiquidItem())
{
SetLiquidItem(source);
}
else
{
var extracted = source->RemoveLiquid(nil, nil, this);
PutLiquid(extracted[0], extracted[1]);
}
return true;
}
return false;
}
public func IsLiquidTank() { return false; }
public func HasLiquidDisplay(){ return false;}
// The pump is rather complex for players. If anything happened, tell it to the player via the interaction menu.
@ -304,7 +288,7 @@ protected func Pumping()
var pump_ok = true;
// is empty? -> try to get liquid
if (!GetLiquidType())
if (!stored_material_name)
{
// get new materials
var source_obj = GetSourceObject();
@ -313,8 +297,8 @@ protected func Pumping()
// no material to pump?
if (mat)
{
SetLiquidType(mat[0]);
SetLiquidFillLevel(mat[1]);
stored_material_name = mat[0];
stored_material_amount = mat[1];
}
else
{
@ -324,11 +308,11 @@ protected func Pumping()
}
if (pump_ok)
{
var i = GetLiquidFillLevel();
var i = stored_material_amount;
while (i > 0)
{
var drain_obj = GetDrainObject();
if (this->InsertMaterialAtDrain(drain_obj, GetLiquidType(), 1))
if (this->InsertMaterialAtDrain(drain_obj, stored_material_name, 1))
{
i--;
}
@ -340,7 +324,10 @@ protected func Pumping()
break;
}
}
SetLiquidFillLevel(i);
stored_material_amount = i;
if (stored_material_amount <= 0)
stored_material_name = nil;
}
if (pump_ok)