Merged revision(s) 6997-6998 from branches/ja2_source_official_2014:

- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Utils/Text.h

@@ -2579,6 +2579,7 @@ enum
 	TEXT_CAMPAIGNHISTORY_DETAIL_UNKNOWNLOCATION,
 
 	TEXT_CAMPAIGNHISTORY_DETAIL_BUILDINGDAMAGE,
+	TEXT_CAMPAIGNHISTORY_DETAIL_BUILDINGANDCIVDAMAGE,
 	TEXT_CAMPAIGNHISTORY_DETAIL_REINFORCE_BOTH,
 	TEXT_CAMPAIGNHISTORY_DETAIL_REINFORCE,
 	TEXT_CAMPAIGNHISTORY_DETAIL_CHEMICAL_BOTH,
@@ -2587,6 +2588,9 @@ enum
 	TEXT_CAMPAIGNHISTORY_DETAIL_TANKS,
 	TEXT_CAMPAIGNHISTORY_DETAIL_SNIPERS_BOTH,
 	TEXT_CAMPAIGNHISTORY_DETAIL_SNIPERS,
+	TEXT_CAMPAIGNHISTORY_DETAIL_SAMSITESABOTAGED,
+	TEXT_CAMPAIGNHISTORY_DETAIL_SPY_ENEMY,
+	TEXT_CAMPAIGNHISTORY_DETAIL_SPY_PLAYER,
 
 	TEXT_CAMPAIGNHISTORY_DETAIL_MAX,
 };

Utils/_ChineseText.cpp

@@ -8333,7 +8333,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"和",
 	L"an unknown location",	// TODO.Translate
 
-	L"该分区的建筑受损。%d名市民被杀，%d名市民受伤。",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"在战斗中，%s和%s呼叫了支援。",
 	L"在战斗中，%s呼叫了支援。",
 	L"目击者报道交战双方都使用了化学武器。",
@@ -8342,6 +8343,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%s部署了%d辆坦克，%d辆坦克在激烈的交火中被摧毁。",
 	L"据称双方都部署了狙击手。",
 	L"未经证实的消息称有%s名狙击手参与了交火。"
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_DutchText.cpp

@@ -8347,7 +8347,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8356,6 +8357,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_EnglishText.cpp

@@ -8331,7 +8331,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8340,6 +8341,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight.",
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_FrenchText.cpp

@@ -8330,7 +8330,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"et",
 	L"an unknown location",	// TODO.Translate
 
-	L"Des bâtiments ont été endommagés. Il y a eu %d civils tués et %d blessés.",
+	L"Des bâtiments ont été endommagés.",
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",	// TODO.Translate
 	L"Pendant l'attaque, %s et %s ont appelé des renforts.",
 	L"Pendant l'attaque, %s a appelé des renforts.",
 	L"Les témoins rapportent l'utilisation d'armes chimiques par les deux camps.",
@@ -8339,6 +8340,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"Il y avait %d chars pour renforcer %s. %d d'entre eux ont été détruits dans des combats acharnés.",
 	L"Les deux camps avaient des tireurs d'élite.",
 	L"Des sources non vérifiées indiquent que %s tireurs d'élite ont été impliqués dans le combat."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_GermanText.cpp

@@ -8157,7 +8157,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8166,6 +8167,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_ItalianText.cpp

@@ -8339,7 +8339,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8348,6 +8349,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_PolishText.cpp

@@ -8357,7 +8357,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8366,6 +8367,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_RussianText.cpp

@@ -8335,7 +8335,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8344,6 +8345,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_TaiwaneseText.cpp

@@ -8347,7 +8347,8 @@ STR16	szCampaignHistoryDetail[]=
 	L"and",
 	L"an unknown location",	// TODO.Translate
 
-	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
+	L"Buildings in the sector were damaged.",	// TODO.Translate
+	L"In the fighting, buildings in the sector were damaged, and %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
 	L"During the attack, %s called reinforcements.",
 	L"Eyewitnesses report the use of chemical weapons from both sides.",
@@ -8356,6 +8357,9 @@ STR16	szCampaignHistoryDetail[]=
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
 	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"This sector is of huge strategic importance, as it houses one of the handful of anti-air missile batteries the arulcan army posesses. Aerial photographs show extensive damage to the command center. This will leave the airspace above Arulco undefended for the time being.",
+	L"The situation on the ground has gotten even more confusing, as it seems rebel infighting has reached a new level. We now have confirmation that rebel militia engaed in active combat with foreign mercenaries.",
+	L"The royalists position seems more precarious than previously thought. Reports of a split surfaced, with amry personnel opening fire on each other.",
 };
 
 STR16	szCampaignHistoryTimeString[]=