# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1343937743 -3600
# Node ID a41c2bc1683a431cfcc6a2c1850b121f970caea0
# Parent  e35fc85eda2b015695e86477ca2d580213afd1fa
Re #410: M units for N parent models requirement
 * Fix text string for requirement failure

diff -r e35fc85eda2b -r a41c2bc1683a API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirement.cs
--- a/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirement.cs	Sun Jul 29 21:02:59 2012 +0100
+++ b/API/Objects/Requirement/UnitRequiresNParentModelsForMUnitsRequirement.cs	Thu Aug 02 21:02:23 2012 +0100
@@ -113,9 +113,20 @@
 
 		private string GetFailedAddingRequirementsString(UnitType unitType, Unit parentUnit, Army toArmy)
 		{
-			int allowedTypeCount = GetChildCountFromUnit(parentUnit);
+			int allowedTypeCount = GetChildCountFromUnit(parentUnit) + 1;			
+			UnitCountRequirementData parentRequirement = null;
 			
-			return String.Format("Army can only contain {0} × {1} as sub-units of each {2}, would have {3}", allowedTypeCount, unitType.Name, parentUnit.UnitType.Name, (allowedTypeCount + 1));
+			foreach (UnitCountRequirementData limit in ConstraintTypes)
+			{
+				if (Arrays.Contains(limit.UnitTypes, parentUnit.UnitType))
+				{
+					parentRequirement = limit;
+					break;
+				}
+			}
+			
+			string txt = "Units of type {0} can only have {1} x {2} for every {3} models, would have {4} for {5}";
+			return String.Format(txt, parentUnit.UnitType.Name, parentRequirement.AllowsCount, unitType.Name, parentRequirement.Count, allowedTypeCount, parentUnit.Size);
 		}
 
 		protected override string AllowsAddingFailedMessage