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

properly implement air pumping: no source needed, only pump on air need

ipv6
Maikel de Vries 2016-12-25 18:53:43 +01:00
parent 42c8dbc2c8
commit 525caa069a
6 changed files with 98 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
planet/Objects.ocd/Items.ocd/Tools.ocd/DivingHelmet.ocd/Script.c
View File

@ -29,15 +29,24 @@ func Hit()
// Called by a connected pump
public func OnAirPumped(object pump)
{
if (IsWorn())
if (Contained())
{
// If nearly max breath just keep the level
if (Contained()->~GetBreath() >= Contained()->~GetMaxBreath() - 10)
Contained()->DoBreath(3);
else // Slowly fill up breath
Contained()->DoBreath(4);
}
var wearer = Contained();
if (wearer && IsWorn())
{
// If nearly max breath just keep the level
if (wearer->~GetBreath() >= wearer->~GetMaxBreath() - 10)
wearer->DoBreath(3);
else // Slowly fill up breath
wearer->DoBreath(4);
}
}
// Return whether the helmet needs air.
public func QueryAirNeed(object pump)
{
var wearer = Contained();
if (wearer && IsWorn())
return wearer->~GetBreath() < wearer->~GetMaxBreath();
return false;
}
public func OnPipeLengthChange()
@ -162,6 +171,7 @@ public func QueryConnectPipe(object pipe)
}
}
/*-- Interaction --*/
public func HasInteractionMenu() { return true; }
@ -181,7 +191,6 @@ public func GetInteractionMenus(object clonk)
Priority = 30
};
PushBack(menus, pipe_menu);
return menus;
}

10
planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
View File

@ -140,10 +140,12 @@ func IsDroppedOnDeath(object clonk)
/* ---------- Pipe States ---------- */
public func IsNeutralPipe(){ return pipe_state == PIPE_STATE_Neutral; }
public func IsDrainPipe(){ return pipe_state == PIPE_STATE_Drain; }
public func IsSourcePipe(){ return pipe_state == PIPE_STATE_Source; }
public func IsAirPipe(){ return pipe_state == PIPE_STATE_Air; }
public func IsNeutralPipe() { return pipe_state == PIPE_STATE_Neutral; }
public func IsDrainPipe() { return pipe_state == PIPE_STATE_Drain; }
public func IsSourcePipe() { return pipe_state == PIPE_STATE_Source; }
public func IsAirPipe() { return pipe_state == PIPE_STATE_Air; }
public func GetPipeState() { return pipe_state; }
public func SetNeutralPipe()
{

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

@ -46,7 +46,7 @@ public func IsLiquidTank() { return false; }
// The pump is rather complex for players. If anything happened, tell it to the player via the interaction menu.
local last_status_message;
func Construction()
public func Construction()
{
// Rotate at a 45 degree angle towards viewer and add a litte bit of Random
this.MeshTransformation = Trans_Rotate(50 + RandomX(-10, 10), 0, 1, 0);
@ -56,7 +56,7 @@ func Construction()
public func IsHammerBuildable() { return true; }
func Initialize()
public func Initialize()
{
switched_on = true;
var start = 0;
@ -114,7 +114,7 @@ public func GetPumpControlMenuEntries(object clonk)
return menu_entries;
}
func GetPumpMenuEntry(proplist custom_entry, symbol, string text, int priority, extra_data)
public func GetPumpMenuEntry(proplist custom_entry, symbol, string text, int priority, extra_data)
{
return {symbol = symbol, extra_data = extra_data,
custom =
@ -182,7 +182,7 @@ private func SetInfoMessage(string msg)
/*-- Pipe control --*/
func QueryConnectPipe(object pipe)
public func QueryConnectPipe(object pipe)
{
if (GetDrainPipe() && GetSourcePipe())
{
@ -208,7 +208,7 @@ func QueryConnectPipe(object pipe)
}
func OnPipeConnect(object pipe, string specific_pipe_state)
public func OnPipeConnect(object pipe, string specific_pipe_state)
{
if (PIPE_STATE_Source == specific_pipe_state)
{
@ -251,9 +251,9 @@ func OnPipeConnect(object pipe, string specific_pipe_state)
}
}
func OnPipeDisconnect(object pipe)
public func OnPipeDisconnect(object pipe)
{
_inherited(pipe);
_inherited(pipe, ...);
if (!pipe->IsAirPipe())
pipe->SetNeutralPipe();
@ -261,10 +261,9 @@ func OnPipeDisconnect(object pipe)
CheckState();
}
public func SetSourcePipe(object pipe)
{
_inherited(pipe);
_inherited(pipe, ...);
CheckState();
}
@ -324,15 +323,17 @@ protected func Pumping()
// something went wrong in the meantime?
// let the central function handle that on next check
if (!GetSourcePipe())
if (!GetSourcePipe() && !IsAirPipeConnected())
return;
// Get the drain object.
var drain_obj = GetDrainObject();
// Don't do anything special if pumping air but inform the drain object
// Don't do anything special if pumping air but inform the drain object.
if (IsAirPipeConnected())
{
if (!GetAirSourceOk() || !GetAirDrainOk())
return SetState("WaitForLiquid");
if (drain_obj)
drain_obj->~OnAirPumped(this);
return;
@ -414,7 +415,7 @@ func ExtractMaterialFromSource(object source_obj, int amount)
}
// interface for the insertion logic
func InsertMaterialAtDrain(object drain_obj, string material_name, int amount)
public func InsertMaterialAtDrain(object drain_obj, string material_name, int amount)
{
// insert material into containers, if possible
if (drain_obj->~IsLiquidContainer())
@ -438,12 +439,13 @@ func InsertMaterialAtDrain(object drain_obj, string material_name, int amount)
/** Re check state and change the state if needed */
func CheckState()
public func CheckState()
{
var is_fullcon = GetCon() >= 100;
var can_pump = GetSourcePipe() && is_fullcon && switched_on;
// The pump can work without source if it needs to supply air.
var can_pump = (GetSourcePipe() || IsAirPipeConnected()) && is_fullcon && switched_on;
// can't pump at all -> wait
// Can't pump at all -> wait.
if (!can_pump)
{
if (!GetSourcePipe() && switched_on)
@ -457,9 +459,14 @@ func CheckState()
SetInfoMessage("$StateNoAir$");
SetState("WaitForLiquid");
}
else if (!GetAirDrainOk())
{
SetInfoMessage("$StateNoAirNeed$");
SetState("WaitForLiquid");
}
else
{
// can pump, has air but has no power -> wait for power
// Can pump, has air but has no power -> wait for power.
if (!powered)
{
SetInfoMessage("$StateNoPower$");
@ -660,18 +667,25 @@ private func GetLiquidDrainOk(string liquid)
return true;
}
// Returns whether the drain is in free air.
func GetAirSourceOk()
// Returns whether the source (or alternatively the pump itself) is in free air.
public func GetAirSourceOk()
{
var source_obj = GetSourceObject();
if (!source_obj) return false;
if (!source_obj)
return !GBackSemiSolid();
var is_air = !source_obj->GBackSemiSolid(source_obj.ApertureOffsetX, source_obj.ApertureOffsetY);
if (!is_air)
{
source_obj->~CycleApertureOffset(this);
return is_air;
}
// Returns whether the other side of air drain is in need of air.
public func GetAirDrainOk()
{
var drain_obj = GetDrainObject();
if (!drain_obj)
return false;
}
return true;
return drain_obj->~QueryAirNeed(this);
}
// Set the state of the pump, retaining the animation position and updating the power usage.

1
planet/Objects.ocd/Structures.ocd/Pump.ocd/StringTblDE.txt
View File

@ -20,6 +20,7 @@ StateNoInput=Es gibt keine Flüssigkeiten zu pumpen.
StateNoOutput=Der Abfluss ist verstopft.
StateNoPower=Die Pumpe hat keinen Strom.
StateNoAir=Der Luftzufluss ist verstopft.
StateNoAirNeed=Es gibt keinen Luftbedarf.
StateTurnedOff=Die Pumpe wurde ausgeschaltet.
MsgSourcePipeProhibited=Zuflussrohre können nicht an die Pumpe angeschlossen werden.

1
planet/Objects.ocd/Structures.ocd/Pump.ocd/StringTblUS.txt
View File

@ -20,6 +20,7 @@ StateNoInput=The pump does not have liquid to pump.
StateNoOutput=The drain pipe is clogged.
StateNoPower=The pump does not have power.
StateNoAir=The air source pipe is clogged.
StateNoAirNeed=There is no need for air.
StateTurnedOff=The pump has been turned off.
MsgSourcePipeProhibited=Unable to connect source pipe.

36
planet/Tests.ocf/LiquidSystem.ocs/Script.c
View File

@ -22,7 +22,7 @@ protected func Initialize()
CreateObject(Rule_NoPowerNeed);
// Create a script player for some tests.
script_plr = nil;
CreateScriptPlayer("PowerBuddy", RGB(0, 0, 255), nil, CSPF_NoEliminationCheck);
CreateScriptPlayer("Buddy", RGB(0, 0, 255), nil, CSPF_NoEliminationCheck);
return;
}
@ -282,6 +282,40 @@ global func Test3_OnFinished()
}
global func Test4_OnStart(int plr)
{
RemoveAll(Find_ID(Rule_NoPowerNeed));
var engine = CreateObjectAbove(SteamEngine, 40, 160, plr);
engine->CreateContents(Coal, 10);
var pump = CreateObjectAbove(Pump, 84, 160, plr);
var helmet = GetCursor(plr)->CreateContents(DivingHelmet);
var drain = CreateObjectAbove(Pipe, 240, 100, plr);
drain->ConnectPipeTo(helmet);
drain->ConnectPipeTo(pump, drain->GetPipeState());
// Log what the test is about.
Log("Test air supply to diving helmet.");
return true;
}
global func Test4_Completed()
{
if (ObjectCount(Find_ID(DivingHelmet), Find_NoContainer()) >= 1)
return true;
return false;
}
global func Test4_OnFinished()
{
RemoveAll(Find_Or(Find_ID(DivingHelmet), Find_ID(Pump), Find_ID(Pipe), Find_ID(SteamEngine)));
RestoreWaterLevels();
CreateObject(Rule_NoPowerNeed);
return;
}
/*-- Helper Functions --*/
global func RestoreWaterLevels()