Make "can't arm HWP" message more helpful

Author: SupSuper

bin/standard/xcom1/Language/en-GB.yml

@@ -859,7 +859,7 @@ en-GB:
   STR_REAPER_CORPSE: "Reaper Corpse"
   STR_SECTOPOD_CORPSE: "Sectopod Corpse"
   STR_CYBERDISC_CORPSE: "Cyberdisc Corpse"
-  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough {0} to arm HWP"
+  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough ammunition to arm HWP{SMALLLINE}Each HWP requires {0} {1}."
   STR_NOT_ENOUGH_EQUIPMENT_TO_FULLY_RE_EQUIP_SQUAD: "Not enough equipment to fully re-equip squad"
   STR_MARS_CYDONIA_LANDING: "Mars: Cydonia Landing"
   STR_MARS_CYDONIA_LANDING_BRIEFING: "Your Avenger craft has landed in the region of Cydonia on the surface of Mars. Our information indicates that one of the pyramid constructions contains a green access lift to an underground complex. Once you have assembled all your soldiers in the lift area click on the 'abort mission' icon to continue to the next stage."

bin/standard/xcom1/Language/en-US.yml

@@ -859,7 +859,7 @@ en-US:
   STR_REAPER_CORPSE: "Reaper Corpse"
   STR_SECTOPOD_CORPSE: "Sectopod Corpse"
   STR_CYBERDISC_CORPSE: "Cyberdisc Corpse"
-  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough {0} to arm HWP"
+  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough ammunition to arm HWP{SMALLLINE}Each HWP requires {0} {1}."
   STR_NOT_ENOUGH_EQUIPMENT_TO_FULLY_RE_EQUIP_SQUAD: "Not enough equipment to fully re-equip squad"
   STR_MARS_CYDONIA_LANDING: "Mars: Cydonia Landing"
   STR_MARS_CYDONIA_LANDING_BRIEFING: "Your Avenger craft has landed in the region of Cydonia on the surface of Mars. Our information indicates that one of the pyramid constructions contains a green access lift to an underground complex. Once you have assembled all your soldiers in the lift area click on the 'abort mission' icon to continue to the next stage."

bin/standard/xcom2/Language/en-GB.yml

@@ -1008,7 +1008,7 @@ en-GB:
   STR_HALLUCINOID_CORPSE: "Hallucinoid Corpse"
   STR_XARQUID_CORPSE: "Xarquid Corpse"
 
-  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough {0} to arm SWS"
+  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough ammunition to arm SWS{SMALLLINE}Each SWS requires {0} {1}."
   STR_NOT_ENOUGH_EQUIPMENT_TO_FULLY_RE_EQUIP_SQUAD: "Not enough equipment to fully re-equip squad"
   STR_YOU_NEED_TO_RESEARCH_ITEM_TO_PRODUCE_ITEM: "You will need to research a{NEWLINE}{0}{NEWLINE}in order to produce the{NEWLINE}{1}"
   STR_THE_ALIENS_HAVE_DESTROYED_THE_UNDEFENDED_BASE: "The Aliens have destroyed the undefended base {0}"

bin/standard/xcom2/Language/en-US.yml

@@ -1007,7 +1007,7 @@ en-US:
   STR_HALLUCINOID_CORPSE: "Hallucinoid Corpse"
   STR_XARQUID_CORPSE: "Xarquid Corpse"
 
-  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough {0} to arm SWS"
+  STR_NOT_ENOUGH_AMMO_TO_ARM_HWP: "Not enough ammunition to arm SWS{SMALLLINE}Each SWS requires {0} {1}."
   STR_NOT_ENOUGH_EQUIPMENT_TO_FULLY_RE_EQUIP_SQUAD: "Not enough equipment to fully re-equip squad"
   STR_YOU_NEED_TO_RESEARCH_ITEM_TO_PRODUCE_ITEM: "You will need to research a{NEWLINE}{0}{NEWLINE}in order to produce the{NEWLINE}{1}"
   STR_THE_ALIENS_HAVE_DESTROYED_THE_UNDEFENDED_BASE: "The Aliens have destroyed the undefended base {0}"

src/Basescape/CraftEquipmentState.cpp

@@ -542,7 +542,7 @@ void CraftEquipmentState::moveRightByValue(int change)
 				int canBeAdded = std::min(change, baseQty);
 				if (canBeAdded > 0)
 				{
-					for (int i=0; i < canBeAdded; ++i)
+					for (int i = 0; i < canBeAdded; ++i)
 					{
 						if (_game->getSavedGame()->getMonthsPassed() != -1)
 						{
@@ -556,12 +556,12 @@ void CraftEquipmentState::moveRightByValue(int change)
 				{
 					// So we haven't managed to increase the count of vehicles because of the ammo
 					_timerRight->stop();
-					LocalizedText msg(tr("STR_NOT_ENOUGH_AMMO_TO_ARM_HWP").arg(tr(ammo->getType())));
+					LocalizedText msg(tr("STR_NOT_ENOUGH_AMMO_TO_ARM_HWP").arg(ammoPerVehicle).arg(tr(ammo->getType())));
 					_game->pushState(new ErrorMessageState(msg, _palette, _game->getMod()->getInterface("craftEquipment")->getElement("errorMessage")->color, "BACK04.SCR", _game->getMod()->getInterface("craftEquipment")->getElement("errorPalette")->color));
 				}
 			}
 			else
-				for (int i=0; i < change; ++i)
+				for (int i = 0; i < change; ++i)
 				{
 					c->getVehicles()->push_back(new Vehicle(item, item->getClipSize(), size));
 					if (_game->getSavedGame()->getMonthsPassed() != -1)