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

improve friendly fire rule to allow inclusion of objects

alut-include-path
Maikel de Vries 2017-01-15 14:58:25 +01:00
parent d1c0750095
commit 1f5f34b559
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
planet/Objects.ocd/Goals.ocd/Defense.ocd/DefenseBoomAttack.ocd/Script.c
View File

@ -10,6 +10,8 @@ public func Construction()
{
SetAction("Fly");
SetComDir(COMD_None);
// Notify friendly fire rule.
GameCallEx("OnCreationRuleNoFF", this);
// Add flight effects.
CreateEffect(FxFlightRotation, 100, 1);
CreateEffect(FxFlight, 100, 10);
@ -145,6 +147,12 @@ private func DoFireworks(int killed_by)
return;
}
public func Destruction()
{
// Notify friendly fire rule.
GameCallEx("OnDestructionRuleNoFF", this);
}
public func HasNoNeedForAI() { return true; }
@ -166,3 +174,4 @@ local Name = "$Name$";
local Description = "$Description$";
local ContactCalls = true;
local FlySpeed = 100;
local HasNoFriendlyFire = true;

16
planet/Objects.ocd/Rules.ocd/NoFriendlyFire.ocd/Script.c
View File

@ -14,7 +14,7 @@ public func Initialize()
return;
// Find all crew members and protect them from friendly fire.
for (var crew in FindObjects(Find_OCF(OCF_CrewMember)))
for (var crew in FindObjects(Find_Or(Find_OCF(OCF_CrewMember), Find_Property("HasNoFriendlyFire"))))
DisableFriendlyFire(crew);
return;
}
@ -26,7 +26,7 @@ public func Destruction()
return;
// Find all crew members and allow friendly fire.
for (var crew in FindObjects(Find_OCF(OCF_CrewMember)))
for (var crew in FindObjects(Find_Or(Find_OCF(OCF_CrewMember), Find_Property("HasNoFriendlyFire"))))
EnableFriendlyFire(crew);
return;
}
@ -37,6 +37,12 @@ public func OnClonkRecruitment(object clonk, int plr)
return;
}
public func OnCreationRuleNoFF(object obj)
{
DisableFriendlyFire(obj);
return;
}
public func OnClonkDerecruitment(object clonk, int plr)
{
EnableFriendlyFire(clonk);
@ -49,6 +55,12 @@ public func OnClonkDeath(object clonk, int killed_by)
return;
}
public func OnDestructionRuleNoFF(object obj)
{
EnableFriendlyFire(obj);
return;
}
/*-- Friendly Fire --*/