Mercurial > repos > IBDev-IBBoard.WarFoundry.GUI.WinForms
diff Util/UnitEquipmentChoice.cs @ 34:3ceb0efd261f
Re #118: Allow equipment amounts of "ratio" equipment to be define as absolute or ratio amounts
* Use new commands created in previous revision
Re #122: Make usage of percentage or ratio common
* Make sure all usage of percentages are correct
Re #117: Add percentage and number boxes to equipment item dialogs
* Fix some enable/disable inconsistencies for percentage amounts
* Fix problems where fixed limits weren't honoured by widgets
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Thu, 13 Aug 2009 21:16:21 +0000 |
| parents | 7c366fe55635 |
| children | 6ab7ddc038f9 |
line wrap: on
line diff
--- a/Util/UnitEquipmentChoice.cs Sun Aug 09 12:05:24 2009 +0000 +++ b/Util/UnitEquipmentChoice.cs Thu Aug 13 21:16:21 2009 +0000 @@ -29,8 +29,20 @@ public override string ToString() { - return String.Format("{0} (For {1} at {2}pts each)", item.Name, UnitEquipmentItem.FormatEquipmentAmount(item, unit.GetEquipmentAmount(item)), item.Cost); - } + return String.Format("{0} (For {1} at {2}pts each)", item.Name, GetAmountString(), item.Cost); + } + + private string GetAmountString() + { + if (unit.GetEquipmentAmountIsRatio(item)) + { + return UnitEquipmentRatioSelection.GetEquipmentAmountString(unit.GetEquipmentAmount(item)); + } + else + { + return UnitEquipmentNumericSelection.GetEquipmentAmountString(unit.GetEquipmentAmount(item)); + } + } public UnitEquipmentItem Item {