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

Add UserAction conditional value evaluator 

i.e. operator ? :
console-destruction
Sven Eberhardt 2016-08-29 00:32:52 -04:00
parent bda3cb5640
commit cc2f626063
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ func Definition(def)
Players = Evaluator.PlayerList,
ID = Evaluator.Definition
} } );
AddEvaluator("Action", "$Script$", "$ConditionalAction$", "$ConditionalActionHelp$", "if", [def, def.EvalAct_If, "Action"], { }, { Type="proplist", Display="if({{Condition}}) {{TrueEvaluator}} else {{FalseEvaluator}}", EditorProps = {
AddEvaluator("Action", "$Script$", "$ConditionalAction$", "$ConditionalActionHelp$", "if", [def, def.EvalAct_If], { }, { Type="proplist", Display="if({{Condition}}) {{TrueEvaluator}} else {{FalseEvaluator}}", EditorProps = {
Condition = new Evaluator.Boolean { Name="$Condition$", EditorHelp="$IfConditionHelp$", Priority=60 },
TrueEvaluator = new Evaluator.Action { Name="$TrueEvaluator$", EditorHelp="$TrueEvaluatorHelp$", Priority=50 },
FalseEvaluator = new Evaluator.Action { Name="$FalseEvaluator$", EditorHelp="$FalseEvaluatorHelp$", Priority=30 }
@ -394,6 +394,11 @@ func Definition(def)
if (eval_type != "Action")
{
AddEvaluator(eval_type, nil, "$Variable$", "$VariableHelp$", Format("%s_variable", eval_type), [def, def.EvalVariable, data_type], { VariableName={ Function="string_constant", Value="" } }, variable_delegate);
AddEvaluator(eval_type, nil, "$ConditionalValue$", "$ConditionalValueHelp$", Format("%s_conditional", eval_type), [def, def.EvalConditionalValue, eval_type], { }, { Type="proplist", HideFullName=true, Display="{{Condition}} ? {{TrueEvaluator}} : {{FalseEvaluator}}", EditorProps = {
Condition = new Evaluator.Boolean { Name="$Condition$", EditorHelp="$IfConditionValueHelp$", Priority=60 },
TrueEvaluator = new Evaluator[eval_type] { Name="$TrueEvaluatorValue$", EditorHelp="$TrueEvaluatorValueHelp$", Priority=50 },
FalseEvaluator = new Evaluator[eval_type] { Name="$FalseEvaluatorValue$", EditorHelp="$FalseEvaluatorValueHelp$", Priority=30 }
} } );
}
else
{
@ -968,12 +973,23 @@ private func EvalAct_ObjectCallInt(proplist props, proplist context, func call_f
obj->Call(call_fn, parameter);
}
private func EvalAct_If(proplist props, proplist context, eval_type)
private func EvalAct_If(proplist props, proplist context)
{
// Do evaluation on first pass. After that, take context value.
var sid = props._sequence_id;
if (!sid) sid = props._sequence_id = Format("%d", ++UserAction_SequenceIDs);
if (context.sequence_progress[sid] = context.sequence_progress[sid] ?? !!EvaluateValue("Boolean", props.Condition, context))
return EvaluateValue("Action", props.TrueEvaluator, context);
else
return EvaluateValue("Action", props.FalseEvaluator, context);
// Only keep conditional value within a held action
if (!context.hold) context.sequence_progress[sid] = nil;
}
private func EvalConditionalValue(proplist props, proplist context, eval_type)
{
// Return value by condition
if (EvaluateValue("Boolean", props.Condition, context))
return EvaluateValue(eval_type, props.TrueEvaluator, context);
else
return EvaluateValue(eval_type, props.FalseEvaluator, context);

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

@ -350,4 +350,11 @@ Ring=Ring
LastUsePosition=Aktivierungsposition
LastUsePositionHelp=Fuer aktivierbare Gegenstaende wie den Zauberstab: Mausposition, an der der Spieler das Objekt aktiviert hat.
PlrKnowledge=Bauplan geben
PlrKnowledgeHelp=Ermoeglicht einem oder mehreren Spielern den Bau eines neuen Gebaeudes oder Objektes.
PlrKnowledgeHelp=Ermoeglicht einem oder mehreren Spielern den Bau eines neuen Gebaeudes oder Objektes.
ConditionalValue=Bedingter Wert
ConditionalValueHelp=Benutzt einen von zwei Werten, je nachdem ob eine Bedingung wahr ist.
IfConditionValueHelp=Bedingung, die entscheidet, ob welcher der beiden Werte zurueckgegeben wird.
TrueEvaluatorValue=Wert 'Wahr'
TrueEvaluatorValueHelp=Wert der benutzt wird wenn die Bedingung wahr ist.
FalseEvaluatorValue=Wert 'Falsch'
FalseEvaluatorValueHelp=Wert der benutzt wird wenn die Bedingung falsch ist.

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

@ -351,3 +351,10 @@ LastUsePosition=Activation position
LastUsePositionHelp=Valid for activated items such as the magic wand: Mouse position where the player activated the item.
PlrKnowledge=Give knowledge
PlrKnowledgeHelp=Allows one or more players to construct a new structure or item.
ConditionalValue=Conditional value
ConditionalValueHelp=Uses one of two values depending on whether a condition is true.
IfConditionValueHelp=Condition deciding which of the two values to use.
TrueEvaluatorValue=Value 'true'
TrueEvaluatorValueHelp=Value used if the condition is true.
FalseEvaluatorValue=Value 'false'
FalseEvaluatorValueHelp=Value used if the condition is false.