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

Connection in Liquid Tank 

The liquid tank can connect and deconnect lines properly now
liquid_container
Mark 2016-02-04 22:18:40 +01:00
parent 97bdd342fc
commit cc2b0aa15b
2 changed files with 83 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,15 @@ public func IsToolProduct() { return true; }
/** Will connect power line to building at the clonk's position. */
protected func ControlUse(object clonk, int x, int y)
{
// Is this already connected to a liquid pump?
var pipe = GetConnectedPipe();
if (pipe) return ConnectPipeToLiquidTank(clonk, pipe);
return ConnectPipeToPump(clonk);
// try connecting to a liquid tank first
if (ConnectPipeToLiquidTank(clonk, nil))
{
return true;
}
else
{
return ConnectPipeToPump(clonk);
}
}
func CanConnectToLiquidPump()
@ -35,6 +39,18 @@ func CanConnectToLiquidPump()
return PipeState == nil;
}
func CanConnectToLiquidTank(string pipe_state)
{
if (pipe_state == nil)
{
return PipeState != nil;
}
else
{
return PipeState == pipe_state;
}
}
func ConnectPipeToPump(object clonk)
{
// Is there an object which accepts pipes?
@ -59,26 +75,43 @@ func ConnectPipeToPump(object clonk)
}
func ConnectPipeToLiquidTank(object clonk, object pipe)
func ConnectPipeToLiquidTank(object clonk, object tank)
{
// Is this already connected to a liquid pump?
var pipe = GetConnectedPipe();
if (!pipe) return false;
// Is there an object that accepts pipes?
var tank = FindObject(Find_AtPoint(), Find_Func("IsLiquidTank"));
if (!tank) tank = FindObject(Find_AtPoint(), Find_Func("IsLiquidTank"));
if (!tank)
{
clonk->Message("$MsgNoNewPipeToTank$");
return true;
}
if (PipeState == PIPE_STATE_Source && tank->QueryConnectSourcePipe(pipe))
if (PipeState == PIPE_STATE_Source)
{
clonk->Message("$MsgHasSourcePipe$");
return true;
if (tank->QueryConnectSourcePipe(pipe))
{
clonk->Message("$MsgHasSourcePipe$");
return true;
}
tank->SetSourcePipe(pipe);
}
else if (PipeState == PIPE_STATE_Drain && tank->QueryConnectDrainPipe(pipe))
else if (PipeState == PIPE_STATE_Drain)
{
clonk->Message("$MsgHasDrainPipe$");
return true;
if (tank->QueryConnectDrainPipe(pipe))
{
clonk->Message("$MsgHasDrainPipe$");
return true;
}
tank->SetDrainPipe(pipe);
}
else
{
FatalError("This code should never be reached");
}
pipe->SwitchConnection(this, tank);

94
planet/Objects.ocd/Libraries.ocd/Structures.ocd/Tank.ocd/Script.c
View File

@ -105,15 +105,27 @@ public func GetInteractionMenus(object clonk)
func CanConnectPipe(){ return this->CanConnectSourcePipe() || this->CanConnectDrainPipe();}
func FindAvailablePipe(object container, string pipe_state)
{
for (var pipe in FindObjects(Find_ID(Pipe), Find_Container(container), Find_Func("CanConnectToLiquidTank", pipe_state)))
{
if (!pipe_state
|| pipe_state == PIPE_STATE_Drain && !QueryConnectDrainPipe(pipe)
|| pipe_state == PIPE_STATE_Source && !QueryConnectSourcePipe(pipe))
return pipe;
}
return nil;
}
func CanConnectDrainPipe(){ return false;}
func CanConnectSourcePipe(){ return false;}
func QueryConnectDrainPipe()
func QueryConnectDrainPipe(object pipe)
{
return !this->CanConnectDrainPipe() || GetDrainPipe();
}
func QueryConnectSourcePipe()
func QueryConnectSourcePipe(object pipe)
{
return !this->CanConnectSourcePipe() || GetSourcePipe();
}
@ -154,46 +166,23 @@ public func GetPipeControlMenuEntries(object clonk)
image = {Prototype = lib_tank.custom_entry.image, Symbol = Pipe}
}});
var index = 0;
var source_pipe = FindAvailablePipe(clonk, PIPE_STATE_Source);
var drain_pipe = FindAvailablePipe(clonk, PIPE_STATE_Drain);
if (GetSourcePipe())
PushBack(menu_entries, GetTankMenuEntry(Icon_Cancel, "$MsgCutSource$", ++index, LIBRARY_TANK_Menu_Action_Cut_Source));
for (var pipe in FindSourcePipes(clonk))
{
PushBack(menu_entries, GetTankMenuEntry(pipe, "$MsgConnectSource$", ++index, LIBRARY_TANK_Menu_Action_Add_Source));
}
PushBack(menu_entries, GetTankMenuEntry(Icon_Cancel, "$MsgCutSource$", 1, LIBRARY_TANK_Menu_Action_Cut_Source));
else if (source_pipe)
PushBack(menu_entries, GetTankMenuEntry(source_pipe, "$MsgConnectSource$", 1, LIBRARY_TANK_Menu_Action_Add_Source));
if (GetDrainPipe())
PushBack(menu_entries, GetTankMenuEntry(Icon_Cancel, "$MsgCutDrain$", ++index, LIBRARY_TANK_Menu_Action_Cut_Drain));
for (var pipe in FindDrainPipes(clonk))
{
PushBack(menu_entries, GetTankMenuEntry(pipe, "$MsgConnectDrain$", ++index, LIBRARY_TANK_Menu_Action_Add_Drain));
}
//var entry_source_pipe = GetSourceMenuEntry(clonk);
//var entry_drain_pipe = GetDrainMenuEntry(clonk);
//if (entry_source_pipe) PushBack(menu_entries, entry_source_pipe);
//if (entry_drain_pipe) PushBack(menu_entries, entry_drain_pipe);
PushBack(menu_entries, GetTankMenuEntry(Icon_Cancel, "$MsgCutDrain$", 2, LIBRARY_TANK_Menu_Action_Cut_Drain));
else if (drain_pipe)
PushBack(menu_entries, GetTankMenuEntry(drain_pipe, "$MsgConnectDrain$", 2, LIBRARY_TANK_Menu_Action_Add_Drain));
return menu_entries;
}
func FindSourcePipes(object container)
{
return FindObjects(Find_ID(Pipe), Find_Container(container), Find_Func("CanConnectAsSourcePipe"));
}
func FindDrainPipes(object container)
{
return FindObjects(Find_ID(Pipe), Find_Container(container), Find_Func("CanConnectAsDrainPipe"));
}
func GetTankMenuEntry(symbol, string text, int priority, extra_data)
{
return {symbol = symbol, extra_data = extra_data,
@ -222,43 +211,32 @@ public func OnPipeControlHover(id symbol, string action, desc_menu_target, menu_
public func OnPipeControl(symbol_or_object, string action, bool alt)
{
if (action == LIBRARY_TANK_Menu_Action_Add_Source)
this->DoConnectSourcePipe(symbol_or_object);
this->DoConnectPipe(symbol_or_object, PIPE_STATE_Source);
else if (action == LIBRARY_TANK_Menu_Action_Cut_Source)
this->DoCutSourcePipe();
this->DoCutPipe(GetSourcePipe());
else if (action == LIBRARY_TANK_Menu_Action_Add_Drain)
this->DoConnectDrainPipe(symbol_or_object);
this->DoConnectPipe(symbol_or_object, PIPE_STATE_Drain);
else if (action == LIBRARY_TANK_Menu_Action_Cut_Drain)
this->DoCutDrainPipe();
this->DoCutPipe(GetDrainPipe());
UpdateInteractionMenus(this.GetPipeControlMenuEntries);
}
func DoConnectSourcePipe(object pipe)
func DoConnectPipe(object pipe, string pipe_state)
{
pipe->ConnectTo(pipe->Contained(), this, PIPE_STATE_Source);
var clonk = pipe->Contained();
pipe->ConnectPipeToLiquidTank(clonk, this);
}
func DoConnectDrainPipe(object pipe)
func DoCutPipe(object pipe_line)
{
pipe->ConnectTo(pipe->Contained(), this, PIPE_STATE_Drain);
}
func DoCutSourcePipe()
{
DoCutPipe(GetSourcePipe());
}
func DoCutDrainPipe()
{
DoCutPipe(GetDrainPipe());
}
func DoCutPipe(object pipe)
{
if (pipe)
if (pipe_line)
{
var pipe_kit = pipe->GetPipeKit();
var pipe_kit = pipe_line->GetPipeKit();
pipe_kit->CutConnection(this);
// pipe objects have to be reset!
if (pipe_line == GetDrainPipe()) SetDrainPipe();
if (pipe_line == GetSourcePipe()) SetSourcePipe();
}
}