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

Add user action evaluators: Logic (not, and, or, ==, !=)

qteditor
Sven Eberhardt 2016-07-31 10:36:22 -04:00
parent d1e8bc39c5
commit e57047f26a
3 changed files with 56 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
planet/Objects.ocd/Helpers.ocd/UserAction.ocd/Script.c
View File

@ -74,7 +74,7 @@ func Definition(def)
Evaluator.PlayerList = { Name="$UserPlayerList$", Type="enum", OptionKey="Function", Options = [ { Name="$Noone$" } ] };
Evaluator.Boolean = { Name="$UserBoolean$", Type="enum", OptionKey="Function", Options = [ { Name="$None$" } ] };
Evaluator.Integer = { Name="$UserInteger$", Type="enum", OptionKey="Function", Options = [ {Name="0"} ] };
Evaluator.String = { Name="$UserString$", Type="enum", OptionKey="Function", Options = [ {Name="($EmptyString$)"} ] };
Evaluator.String = { Name="$UserString$", Type="enum", OptionKey="Function", Options = [ {Name="($EmptyString$)"} ] };
Evaluator.Position = { Name="$UserPosition$", Type="enum", OptionKey="Function", Options = [ { Name="$Here$" } ] };
Evaluator.Offset = { Name="$UserOffset$", Type="enum", OptionKey="Function", Options = [ { Name="$None$" } ] };
Evaluator.Any = { Name="$UserAny$", Type="enum", OptionKey="Function", Options = [ { Name="$None$" } ] };
@ -167,6 +167,14 @@ func Definition(def)
] },
RightOperand = new Evaluator.Integer { Name="$RightOperand$", EditorHelp="$RightOperandHelp$" }
} } );
AddEvaluator("Boolean", "$Comparison$", "$CompareBoolean$", "$ComparisonHelp$", "compare_bool", [def, def.EvalComparison, "Boolean"], { }, { Type="proplist", Display="{{LeftOperand}}{{Operator}}{{RightOperand}}", ShowFullName=true, EditorProps = {
LeftOperand = new Evaluator.Object { Name="$LeftOperand$", EditorHelp="$LeftOperandHelp$" },
Operator = { Type="enum", Name="$Operator$", EditorHelp="$OperatorHelp$", Options = [
{ Name="==", EditorHelp="$EqualHelp$" },
{ Name="!=", EditorHelp="$NotEqualHelp$", Value="ne" },
] },
RightOperand = new Evaluator.Object { Name="$RightOperand$", EditorHelp="$RightOperandHelp$" }
} } );
AddEvaluator("Boolean", "$Comparison$", "$CompareObject$", "$ComparisonHelp$", "compare_object", [def, def.EvalComparison, "Object"], { }, { Type="proplist", Display="{{LeftOperand}}{{Operator}}{{RightOperand}}", ShowFullName=true, EditorProps = {
LeftOperand = new Evaluator.Object { Name="$LeftOperand$", EditorHelp="$LeftOperandHelp$" },
Operator = { Type="enum", Name="$Operator$", EditorHelp="$OperatorHelp$", Options = [
@ -199,6 +207,13 @@ func Definition(def)
] },
RightOperand = new Evaluator.Player { Name="$RightOperand$", EditorHelp="$RightOperandHelp$" }
} } );
AddEvaluator("Boolean", "$Logic$", "$Not$", "$NotHelp$", "not", [def, def.EvalBool_Not], { }, new Evaluator.Boolean { }, "Operand");
AddEvaluator("Boolean", "$Logic$", "$And$", "$AndHelp$", "and", [def, def.EvalBool_And], { Operands=[] }, { Type="proplist", DescendPath="Operands", Display="{{Operands}}", EditorProps = {
Operands = { Name="$Operands$", Type="array", Elements=Evaluator.Boolean }
} } );
AddEvaluator("Boolean", "$Logic$", "$Or$", "$OrHelp$", "or", [def, def.EvalBool_Or], { Operands=[] }, { Type="proplist", DescendPath="Operands", Display="{{Operands}}", EditorProps = {
Operands = { Name="$Operands$", Type="array", Elements=Evaluator.Boolean }
} } );
AddEvaluator("Boolean", nil, "$ObjectExists$", "$ObjectExistsHelp$", "object_exists", [def, def.EvalBool_ObjectExists], { }, new Evaluator.Object { }, "Object");
// Integer evaluators
AddEvaluator("Integer", nil, ["$Constant$", ""], "$ConstantHelp$", "int_constant", [def, def.EvalConstant], { Value=0 }, { Type="int", Name="$Value$" });
@ -300,7 +315,7 @@ public func AddEvaluator(string eval_type, string group, name, string help, stri
{
var any_group;
if (group) any_group = Format("%s/%s", EvaluatorTypeNames[eval_type], group); else any_group = EvaluatorTypeNames[eval_type];
AddEvaluator("Any", any_group, name, help, identifier, callback_data, default_val, delegate);
AddEvaluator("Any", any_group, name, help, identifier, callback_data, default_val, delegate, delegate_storage_key);
}
// Dissect parameters
if (group) group = GroupNames[group] ?? group; // resolve localized group name
@ -323,7 +338,7 @@ public func AddEvaluator(string eval_type, string group, name, string help, stri
default_val = Call(default_get);
}
default_val.Function = identifier;
var action_def = { Name=name, ShortName=short_name, EditorHelp=help, Group=group, Value=default_val, OptionKey="Function", Delegate=delegate, Get=default_get }, n;
var action_def = { Name=name, ShortName=short_name, EditorHelp=help, Group=group, Value=default_val, Delegate=delegate, Get=default_get }, n;
if (delegate)
{
if (delegate.EditorProps || delegate.Elements)
@ -499,6 +514,24 @@ private func EvalComparison(proplist props, proplist context, data_type)
return left >= right;
}
private func EvalBool_Not(proplist props, proplist context) { return !EvaluateValue("Boolean", props.Operand, context); }
private func EvalBool_And(proplist props, proplist context)
{
for (cond in props.Operands)
if (!EvaluateValue("Boolean", cond, context))
return false;
return true;
}
private func EvalBool_Or(proplist props, proplist context)
{
for (cond in props.Operands)
if (EvaluateValue("Boolean", cond, context))
return true;
return false;
}
private func EvalBool_ObjectExists(proplist props, proplist context) { return !!EvaluateValue("Object", props.Object, context); }
private func EvalDef_TypeOfObject(proplist props, proplist context)

12
planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblDE.txt
View File

@ -4,8 +4,7 @@ UserPlayer=Spieler
UserPlayerList=Spieler
UserInteger=Zahl
UserString=Text
UserBoolean=Bedingung
UserCondition=Bedingung
UserBoolean=Wahrheitswert
UserDefinition=Objekttyp
UserPosition=Position
UserOffset=Verschiebung
@ -170,6 +169,7 @@ LessOrEqualHelp=Wahr, wenn der linke Operand kleiner oder gleich dem rechten Ope
GreaterOrEqualHelp=Wahr, wenn der linke Operand groesser oder gleich dem rechten Operanden ist
RightOperand=Rechter Operand
RightOperandHelp=Wert rechts vom Vergleichsoperator
CompareBoolean=Vergleiche Wahrheitswert
CompareObject=Vergleiche Objekte
CompareString=Vergleiche Texte
CompareDefinition=Vergleiche Objekttypen
@ -204,3 +204,11 @@ ScriptCommand=Script
ScriptCommandHelp=Scriptzeile, die auszufuehren ist. Nur ein Befehl.
ScriptContextHelp=Ausfuehrungskontext fuer dieses Script.
EmptyString=kein Text
Logic=Logik
Not=Nicht
NotHelp=Negiert den Operanden.
And=Und
AndHelp=Wahr, wenn alle Operanden wahr sind.
Operands=Operanden
Or=Oder
OrHelp=Wahr, wenn mindestens einer der Operanden wahr ist.

12
planet/Objects.ocd/Helpers.ocd/UserAction.ocd/StringTblUS.txt
View File

@ -4,8 +4,7 @@ UserPlayer=Player
UserPlayerList=Players
UserInteger=Integer
UserString=Text
UserBoolean=Condition
UserCondition=Condition
UserBoolean=Boolean
UserDefinition=Object type
UserPosition=Position
UserOffset=Offset
@ -170,6 +169,7 @@ LessOrEqualHelp=True if the left operand is smaller than or equal to the right o
GreaterOrEqualHelp=True if the left operand is smaller than or equal to the right operand.
RightOperand=Right operand
RightOperandHelp=Value right of the comparison operator.
CompareBoolean=Compare boolean
CompareObject=Compare objects
CompareString=Compare texts
CompareDefinition=Compare object types
@ -204,3 +204,11 @@ ScriptCommand=Script
ScriptCommandHelp=Script line to execute. One command only.
ScriptContextHelp=Execution context for the script.
EmptyString=no text
Logic=Logic
Not=Not
NotHelp=Negates the operand.
And=And
AndHelp=True if all operands are true.
Operands=Operands
Or=Or
OrHelp=True if at least one operand is true.