Index: ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.js
@@ -0,0 +1,305 @@
+const UNIT_TEMPLATE = "units/athen_infantry_marine_archer_b";
+const FAST_UNIT_TEMPLATE = "units/athen_cavalry_swordsman_a";
+const LARGE_UNIT_TEMPLATE = "units/brit_siege_ram";
+const SMALL_STRUCTURE_TEMPLATE = "structures/athen_house";
+
+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)
+{
+	ProcessCommand(1, {
+		"type": "walk",
+		"entities": Array.isArray(ent) ? ent : [ent],
+		"x": x,
+		"z": z,
+		"queued": false
+	});
+	return ent;
+};
+
+var Guard = function(target, ent)
+{
+	ProcessCommand(1, {
+		"type": "guard",
+		"entities": Array.isArray(ent) ? ent : [ent],
+		"target": target,
+		"queued": false
+	});
+	return ent;
+};
+
+var Do = function(name, data, ent)
+{
+	let comm = {
+		"type": name,
+		"entities": Array.isArray(ent) ? ent : [ent],
+		"queued": false
+	};
+	for (let k in data)
+		comm[k] = data[k];
+	ProcessCommand(1, comm);
+};
+
+var gx = 100;
+var gy = 100;
+var experiments = {};
+
+experiments.single_unit = {
+	"spawn": () => {
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+	}
+};
+
+experiments.two_followers = {
+	"spawn": () => {
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		let follow = WalkTo(gx, gy + 102, QuickSpawn(gx, gy + 2, UNIT_TEMPLATE));
+		Guard(follow, QuickSpawn(gx, gy - 2, UNIT_TEMPLATE));
+	}
+};
+
+experiments.follow_faster = {
+	"spawn": () => {
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, FAST_UNIT_TEMPLATE));
+		WalkTo(gx, gy + 104, QuickSpawn(gx, gy + 4, UNIT_TEMPLATE));
+	}
+};
+
+experiments.group = {
+	"spawn": () => {
+		for (let i = -3; i <= 3; ++i)
+			for (let j = -3; j <= 3; ++j)
+				WalkTo(gx, gy + 100, QuickSpawn(gx + i * 2, gy + j * 2, UNIT_TEMPLATE));
+	}
+};
+
+experiments.single_unit_building = {
+	"spawn": () => {
+		QuickSpawn(gx, gy + 40, SMALL_STRUCTURE_TEMPLATE);
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+	}
+};
+
+experiments.single_unit_pass_nopass = {
+	"spawn": () => {
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		QuickSpawn(gx - 10, gy + 40, SMALL_STRUCTURE_TEMPLATE);
+		QuickSpawn(gx + 10, gy + 40, SMALL_STRUCTURE_TEMPLATE);
+		QuickSpawn(gx - 8, gy + 70, SMALL_STRUCTURE_TEMPLATE);
+		QuickSpawn(gx + 8, gy + 70, SMALL_STRUCTURE_TEMPLATE);
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy - 10, UNIT_TEMPLATE));
+	}
+};
+
+
+experiments.units_dense_forest = {
+	"spawn": () => {
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx - 2, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx + 2, gy + 2, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx - 2, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx + 2, gy + 2, UNIT_TEMPLATE));
+		for (let i = -16; i <= 16; i += 4)
+			for (let j = -16; j <= 16; j += 4)
+				QuickSpawn(gx + i, gy + 50 + j, "gaia/flora_tree_acacia", 0);
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy - 20, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx - 2, gy - 20, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx + 2, gy - 18, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx - 2, gy - 20, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx + 2, gy - 18, UNIT_TEMPLATE));
+	}
+};
+
+experiments.units_sparse_forest = {
+	"spawn": () => {
+		gx += 10;
+		for (let i = -4; i <= 4; i += 2)
+			for (let j = -4; j <= 4; j += 2)
+				WalkTo(gx, gy + 100, QuickSpawn(gx + i, gy + j, UNIT_TEMPLATE));
+
+		for (let i = -16; i <= 16; i += 8)
+			for (let j = -16; j <= 16; j += 8)
+				QuickSpawn(gx + i, gy + 50 + j, "gaia/flora_tree_acacia", 0);
+
+		for (let i = -4; i <= 4; i += 2)
+			for (let j = -4; j <= 4; j += 2)
+				WalkTo(gx, gy + 100, QuickSpawn(gx + i, gy - 20 + j, UNIT_TEMPLATE));
+	}
+};
+
+experiments.units_running_into_eachother = {
+	"spawn": () => {
+		for (let i = -4; i <= 4; i += 2)
+			for (let j = -4; j <= 4; j += 2)
+				WalkTo(gx, gy + 100, QuickSpawn(gx + i, gy + j, UNIT_TEMPLATE));
+		for (let i = -4; i <= 4; i += 2)
+			for (let j = -4; j <= 4; j += 2)
+				WalkTo(gx, gy, QuickSpawn(gx + i, gy + 100 + j, UNIT_TEMPLATE));
+	}
+};
+
+experiments.enclosed = {
+	"spawn": () => {
+		QuickSpawn(gx, gy - 8, "other/palisades_rocks_long");
+		QuickSpawn(gx, gy + 8, "other/palisades_rocks_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
+
+		WalkTo(gx + 100, gy + 100, QuickSpawn(gx - 1, gy - 1, UNIT_TEMPLATE));
+		WalkTo(gx - 100, gy + 100, QuickSpawn(gx + 1, gy - 1, UNIT_TEMPLATE));
+		WalkTo(gx - 100, gy - 100, QuickSpawn(gx + 1, gy + 1, UNIT_TEMPLATE));
+		WalkTo(gx + 100, gy - 100, QuickSpawn(gx - 1, gy + 1, UNIT_TEMPLATE));
+
+		QuickSpawn(gx, gy + 20, "other/palisades_rocks_long");
+		experiments.enclosed.remove = QuickSpawn(gx, gy + 36, "other/palisades_rocks_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 28, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 28, "other/palisades_rocks_long"));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy + 28, UNIT_TEMPLATE));
+	},
+
+	"timeout": () => {
+		Engine.DestroyEntity(experiments.enclosed.remove);
+	}
+};
+
+experiments.line_of_rams = {
+	"spawn": () => {
+		for (let i = -20; i <= 20; i+=4)
+			WalkTo(gx + i, gy + 50, QuickSpawn(gx + i, gy, LARGE_UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy - 10, UNIT_TEMPLATE));
+	}
+};
+
+
+experiments.units_sparse_forest_of_units = {
+	"spawn": () => {
+		for (let i = -16; i <= 16; i += 8)
+			for (let j = -16; j <= 16; j += 8)
+				Do("stance", { "name": "standground" }, QuickSpawn(gx + i, gy + 50 + j, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy-10, LARGE_UNIT_TEMPLATE));
+	}
+};
+
+experiments.units_dense_forest_of_units = {
+	"spawn": () => {
+		for (let i = -16; i <= 16; i += 4)
+			for (let j = -16; j <= 16; j += 4)
+				Do("stance", { "name": "standground" }, QuickSpawn(gx + i, gy + 50 + j, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy-10, LARGE_UNIT_TEMPLATE));
+	}
+};
+
+experiments.units_superdense_forest_of_units = {
+	"spawn": () => {
+		for (let i = -6; i <= 6; i += 2)
+			for (let j = -6; j <= 6; j += 2)
+				Do("stance", { "name": "standground" }, QuickSpawn(gx + i, gy + 50 + j, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+		WalkTo(gx, gy + 100, QuickSpawn(gx, gy-10, LARGE_UNIT_TEMPLATE));
+	}
+};
+
+experiments.u_shape_tight_exit = {
+	"spawn": () => {
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy + 12, "other/palisades_rocks_long"));
+		QuickSpawn(gx, gy + 16, "other/palisades_rocks_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx, gy + 4, "other/palisades_rocks_medium"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy + 12, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 16, gy + 8, "other/palisades_rocks_long"));
+		QuickSpawn(gx - 4, gy, "other/palisades_rocks_medium");
+		QuickSpawn(gx - 12, gy, "other/palisades_rocks_medium");
+		Rotate(Math.PI/4, QuickSpawn(gx - 10, gy + 8, "other/palisades_rocks_short"));
+		QuickSpawn(gx, gy - 10, "other/palisades_rocks_long");
+		Rotate(Math.PI / 2, QuickSpawn(gx + 8, gy - 5, "other/palisades_rocks_long"));
+		Rotate(Math.PI / 2, QuickSpawn(gx - 8, gy - 7, "other/palisades_rocks_long"));
+
+		let tree = QuickSpawn(gx, gy + 80, "gaia/flora_tree_acacia");
+
+		for (let i = -3; i <= 3; i += 1)
+		{
+			for (let j = -2; j <= 3; j += 1)
+				WalkTo(gx, gy + 100, QuickSpawn(gx + i, gy + j - 5, UNIT_TEMPLATE));
+			Do("gather", { "target": tree }, QuickSpawn(gx + i, gy - 3 - 5, UNIT_TEMPLATE));
+		}
+	}
+};
+
+experiments.cluttered_around_tree = {
+	"spawn": () => {
+		let tree = QuickSpawn(gx, gy + 50, "gaia/flora_tree_acacia");
+
+		for (let i = -3; i <= 3; i += 1)
+			for (let j = -3; j <= 3; j += 1)
+				if (Math.abs(j) == 3 || Math.abs(i) == 3)
+					QuickSpawn(gx + i, gy + j + 50, UNIT_TEMPLATE);
+
+		Do("gather", { "target": tree }, QuickSpawn(gx, gy, UNIT_TEMPLATE));
+	}
+};
+
+experiments.formation_move = {
+	"spawn": () => {
+		let ents = [];
+		for (let i = -3; i <= 3; ++i)
+			for (let j = -3; j <= 3; ++j)
+				ents.push(QuickSpawn(gx + i * 2, gy + j * 2, UNIT_TEMPLATE));
+		Do("formation", { "name": "special/formations/box" }, ents);
+		WalkTo(gx, gy + 100, ents);
+	}
+};
+
+experiments.formation_attack = {
+	"spawn": () => {
+		let ents = [];
+		for (let i = -3; i <= 3; ++i)
+			for (let j = -3; j <= 3; ++j)
+				ents.push(QuickSpawn(gx + i * 2, gy + j * 2, UNIT_TEMPLATE));
+		Do("formation", { "name": "special/formations/box" }, ents);
+		Do("attack", { "target": 5 }, ents);
+	}
+};
+
+var cmpTrigger = Engine.QueryInterface(SYSTEM_ENTITY, IID_Trigger);
+
+Trigger.prototype.SetupUnits = function()
+{
+	for (let key in experiments)
+	{
+		experiments[key].spawn();
+		gx += 40;
+		if (gx >= 540)
+		{
+			gx = 100;
+			gy += 140;
+		}
+		if (experiments[key].timeout)
+		{
+			Trigger.prototype[key + '_timeout'] = experiments[key].timeout;
+			cmpTrigger.DoAfterDelay(4000, key + '_timeout', {});
+		}
+
+	}
+};
+
+cmpTrigger.DoAfterDelay(3000, "SetupUnits", {});
Index: ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml
+++ ps/trunk/binaries/data/mods/public/maps/scenarios/unit_motion_integration_test.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Scenario version="6">
+	<Terrain patches="10" texture="grass1_spring" priority="0" height="800"/>
+	<Environment>
+		<SkySet>default</SkySet>
+		<SunColor r="0.749020" g="0.749020" b="0.749020"/>
+		<SunElevation angle="0.785398"/>
+		<SunRotation angle="5.49779"/>
+		<TerrainAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+		<UnitsAmbientColor r="0.501961" g="0.501961" b="0.501961"/>
+		<Water>
+			<WaterBody>
+				<Type>ocean</Type>
+				<Color r="0.3" g="0.35" b="0.7"/>
+				<Height>5</Height>
+				<Waviness>4.0</Waviness>
+				<Murkiness>0.45</Murkiness>
+				<Tint r="0.28" g="0.3" b="0.59"/>
+			</WaterBody>
+		</Water>
+	</Environment>
+	<Camera>
+		<Position x="300" y="300" z="-100"/>
+		<Rotation angle="0"/>
+		<Declination angle="0.523599"/>
+	</Camera>
+	<ScriptSettings><![CDATA[
+	{
+		"Name": "Unit Motion Integration Test",
+		"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.",
+  		"CircularMap": true,
+  		"Keywords": [
+  			"trigger",
+  			"demo"
+  		],
+		"PlayerData":
+		[
+			{
+				"Civ": "athen"
+			},
+			{
+				"Civ": "athen"
+			}
+		],
+		"RevealMap": true,
+		"VictoryConditions": [
+			"conquest"
+		],
+		"TriggerScripts": [
+			"scripts/TriggerHelper.js",
+			"scenarios/unit_motion_integration_test.js"
+		]
+	}
+	]]></ScriptSettings>
+	<Entities>
+		<Entity uid="5">
+			<Template>structures/athen_civil_centre</Template>
+			<Player>2</Player>
+			<Position x="500" z="500"/>
+		</Entity>
+	</Entities>
+</Scenario>