Ticket #5106: patch.patch

new file inaries/data/mods/public/maps/scenarios/test.js

@@ +1 @@
+const UNIT_TEMPLATE = "units/athen_infantry_marine_archer_b";
+const FAST_UNIT_TEMPLATE = "units/athen_cavalry_swordsman_a";
+
+var QuickSpawn = function(x, z, template, owner = 1)
+{
+    let ent = Engine.AddEntity(template);
+
+    let cmpEntOwnership = Engine.QueryInterface(ent, IID_Ownership);
+    if (cmpEntOwnership)
+        cmpEntOwnership.SetOwner(owner);
+
+    let cmpEntPosition = Engine.QueryInterface(ent, IID_Position);
+    cmpEntPosition.JumpTo(x, z);
+    return ent;
+};
+
+var Rotate = function(angle, ent)
+{
+    let cmpEntPosition = Engine.QueryInterface(ent, IID_Position);
+    cmpEntPosition.SetYRotation(angle);
+    return ent;
+};
+
+var WalkTo = function(x, z, ent, player)
+{
+    ProcessCommand(player, {
+        "type": "walk",
+        "entities": Array.isArray(ent) ? ent : [ent],
+        "x": x,
+        "z": z,
+        "queued": false
+    });
+    return ent;
+};
+
+var Attack = function(target, ent, player)
+{
+    ProcessCommand(player, {
+        "type": "attack",
+        "entities": Array.isArray(ent) ? ent : [ent],
+        "target": target,
+        "queued": false
+    });
+    return ent;
+};
+
+var Do = function(name, data, ent, player)
+{
+    let comm = {
+        "type": name,
+        "entities": Array.isArray(ent) ? ent : [ent],
+        "queued": false
+    };
+    for (let k in data)
+        comm[k] = data[k];
+    ProcessCommand(player, comm);
+};
+
+function setupExperiment(x, y, distance, modifiers = {})
+{
+    let target = QuickSpawn(x, y, FAST_UNIT_TEMPLATE, 2);
+    Do("stance", {
+        "name": "standground"
+    }, target, 2);
+
+    Do("patrol", {
+        "x": x,
+        "z": y-10,
+        "force": true,
+        "targetClasses": [],
+    }, target, 2);
+
+    for (let i = 0; i < 5; ++i)
+    {
+        let attacker = QuickSpawn(x+distance, y + i * 2, UNIT_TEMPLATE, 1);
+
+        let cmpModif = Engine.QueryInterface(SYSTEM_ENTITY, IID_ModifiersManager);
+        cmpModif.AddModifiers("triggerdtest", modifiers, attacker);
+        Attack(target, attacker, 1);
+    }
+}
+
+var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
+
+Trigger.prototype.SetupUnits = function()
+{
+    setupExperiment(250, 250, 40);
+    setupExperiment(350, 250, 40, {
+        "Attack/Ranged/Spread": [{ "affects": [["Unit"]], "multiply": 0.01 }],
+    });
+    setupExperiment(450, 250, 40, {
+        "Attack/Ranged/Speed": [{ "affects": [["Unit"]], "multiply": 2 }],
+    });
+    setupExperiment(250, 350, 40, {
+        "Attack/Ranged/Speed": [{ "affects": [["Unit"]], "multiply": 4 }],
+    });
+};
+
+cmpTrigger.DoAfterDelay(1000, "SetupUnits", {});

new file inaries/data/mods/public/maps/scenarios/test.xml

@@ +1 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Scenario version="6">
+    <Terrain patches="20" texture="blackness" priority="0" height="16384"/>
+    <Environment>
+        <SkySet>default</SkySet>
+        <SunColor r="0.74902" g="0.74902" b="0.74902"/>
+        <SunElevation angle="0.785398"/>
+        <SunRotation angle="-0.785396"/>
+        <TerrainAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+        <UnitsAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+        <Fog>
+            <FogFactor>0</FogFactor>
+            <FogThickness>0.5</FogThickness>
+            <FogColor r="0.8" g="0.8" b="0.898039"/>
+        </Fog>
+        <Water>
+            <WaterBody>
+                <Type>ocean</Type>
+                <Color r="0.298039" g="0.34902" b="0.698039"/>
+                <Tint r="0.278431" g="0.298039" b="0.588235"/>
+                <Height>5</Height>
+                <Waviness>4</Waviness>
+                <Murkiness>0.45</Murkiness>
+                <WindAngle>0</WindAngle>
+            </WaterBody>
+        </Water>
+        <Postproc>
+            <Brightness>0</Brightness>
+            <Contrast>1</Contrast>
+            <Saturation>0.99</Saturation>
+            <Bloom>0.1999</Bloom>
+            <PostEffect>default</PostEffect>
+        </Postproc>
+    </Environment>
+    <Camera>
+        <Position x="300" y="77.5248" z="306.255"/>
+        <Rotation angle="0"/>
+        <Declination angle="0.610865"/>
+    </Camera>
+    <ScriptSettings><![CDATA[
+{
+  "CircularMap": true,
+  "Description": "This map is designed to test some basic unit movement cases. It will involve unitAI, unitMotion and the relevant pathfinders and thus acts as an integrated test map. Look for things such as stuck units, wrong animations, and weird pathing.",
+  "Keywords": [
+    "trigger",
+    "demo"
+  ],
+  "Name": "TestMap",
+  "PlayerData": [
+    {
+      "Civ": "athen"
+    },
+    {
+      "AI": "",
+      "Civ": "athen"
+    }
+  ],
+  "RevealMap": true,
+  "TriggerScripts": [
+    "scripts/TriggerHelper.js",
+    "scenarios/test.js"
+  ],
+  "VictoryConditions": []
+}
+]]></ScriptSettings>
+    <Entities>
+    </Entities>
+    <Paths/>
+</Scenario>

binaries/data/mods/public/simulation/components/Attack.js

@@ -469 +469 @@
         //  * Obstacles like trees could reduce the probability of the target being hit
         //  * Obstacles like walls should block projectiles entirely
 
-        let horizSpeed = +this.template[type].Projectile.Speed;
+        let horizSpeed = ApplyValueModificationsToEntity("Attack/Ranged/Speed", +this.template[type].Projectile.Speed, this.entity);
         let gravity = +this.template[type].Projectile.Gravity;
         // horizSpeed /= 2; gravity /= 2; // slow it down for testing
 
@@ -486 +486 @@
         let targetVelocity = Vector3D.sub(targetPosition, previousTargetPosition).div(turnLength);
 
         let timeToTarget = this.PredictTimeToTarget(selfPosition, horizSpeed, targetPosition, targetVelocity);
-        let predictedPosition = (timeToTarget !== false) ? Vector3D.mult(targetVelocity, timeToTarget).add(targetPosition) : targetPosition;
+        let predictedPosition = (timeToTarget !== false && Math.random() < 0.4) ? Vector3D.mult(targetVelocity, timeToTarget).add(targetPosition) : targetPosition;
 
         // Add inaccuracy based on spread.
         let distanceModifiedSpread = ApplyValueModificationsToEntity("Attack/Ranged/Spread", +this.template[type].Projectile.Spread, this.entity) *