diff --git a/binaries/data/mods/public/gui/session/selection_panels.js b/binaries/data/mods/public/gui/session/selection_panels.js
index 710a07a2e6..c2b55a14d7 100644
--- a/binaries/data/mods/public/gui/session/selection_panels.js
+++ b/binaries/data/mods/public/gui/session/selection_panels.js
@@ -270,6 +270,8 @@ g_SelectionPanels.Formation = {
let formationInfo = g_FormationsInfo.get(data.item);
let tooltip = translate(formationInfo.name);
+ if (formationInfo.tooltip)
+ tooltip += "\n" + bodyFont(translate(formationInfo.tooltip));
let isDefaultFormation = g_AutoFormation.isDefault(data.item);
if (data.item === NULL_FORMATION)
@@ -281,8 +283,8 @@ g_SelectionPanels.Formation = {
translate("This is the default formation, used for movement orders.") :
translate("Right-click to set this as the default formation."));
- if (!formationOk && formationInfo.tooltip)
- tooltip += "\n" + objectionFont(translate(formationInfo.tooltip));
+ if (!formationOk && formationInfo.disabledTooltip)
+ tooltip += "\n" + objectionFont(translate(formationInfo.disabledTooltip));
data.button.tooltip = tooltip;
data.button.enabled = formationOk && controlsPlayer(data.player);
diff --git a/binaries/data/mods/public/simulation/components/GuiInterface.js b/binaries/data/mods/public/simulation/components/GuiInterface.js
index 0d5349a661..8b32ebcbfd 100644
--- a/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ b/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -857,7 +857,8 @@ GuiInterface.prototype.GetFormationInfoFromTemplate = function(player, data)
return {
"name": template.Identity.GenericName,
- "tooltip": template.Formation.DisabledTooltip || "",
+ "tooltip": template.Identity.Tooltip || "",
+ "disabledTooltip": template.Formation.DisabledTooltip || "",
"icon": template.Identity.Icon
};
};
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml b/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
index 02094ce0db..e8a73413a4 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/anti_cavalry.xml
@@ -23,5 +23,6 @@
formations/testudo.png
Anti Cavalry
+ Square formation of Melee Infantry to fight Cavalry.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml b/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
index f18ecf3b55..f771c9138b 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/battle_line.xml
@@ -12,5 +12,6 @@
Battle Line
formations/battle_line.png
+ Common formation for frontal attacks.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/box.xml b/binaries/data/mods/public/simulation/templates/special/formations/box.xml
index 41b5320afe..74657ba7cf 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/box.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/box.xml
@@ -11,5 +11,6 @@
Box
formations/box.png
+ Square formation to protect all sides.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml b/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
index 236293ee7f..1c1b8f57bb 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/column_closed.xml
@@ -9,5 +9,6 @@
Forced March
formations/column_closed.png
+ Closed column formation for risky movements.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml b/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
index e670fb6d62..ca300f9546 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/column_open.xml
@@ -9,5 +9,6 @@
Column Open
formations/column_open.png
+ Dispersed formation for open field crossings.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/flank.xml b/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
index a2ea23df3e..9a8425b3a7 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/flank.xml
@@ -10,5 +10,6 @@
Flank
formations/flank.png
+ Formation to protect the sides or surprise attack the enemy flank.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml b/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
index 1e850804c3..ca216f7f6d 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/line_closed.xml
@@ -8,5 +8,6 @@
Close Order
formations/line_closed.png
+ Flexible closed line formation.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml b/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
index d2c1664fa1..8f8855c2be 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/line_open.xml
@@ -10,5 +10,6 @@
Open Order
formations/line_open.png
+ Dispersed formation for open field combat.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml b/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
index 2efdd59e46..5dc2a17219 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/phalanx.xml
@@ -22,5 +22,6 @@
Phalanx
formations/phalanx.png
+ Compact formation of Infantry Hoplites creating a shield wall.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml b/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
index 28e48c8439..3bd98ee9d1 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/skirmish.xml
@@ -13,5 +13,6 @@
Skirmish
formations/skirmish.png
+ Dispersed formation for reconnaissance, ambushes or hit-and-run.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml b/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
index 24c7ba8edb..a1b5b24eee 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/syntagma.xml
@@ -28,5 +28,6 @@
Syntagma
formations/syntagma.png
+ Compact formation of Infantry Pikemen creating a defensive wall.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml b/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
index 903cc34591..3512470d5b 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/testudo.xml
@@ -69,5 +69,6 @@
Testudo
formations/testudo.png
+ Compact formation of Melee Infantry creating a shield shell.
diff --git a/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml b/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
index 281e22a8f0..6b19a68ce9 100644
--- a/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
+++ b/binaries/data/mods/public/simulation/templates/special/formations/wedge.xml
@@ -15,5 +15,6 @@
Wedge
formations/wedge.png
+ Triangular Cavalry formation to break through enemy lines.
diff --git a/binaries/data/mods/public/simulation/templates/template_formation.xml b/binaries/data/mods/public/simulation/templates/template_formation.xml
index 7514d7d5d8..5a2c70ed6e 100644
--- a/binaries/data/mods/public/simulation/templates/template_formation.xml
+++ b/binaries/data/mods/public/simulation/templates/template_formation.xml
@@ -31,6 +31,7 @@
Formation
true
+