Page MenuHomeWildfire Games
Differential D1751 Diff 12950 binaries/data/mods/public/gui/session/unit_actions.js

Changeset View

Standalone View

View Options

binaries/data/mods/public/gui/session/unit_actions.js

/** /**
* Specifies which template should indicate the target location of a player command, * Specifies which template should indicate the target location of a player command,
* given a command type. * given a command type.
*/ */
var g_TargetMarker = { var g_TargetMarker = {
"move": "special/target_marker" "move": "special/target_marker",
// TODO: Add proper marker
"map_ping": "special/target_marker"
}; };
/** /**
* Which enemy entity types will be attacked on sight when patroling. * Which enemy entity types will be attacked on sight when patroling.
*/ */
var g_PatrolTargets = ["Unit"]; var g_PatrolTargets = ["Unit"];
const g_DisabledTags = { "color": "255 140 0" }; const g_DisabledTags = { "color": "255 140 0" };
▲ Show 20 Lines • Show All 1,565 Lines • ▼ Show 20 Lines
{ {
Engine.GuiInterfaceCall("AddTargetMarker", { Engine.GuiInterfaceCall("AddTargetMarker", {
"template": g_TargetMarker.move, "template": g_TargetMarker.move,
"x": target.x, "x": target.x,
"z": target.z "z": target.z
}); });
} }
function displayFlare(target, playerID)
elexisUnsubmitted
Done
Inline Actions

as far as I know we used lowercase (could be corrected above too), but all of the JS GUI should become OOP anyway

elexis: as far as I know we used lowercase (could be corrected above too), but all of the JS GUI should…
{
Engine.GuiInterfaceCall("AddTargetMarker", {
"template": g_TargetMarker.map_ping,
"x": target.x,
"z": target.z
});
g_MiniMapPanel.flare(target, playerID)
}
elexisUnsubmitted
Done
Inline Actions

Alternatives include JSInterface_*.cpp, or calling calling C++ code directly via GUIInterface.

But calling the minimap object directly doesn't sound too bad.
The only thing that looks ugly to me is that the arguments are passed one by one (concurrency problem).
Like the JS GUI setting X but didn't set Z yet when the minimap starts to draw.
Maybe that's why the "ping" variable is here, to signal that the copying is finished.

That would be better cleaned if passing a JS object { "position": new Vector2D(x, y), "color": ...", ... } to C++.
Only need to implement the conversion from JS Object to C++ value in one of these *ScriptConversion*.cpp files (FromJSVal, ToJSVal).

elexis: Alternatives include `JSInterface_*.cpp`, or calling calling C++ code directly via…
ImarokAuthorUnsubmitted
Done
Inline Actions

Maybe that's why the "ping" variable is here, to signal that the copying is finished.

Yep, that's why.
Best solution would be if we could call a function of this object. Not sure if that's possible.
The current one was just meant as a provisional solution until someone or I find a better.

Imarok: > Maybe that's why the "ping" variable is here, to signal that the copying is finished. Yep…
function findGatherType(gatherer, supply) function findGatherType(gatherer, supply)
{ {
elexisUnsubmitted
Done
Inline Actions

Should be minimap.ping_position = target
The Vector2D <-> JS Value conversion is already implemented.
(The Vector3D <-< JSValue one isn't but, you could use the To2D function if this is a 3D one.)

elexis: Should be `minimap.ping_position = target` The Vector2D <-> JS Value conversion is already…
if (!gatherer.resourceGatherRates || !supply) if (!gatherer.resourceGatherRates || !supply)
return undefined; return undefined;
if (gatherer.resourceGatherRates[supply.type.generic + "." + supply.type.specific]) if (gatherer.resourceGatherRates[supply.type.generic + "." + supply.type.specific])
return supply.type.specific; return supply.type.specific;
if (gatherer.resourceGatherRates[supply.type.generic]) if (gatherer.resourceGatherRates[supply.type.generic])
return supply.type.generic; return supply.type.generic;
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines
Wildfire Games · Phabricator