# HG changeset patch # User IBBoard # Date 1258920891 0 # Node ID 65553d2c86122334fab84a789ce7d7a5d519ef93 # Parent 391446c9b2506d67c216be66192b6e1619ff87c5 * Line-ending fix no-open-ticket diff -r 391446c9b250 -r 65553d2c8612 api/Commands/AbstractSetUnitEquipmentAmountCommand.cs --- a/api/Commands/AbstractSetUnitEquipmentAmountCommand.cs Sun Nov 22 20:08:45 2009 +0000 +++ b/api/Commands/AbstractSetUnitEquipmentAmountCommand.cs Sun Nov 22 20:14:51 2009 +0000 @@ -5,7 +5,7 @@ using System; using IBBoard.Commands; using IBBoard.Lang; -using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API.Objects; using IBBoard.WarFoundry.API.Util; namespace IBBoard.WarFoundry.API.Commands @@ -26,7 +26,7 @@ { this.unit = unit; equip = item; - oldAmount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip); + oldAmount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip); oldAmountWasRatio = UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equip); } diff -r 391446c9b250 -r 65553d2c8612 api/Exporters/WarFoundryHtmlExporter.cs --- a/api/Exporters/WarFoundryHtmlExporter.cs Sun Nov 22 20:08:45 2009 +0000 +++ b/api/Exporters/WarFoundryHtmlExporter.cs Sun Nov 22 20:14:51 2009 +0000 @@ -10,7 +10,7 @@ using System.Xml.Schema; using IBBoard.Lang; using IBBoard.Xml; -using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API.Objects; using IBBoard.WarFoundry.API.Util; namespace IBBoard.WarFoundry.API.Exporters @@ -159,29 +159,29 @@ else { sb.Append(", "); - } - - string amountString; - double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip); - - if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equip)) - { - int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, equip); - - if (amount == 100) - { - amountString = Translation.GetTranslation("armyHtmlExportEquipAmountAll", "all ({1})", amount, number); - } - else - { - amountString = Translation.GetTranslation("armyHtmlExportEquipAmountPercentage", "{0}% ({1})", amount, number); - } - } - else - { - amountString = amount.ToString(); - } - + } + + string amountString; + double amount = UnitEquipmentUtil.GetEquipmentAmount(unit, equip); + + if (UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, equip)) + { + int number = UnitEquipmentUtil.GetEquipmentAmountTaken(unit, equip); + + if (amount == 100) + { + amountString = Translation.GetTranslation("armyHtmlExportEquipAmountAll", "all ({1})", amount, number); + } + else + { + amountString = Translation.GetTranslation("armyHtmlExportEquipAmountPercentage", "{0}% ({1})", amount, number); + } + } + else + { + amountString = amount.ToString(); + } + sb.Append(Translation.GetTranslation("armyHtmlExportEquipAmountRatio", "{0} for {1}", equip.Name, amountString)); } diff -r 391446c9b250 -r 65553d2c8612 api/Factories/Xml/WarFoundryXmlSaver.cs --- a/api/Factories/Xml/WarFoundryXmlSaver.cs Sun Nov 22 20:08:45 2009 +0000 +++ b/api/Factories/Xml/WarFoundryXmlSaver.cs Sun Nov 22 20:14:51 2009 +0000 @@ -10,8 +10,8 @@ using IBBoard.Lang; using IBBoard.Xml; using IBBoard.WarFoundry.API.Factories.Xml.Zip; -using IBBoard.WarFoundry.API.Objects; -using IBBoard.WarFoundry.API.Savers; +using IBBoard.WarFoundry.API.Objects; +using IBBoard.WarFoundry.API.Savers; using IBBoard.WarFoundry.API.Util; using ICSharpCode.SharpZipLib.Zip; @@ -147,7 +147,7 @@ { XmlElement equipmentItemElem = doc.CreateElement("equipItem"); equipmentItemElem.SetAttribute("id", item.ID); - equipmentItemElem.SetAttribute("amount", UnitEquipmentUtil.GetEquipmentAmount(unit, item).ToString()); + equipmentItemElem.SetAttribute("amount", UnitEquipmentUtil.GetEquipmentAmount(unit, item).ToString()); equipmentItemElem.SetAttribute("amountType", UnitEquipmentUtil.GetEquipmentAmountIsRatio(unit, item) ? "ratio" : "fixed"); return equipmentItemElem; } diff -r 391446c9b250 -r 65553d2c8612 api/Objects/Unit.cs --- a/api/Objects/Unit.cs Sun Nov 22 20:08:45 2009 +0000 +++ b/api/Objects/Unit.cs Sun Nov 22 20:14:51 2009 +0000 @@ -407,7 +407,7 @@ } private void RemoveEquipmentItem(UnitEquipmentItem equip) - { + { double oldAmount = UnitEquipmentUtil.GetEquipmentAmount(this, equip); if (oldAmount != 0)