diff api/Objects/AbstractUnitEquipmentItemSelection.cs @ 183:36adabb1c3ea

Re #198: Add slots with counts to units * Remove old Min/MaxNumber/Percentage for equipment and replace with limits * Refactor equipment selections and remove "numeric for ratio" as the limits handle the upper/lower limit differences * Stop equipment selections taking an amount of 0 for out of range amounts * Add "IsValid" property for selections * Removed use of "-1" as an 'infinity' limit - now use 100% as a more correct value * Change "unlimitedSize" limit in schema to "unitSizeLimit"
author IBBoard <dev@ibboard.co.uk>
date Mon, 26 Oct 2009 20:55:04 +0000
parents 2f3cafb69799
children dce340f9cedc
line wrap: on
line diff
--- a/api/Objects/AbstractUnitEquipmentItemSelection.cs	Sat Oct 24 18:59:04 2009 +0000
+++ b/api/Objects/AbstractUnitEquipmentItemSelection.cs	Mon Oct 26 20:55:04 2009 +0000
@@ -46,23 +46,35 @@
 			}
 			set
 			{
-				if (IsValidValue(value))
-				{
-					amountTaken = value;
-				}
-				else
+				amountTaken = value;
+				
+				if (!IsValidValue(value))
 				{
 					//Fire validation failed event (once we have one)
 				}
 			}
 		}
 		
-		protected bool IsValidValue(double newValue)
+		public bool IsValid
 		{
-			return IsInRange(newValue);
+			get
+			{
+				return IsValidValue(AmountTaken) && IsInRange(AmountTaken);
+			}	
 		}
 		
-		protected abstract bool IsInRange(double newValue);
+		protected virtual bool IsValidValue(double newValue)
+		{
+			return true;
+		}
+		
+		protected bool IsInRange(double newValue)
+		{
+			int unitSize = EquipmentForUnit.Size;
+			int minLimit = EquipmentItem.MinLimit.GetLimit(unitSize);
+			int maxLimit = EquipmentItem.MaxLimit.GetLimit(unitSize);
+			return (minLimit <= newValue) && (newValue <= maxLimit);
+		}
 		
 		public double TotalCost
 		{