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

dynamite after fusing not collectible, but can be put into containers

issue1247
Maikel de Vries 2015-01-07 20:05:17 +01:00
parent e1d1d540c7
commit 0ecd30ad9e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
View File

@ -71,10 +71,13 @@ private func Place(object clonk, int x, int y, bool box)
public func Fuse()
{
if(GetAction() != "Fuse")
if (GetAction() != "Fuse")
{
if(!FindObject(Find_Category(C4D_StaticBack), Find_Func("IsFuse"), Find_ActionTargets(this))) Sound("Fuse");
if (!FindObject(Find_Category(C4D_StaticBack), Find_Func("IsFuse"), Find_ActionTargets(this)))
Sound("Fuse");
SetAction("Fuse");
// Object can't be collected anymore when it fuses.
this.Collectible = false;
}
}
@ -101,7 +104,7 @@ protected func Incineration() { Extinguish(); Fuse(); }
protected func RejectEntrance()
{
return GetAction() == "Fuse" || GetAction() == "Ready";
return GetAction() == "Ready";
}
// Controle of the Dynamite box
@ -113,11 +116,15 @@ public func SetReady()
public func SetFuse()
{
SetAction("Fuse");
// Object can't be collected anymore when it fuses.
this.Collectible = false;
}
public func Reset()
{
SetAction("Idle");
// Object can be collected again.
this.Collectible = true;
}
private func Fusing()