diff api/Objects/UnitEquipmentRatioSelection.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/UnitEquipmentRatioSelection.cs	Sat Oct 24 18:59:04 2009 +0000
+++ b/api/Objects/UnitEquipmentRatioSelection.cs	Mon Oct 26 20:55:04 2009 +0000
@@ -3,6 +3,7 @@
 // The file and the library/program it is in are licensed and distributed, without warranty, under the GNU Affero GPL license, either version 3 of the License or (at your option) any later version. Please see COPYING for more information and the full license.
 
 using System;
+using IBBoard.Limits;
 
 namespace IBBoard.WarFoundry.API.Objects
 {	
@@ -16,7 +17,7 @@
 		{
 		}
 		
-		public UnitEquipmentRatioSelection(Unit unit, UnitEquipmentItem item) : base(unit, item, item.MinPercentage)
+		public UnitEquipmentRatioSelection(Unit unit, UnitEquipmentItem item) : base(unit, item, ((IPercentageLimit)item.MinLimit).Percentage)
 		{
 		}
 					
@@ -28,11 +29,6 @@
 				return (int) (EquipmentItem.RoundNumberUp ? Math.Ceiling(numberTaken) : Math.Floor(numberTaken));
 			}
 		}
-		
-		protected override bool IsInRange (double newValue)
-		{
-			return (EquipmentItem.MinPercentage <= newValue) && (newValue <= EquipmentItem.MaxPercentage);
-		}
 
 		public override string GetEquipmentAmountString ()
 		{