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

Add user action evaluators: X/Y component of position

qteditor
Sven Eberhardt 2016-08-07 01:50:29 -04:00
parent 0b5e8723c2
commit 5babeba4d8
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,6 +269,8 @@ func Definition(def)
AddEvaluator("Integer", nil, "$ClonkEnergy$", "$ClonkEnergyHelp$", "clonk_energy", [def, def.EvalObjProp, Global.GetEnergy], { }, GetObjectEvaluator("IsClonk", "$Clonk$"), "Object");
AddEvaluator("Integer", nil, "$ObjectMass$", "$ObjectMassHelp$", "object_mass", [def, def.EvalObjProp, Global.GetMass], { }, new Evaluator.Object { }, "Object");
AddEvaluator("Integer", nil, "$ObjectSpeed$", "$ObjectSpeedHelp$", "object_speed", [def, def.EvalObjProp, Global.GetSpeed], { }, new Evaluator.Object { }, "Object");
AddEvaluator("Integer", nil, "$PositionX$", "$PositionXHelp$", "position_x", [def, def.EvalInt_PosCoord, 0], { }, new Evaluator.Position { }, "Position");
AddEvaluator("Integer", nil, "$PositionY$", "$PositionYHelp$", "position_y", [def, def.EvalInt_PosCoord, 1], { }, new Evaluator.Position { }, "Position");
// String evaluators
AddEvaluator("String", nil, ["$Constant$", ""], "$ConstantHelp$", "string_constant", [def, def.EvalConstant], { Value="" }, { Type="string", Name="$Value$" });
AddEvaluator("String", nil, ["$ValueToString$", ""], "$ValueToStringHelp$", "value_to_string", [def, def.EvalStr_ValueToString], { }, new Evaluator.Any { });
@ -1024,6 +1026,8 @@ private func EvalInt_Distance(proplist props, proplist context)
private func EvalInt_Wealth(proplist props, proplist context) { return GetWealth(EvaluatePlayer(props.Player, context)); }
private func EvalInt_PosCoord(proplist props, proplist context, int idx) { return EvaluatePosition(props.Position, context)[idx]; }
private func EvalStr_ValueToString(proplist props, proplist context)
{
return Format("%v", EvaluateValue("Any", props.Value, context));

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

@ -269,3 +269,7 @@ OwnerOfObject=Objektbesitzer
OwnerOfObjectHelp=Spieler, dem das angegebene Objekt gehoert.
ControllerOfObject=Kontrollierender Spieler
ControllerOfObjectHelp=Spieler, der ein angegebenes Objekt kontrolliert. Zum Beispiel der Spieler, der zuletzt ein Fahrzeug geschoben oder einen Flint geworfen hat.
PositionX=X-Position
PositionXHelp=Horizontale Komponente einer Position.
PositionY=Y-Position
PositionYHelp=Vertikale Komponente einer Position.

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

@ -268,4 +268,8 @@ ObjectSpeedHelp=Velocity of the specified object in 1/10th pixels per frame.
OwnerOfObject=Object owner
OwnerOfObjectHelp=Player owning a specified object.
ControllerOfObject=Controlling player
ControllerOfObjectHelp=Player controlling a specified object. E.g. the player currentply pushing a vehicle or switch or the player who threw a firestone.
ControllerOfObjectHelp=Player controlling a specified object. E.g. the player currentply pushing a vehicle or switch or the player who threw a firestone.
PositionX=X position
PositionXHelp=Horizontal component of a position.
PositionY=Y position
PositionYHelp=Vertical component of a position.