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

Sequence: Add "<" operator to contents count trigger

qteditor
Sven Eberhardt 2016-08-13 23:24:33 -04:00
parent abef0da0aa
commit 4a94c3598b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
planet/Objects.ocd/Helpers.ocd/Sequence.ocd/Script.c
View File

@ -365,6 +365,10 @@ public func Definition(def)
Container = { Name="$Container$", EditorHelp="$CountContainerHelp$", Type="object" },
ID = { Name="$ID$", EditorHelp="$CountIDHelp$", Type="def", EmptyName="$AnyID$" },
Count = { Name="$Count$", Type="int", Min=1 }
Operation = { Name="$Operation$", EditorHelp="$CountOperationHelp$", Type="enum", Options = [
{ Name="$GreaterEqual$", EditorHelp="$GreaterEqualHelp$" },
{ Name="$LessThan$", EditorHelp="$LessThanHelp$", Value="lt" }
] }
} } },
{ Name="$Interval$", EditorHelp="$IntervalHelp$", Value={ Trigger="interval", Interval=60 }, ValueKey="Interval", Delegate={ Name="$IntervalTime$", Type="int", Min=1, Set="SetIntervalTimer", SetRoot=true } },
{ Name="$GameStart$", Value={ Trigger="game_start" } },
@ -543,9 +547,14 @@ private func EnterRegionTimer()
private func CountContainedObjectsTimer()
{
if (trigger.Container && trigger.Container->ContentsCount(trigger.ID) >= trigger.Count)
if (trigger.Container)
{
OnTrigger(nil, NO_OWNER);
var n = trigger.Container->ContentsCount(trigger.ID), f;
if (!trigger.Operation)
f = (n >= trigger.Count); // Operation == nil: greater than
else
f = (n < trigger.Count); // Operation == "lt": less than
if (f) OnTrigger(nil, NO_OWNER);
}
}