Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -921,6 +921,45 @@
 	}
 };
 
+g_SelectionPanels.PrefAttack = {
+	"getMaxNumberOfItems": function()
+	{
+		return 4;
+	},
+	"getItems": function(entStates)
+	{
+		if (entStates.some(state => !state.attack))
+			return [];
+
+		let items = ["Default"];
+		for (let entState of entStates)
+			items = items.concat(Object.keys(entState.attack).filter(
+				type => items.indexOf(type) == -1
+			));
+
+		// No point in showing only "Default" and one extra attack type.
+		return items.length > 2 ? items : "";
+	},
+	"setupButton": function(data)
+	{
+		let entIds = data.unitEntStates.map(state => state.id);
+		data.button.onPress = function() { performPrefAttack(entIds, data.item); };
+
+		data.button.tooltip = getPrefAttackDisplayName(data.item) + "\n" +
+			"[font=\"sans-13\"]" + getPrefAttackTooltip(data.item) + "[/font]";
+
+		data.guiSelection.hidden = !Engine.GuiInterfaceCall("IsPrefAttackSelected", {
+			"ents": entIds,
+			"prefAttack": data.item
+		});
+		data.icon.sprite = "stretched:session/icons/attacks/" + data.item.toLowerCase() + ".png";
+		data.button.enabled = controlsPlayer(data.player);
+
+		setPanelObjectPosition(data.button, data.i, data.rowLength);
+		return true;
+	}
+};
+
 g_SelectionPanels.Training = {
 	"getMaxNumberOfItems": function()
 	{
@@ -1162,7 +1201,8 @@
 	"Garrison", // More important than Formation, as you want to see the garrisoned units in ships
 	"Alert",
 	"Formation",
-	"Stance", // Normal together with formation
+	"PrefAttack", // Normal together with formation and stance.
+	"Stance", // Normal together with formation and preferred attack.
 
 	// RIGHT PANE
 	"Gate", // Must always be shown on gates
Index: binaries/data/mods/public/gui/session/selection_panels_helpers.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ binaries/data/mods/public/gui/session/selection_panels_helpers.js
@@ -87,6 +87,41 @@
 	}
 }
 
+function getPrefAttackDisplayName(name)
+{
+	switch (name)
+	{
+	case "Default":
+		return translateWithContext("attack type", "Default");
+	case "Capture":
+		return translateWithContext("attack type", "Capture");
+	case "Ranged":
+		return translateWithContext("attack type", "Ranged");
+	case "Melee":
+		return translateWithContext("attack type", "Melee");
+	default:
+		warn("Internationalization: Unexpected attack type found: " + name);
+		return name;
+	}
+}
+
+function getPrefAttackTooltip(name)
+{
+	switch (name)
+	{
+	case "Default":
+		return translateWithContext("attack type", "Let the unit decide.");
+	case "Capture":
+		return translateWithContext("attack type", "Prefer Capture attack.");
+	case "Ranged":
+		return translateWithContext("attack type", "Prefer Ranged attack.");
+	case "Melee":
+		return translateWithContext("attack type", "Prefer Melee attack.");
+	default:
+		return "";
+	}
+}
+
 /**
  * Format entity count/limit message for the tooltip
  */
@@ -290,6 +325,18 @@
 	});
 }
 
+function performPrefAttack(entities, prefAttackType)
+{
+	if (!entities)
+		return;
+
+	Engine.PostNetworkCommand({
+		"type": "prefAttackType",
+		"entities": entities,
+		"name": prefAttackType
+	});
+}
+
 function lockGate(lock)
 {
 	Engine.PostNetworkCommand({
Index: binaries/data/mods/public/gui/session/selection_panels_left/attack_panel.xml
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/selection_panels_left/attack_panel.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Stance Selection -->
+<object name="unitPrefAttackPanel"
+	style="TranslucentPanel"
+	size="4 100%-83 100%-4 100%-4"
+	type="text"
+>
+	<object size="1 2 100% 100%">
+		<repeat count="4">
+			<object name="unitPrefAttackButton[n]" hidden="true" style="iconButton" type="button" size="0 0 36 36" tooltip_style="sessionToolTipBottomBold" z="100">
+				<object name="unitPrefAttackIcon[n]" type="image" ghost="true" size="3 3 33 33"/>
+				<object name="unitPrefAttackSelection[n]" hidden="true" type="image" ghost="true" size="3 3 33 33" sprite="stretched:session/icons/corners.png"/>
+			</object>
+		</repeat>
+	</object>
+</object>
Index: binaries/data/mods/public/gui/session/session.xml
===================================================================
--- binaries/data/mods/public/gui/session/session.xml
+++ binaries/data/mods/public/gui/session/session.xml
@@ -120,7 +120,7 @@
 
 		<!-- Supplemental Details Panel (Left of Selection Details) -->
 		<object
-			size="50%-304 100%-170 50%-110 100%"
+			size="50%-304 100%-205 50%-110 100%"
 			name="supplementalSelectionDetails"
 			type="image"
 			sprite="supplementalDetailsPanel"
Index: binaries/data/mods/public/gui/session/unit_commands.js
===================================================================
--- binaries/data/mods/public/gui/session/unit_commands.js
+++ binaries/data/mods/public/gui/session/unit_commands.js
@@ -11,6 +11,7 @@
 	"Construction": 0,
 	"Command": 0,
 	"AllyCommand": 0,
+	"PrefAttack": 0,
 	"Stance": 0,
 	"Gate": 0,
 	"Pack": 0,
Index: binaries/data/mods/public/simulation/components/Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/Attack.js
+++ binaries/data/mods/public/simulation/components/Attack.js
@@ -377,12 +377,19 @@
  */
 Attack.prototype.GetFullAttackRange = function()
 {
-	let ret = { "min": Infinity, "max": 0 };
+	let ret = {
+		"min": Infinity,
+		"max": 0,
+		"elevationBonus": 0
+	};
 	for (let type of this.GetAttackTypes())
 	{
 		let range = this.GetRange(type);
-		ret.min = Math.min(ret.min, range.min);
-		ret.max = Math.max(ret.max, range.max);
+		ret = {
+			"min": Math.min(ret.min, range.min),
+			"max": Math.max(ret.max, range.max),
+			"elevationBonus": Math.max(ret.elevationBonus, range.elevationBonus)
+		};
 	}
 	return ret;
 };
Index: binaries/data/mods/public/simulation/components/BuildingAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/BuildingAI.js
+++ binaries/data/mods/public/simulation/components/BuildingAI.js
@@ -1,6 +1,5 @@
 //Number of rounds of firing per 2 seconds
 const roundCount = 10;
-const attackType = "Ranged";
 
 function BuildingAI() {}
 
@@ -28,6 +27,7 @@
 	this.archersGarrisoned = 0;
 	this.arrowsLeft = 0;
 	this.targetUnits = [];
+	this.prefAttack = "Ranged";
 };
 
 BuildingAI.prototype.OnGarrisonedUnitsChanged = function(msg)
@@ -106,29 +106,29 @@
  */
 BuildingAI.prototype.SetupRangeQuery = function()
 {
-	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return;
 
-	var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
 	if (this.enemyUnitsQuery)
 	{
 		cmpRangeManager.DestroyActiveQuery(this.enemyUnitsQuery);
 		this.enemyUnitsQuery = undefined;
 	}
 
-	var cmpPlayer = QueryOwnerInterface(this.entity);
+	let cmpPlayer = QueryOwnerInterface(this.entity);
 	if (!cmpPlayer)
 		return;
 
-	var enemies = cmpPlayer.GetEnemies();
+	let enemies = cmpPlayer.GetEnemies();
 	if (enemies.length && enemies[0] == 0)
 		enemies.shift(); // remove gaia
 
 	if (!enemies.length)
 		return;
 
-	var range = cmpAttack.GetRange(attackType);
+	let range = cmpAttack.GetFullAttackRange();
 	this.enemyUnitsQuery = cmpRangeManager.CreateActiveParabolicQuery(
 			this.entity, range.min, range.max, range.elevationBonus,
 			enemies, IID_DamageReceiver, cmpRangeManager.GetEntityFlagMask("normal"));
@@ -140,22 +140,22 @@
 // This should be called whenever our ownership changes.
 BuildingAI.prototype.SetupGaiaRangeQuery = function()
 {
-	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return;
 
-	var cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
+	let cmpRangeManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_RangeManager);
 	if (this.gaiaUnitsQuery)
 	{
 		cmpRangeManager.DestroyActiveQuery(this.gaiaUnitsQuery);
 		this.gaiaUnitsQuery = undefined;
 	}
 
-	var cmpPlayer = QueryOwnerInterface(this.entity);
+	let cmpPlayer = QueryOwnerInterface(this.entity);
 	if (!cmpPlayer || !cmpPlayer.IsEnemy(0))
 		return;
 
-	var range = cmpAttack.GetRange(attackType);
+	let range = cmpAttack.GetFullAttackRange();
 
 	// This query is only interested in Gaia entities that can attack.
 	this.gaiaUnitsQuery = cmpRangeManager.CreateActiveParabolicQuery(
@@ -171,7 +171,7 @@
 BuildingAI.prototype.OnRangeUpdate = function(msg)
 {
 
-	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return;
 
@@ -208,12 +208,13 @@
 	if (this.timer)
 		return;
 
-	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return;
 
-	var cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
-	var attackTimers = cmpAttack.GetTimers(attackType);
+	// Start the timer based on the preferred attack type, since we do not know yet what we are attacking.
+	let cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);
+	let attackTimers = cmpAttack.GetTimers(this.prefAttack);
 
 	this.timer = cmpTimer.SetInterval(this.entity, IID_BuildingAI, "FireArrows",
 		attackTimers.prepare, attackTimers.repeat / roundCount, null);
@@ -337,6 +338,7 @@
 
 		if (selectedTarget && this.CheckTargetVisible(selectedTarget))
 		{
+			let attackType = this.GetBestAttackAgainst(selectedTarget, false);
 			cmpAttack.PerformAttack(attackType, selectedTarget);
 			PlaySound("attack_" + attackType.toLowerCase(), this.entity);
 			continue;
@@ -376,4 +378,41 @@
 	return cmpRangeManager.GetLosVisibility(target, cmpOwnership.GetOwner()) != "hidden";
 };
 
+BuildingAI.prototype.SetPrefAttack = function(attackType)
+{
+	if (this.GetSelectableAttacks().indexOf(attackType) != -1)
+	{
+		this.prefAttack = attackType;
+
+		// Reset the range queries, since the range depends on attack type.
+		this.SetupRangeQuery();
+	}
+};
+
+BuildingAI.prototype.GetSelectableAttacks = function()
+{
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	if (cmpAttack)
+		return cmpAttack.GetAttackTypes().concat(["Default"]);
+};
+
+BuildingAI.prototype.GetPrefAttack = function()
+{
+	return this.prefAttack;
+};
+
+BuildingAI.prototype.GetBestAttackAgainst = function(target, allowCapture)
+{
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	if (!cmpAttack)
+		return undefined;
+
+	// First try to use a preferred attack type.
+	let prefAttack = this.GetPrefAttack();
+	if (prefAttack != "Default" && cmpAttack.CanAttack(target, [prefAttack]))
+		return prefAttack;
+
+	return cmpAttack.GetBestAttackAgainst(target, allowCapture);
+};
+
 Engine.RegisterComponentType(IID_BuildingAI, "BuildingAI", BuildingAI);
Index: binaries/data/mods/public/simulation/components/GuiInterface.js
===================================================================
--- binaries/data/mods/public/simulation/components/GuiInterface.js
+++ binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -753,6 +753,20 @@
 	return false;
 };
 
+GuiInterface.prototype.IsPrefAttackSelected = function(player, data)
+{
+	for (let ent of data.ents)
+	{
+		let cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+		if (cmpUnitAI && cmpUnitAI.GetPrefAttack() == data.prefAttack)
+			return true;
+		let cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI);
+		if (cmpBuildingAI && cmpBuildingAI.GetPrefAttack() == data.prefAttack)
+			return true;
+	}
+	return false;
+};
+
 GuiInterface.prototype.GetAllBuildableEntities = function(player, cmd)
 {
 	let buildableEnts = [];
@@ -1934,6 +1948,7 @@
 	"IsFormationSelected": 1,
 	"GetFormationInfoFromTemplate": 1,
 	"IsStanceSelected": 1,
+	"IsPrefAttackSelected": 1,
 
 	"UpdateDisplayedPlayerColors": 1,
 	"SetSelectionHighlight": 1,
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -3212,6 +3212,8 @@
 	this.lastHealed = undefined;
 
 	this.SetStance(this.template.DefaultStance);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	this.prefAttack = "Default";
 };
 
 UnitAI.prototype.IsTurret = function()
@@ -4561,9 +4563,15 @@
 
 UnitAI.prototype.GetBestAttackAgainst = function(target, allowCapture)
 {
-	var cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
 	if (!cmpAttack)
 		return undefined;
+
+	// First try to use a preferred attack type.
+	let prefAttack = this.GetPrefAttack();
+	if (prefAttack != "Default" && cmpAttack.CanAttack(target, [prefAttack]))
+		return prefAttack;
+
 	return cmpAttack.GetBestAttackAgainst(target, allowCapture);
 };
 
@@ -5632,6 +5640,30 @@
 	return this.stance;
 };
 
+UnitAI.prototype.SetPrefAttack = function(attackType)
+{
+	if (this.GetSelectableAttacks().indexOf(attackType) != -1)
+	{
+		this.prefAttack = attackType;
+		Engine.PostMessage(this.entity, MT_UnitPrefAttackChanged, { "to": this.prefAttack });
+
+		// Reset the range queries, since the range depends on attack type.
+		this.SetupRangeQueries();
+	}
+};
+
+UnitAI.prototype.GetSelectableAttacks = function()
+{
+	let cmpAttack = Engine.QueryInterface(this.entity, IID_Attack);
+	if (cmpAttack)
+		return cmpAttack.GetAttackTypes().concat(["Default"]);
+};
+
+UnitAI.prototype.GetPrefAttack = function()
+{
+	return this.prefAttack;
+};
+
 /*
  * Make the unit walk at its normal pace.
  */
Index: binaries/data/mods/public/simulation/components/interfaces/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/interfaces/UnitAI.js
+++ binaries/data/mods/public/simulation/components/interfaces/UnitAI.js
@@ -38,3 +38,10 @@
  * sent from UnitAI whenever a pickup is aborted.
  */
 Engine.RegisterMessageType("PickupCanceled");
+
+/**
+ * Message of the form { "to": string }
+ * where "to" value is a UnitAI preferred attack type,
+ * sent from UnitAI whenever the unit's pref. attack changes.
+ */
+Engine.RegisterMessageType("UnitPrefAttackChanged");
Index: binaries/data/mods/public/simulation/components/tests/test_Attack.js
===================================================================
--- binaries/data/mods/public/simulation/components/tests/test_Attack.js
+++ binaries/data/mods/public/simulation/components/tests/test_Attack.js
@@ -149,7 +149,7 @@
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetPreferredClasses("Melee"), ["FemaleCitizen"]);
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetRestrictedClasses("Melee"), ["Elephant", "Archer"]);
-	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetFullAttackRange(), { "min": 0, "max": 80 });
+	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetFullAttackRange(), { "min": 0, "max": 80, "elevationBonus": 0 });
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackStrengths("Capture"), { "value": 8 });
 
 	TS_ASSERT_UNEVAL_EQUALS(cmpAttack.GetAttackStrengths("Ranged"), {
Index: binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Commands.js
+++ binaries/data/mods/public/simulation/helpers/Commands.js
@@ -627,6 +627,19 @@
 		}
 	},
 
+	"prefAttackType": function(player, cmd, data)
+	{
+		for (let ent of data.entities)
+		{
+			let cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
+			if (cmpUnitAI)
+				cmpUnitAI.SetPrefAttack(cmd.name);
+			let cmpBuildingAI = Engine.QueryInterface(ent, IID_BuildingAI);
+			if (cmpBuildingAI)
+				cmpBuildingAI.SetPrefAttack(cmd.name);
+		}
+	},
+
 	"lock-gate": function(player, cmd, data)
 	{
 		for (let ent of data.entities)