Mercurial > repos > IBDev-IBBoard.WarFoundry.API
diff api/Objects/UnitEquipmentRatioSelection.cs @ 212:dce340f9cedc
Re #217: Rounding problem with equipment cost calculations
* Temporary solution (which I thought I'd already committed yesterday) to make sure that rounding of amount doesn't round outside limit if limit and item rounding directions are different
Re #220: Make percentage and numeric amounts more obvious
* Deprecate some calculation and presentation methods and move them to UnitEquipmentUtils
* Add method to return the number of equipment items taken rather than the amount taken
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Sat, 21 Nov 2009 16:40:54 +0000 |
| parents | 36adabb1c3ea |
| children | 1b718b67f7f6 |
line wrap: on
line diff
--- a/api/Objects/UnitEquipmentRatioSelection.cs Sat Nov 21 11:50:48 2009 +0000 +++ b/api/Objects/UnitEquipmentRatioSelection.cs Sat Nov 21 16:40:54 2009 +0000 @@ -3,7 +3,9 @@ // 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.CustomMath; using IBBoard.Limits; +using IBBoard.WarFoundry.API.Util; namespace IBBoard.WarFoundry.API.Objects { @@ -25,16 +27,21 @@ { get { - double numberTaken = (AmountTaken / 100) * EquipmentForUnit.Size; - return (int) (EquipmentItem.RoundNumberUp ? Math.Ceiling(numberTaken) : Math.Floor(numberTaken)); + double exactNumberTaken = (AmountTaken / 100) * EquipmentForUnit.Size; + int wholeNumberTaken = (int) IBBMath.Round(exactNumberTaken, EquipmentItem.RoundNumberUp); + int maxTaken = UnitEquipmentUtil.GetMaxEquipmentCount(EquipmentForUnit, EquipmentItem); + int minTaken = UnitEquipmentUtil.GetMinEquipmentCount(EquipmentForUnit, EquipmentItem); + return Math.Min(Math.Max(wholeNumberTaken, minTaken), maxTaken); } - } - + } + + [Obsolete("Implementation is down to the UI")] public override string GetEquipmentAmountString () { return GetEquipmentAmountString(AmountTaken); - } - + } + + [Obsolete("Implementation is down to the UI")] public static string GetEquipmentAmountString(double amount) { string amountString;