diff api/Objects/Unit.cs @ 101:f7b9423c2a5a

Big mess of updates, breaking our rules on "commit little and often" because the code was so ugly. This revision will be broken for the WinForms UI, but as MonoDevelop/eSVN don't have a way of committing multiple projects in one go it can't be helped (Eclipse's Team Sync view could handle it) Fixes #122: Make usage of percentage or ratio common * All usage of ratio amounts for equipment items should now assume percentage * Properly calculate number taken for ratio selection (divide by 0 now we're using percentages) Fixes #118: Allow equipment amounts of "ratio" equipment to be define as absolute or ratio amounts * Added extra commands that differentiate between ratio and absolute amounts Fixes #120: Numeric limit equipment items show large percentages * Now made formatting treat ratios as percentages (don't multiply by 100) * Move string formatting to UnitEquipmentItem...Selection classes * Add method to Unit to say whether an equipment item is a numeric or ratio amount
author IBBoard <dev@ibboard.co.uk>
date Thu, 13 Aug 2009 21:09:20 +0000
parents 4dd1c41c95b4
children 2f3cafb69799
line wrap: on
line diff
--- a/api/Objects/Unit.cs	Thu Aug 13 19:07:04 2009 +0000
+++ b/api/Objects/Unit.cs	Thu Aug 13 21:09:20 2009 +0000
@@ -268,6 +268,16 @@
 		{
 			return GetEquipmentAmount(UnitType.GetEquipmentItem(equipID));
 		}
+
+		public bool GetEquipmentAmountIsRatio(UnitEquipmentItem item)
+		{
+			return (DictionaryUtils.GetValue(equipment, item) is UnitEquipmentRatioSelection);
+		}
+
+		public bool GetEquipmentAmountIsRatio(string itemID)
+		{
+			return GetEquipmentAmountIsRatio(UnitType.GetEquipmentItem(itemID));
+		}
 		
 		public void SetEquipmentAmount(UnitEquipmentItem equip, int amount)
 		{
@@ -330,9 +340,9 @@
 				throw new InvalidOperationException("Equipment with ID "+equip.ID+" for unit of type "+UnitType.ID+" has an absolute limit, not a ratio limit");
 			}
 			
-			if (ratio > 1)
+			if (ratio > 100)
 			{
-				ratio = 1;
+				ratio = 100;
 			}
 			else if (ratio < 0)
 			{