- New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706

- New Feature: Enemy helicopters allow the AI to rapidly deploy troops aross the map. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343707&#msg_343707. GameDir <= r2279 is required.
- Fix: income of mine 0 was not correctly calculated

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

Utils/Text.h

@@ -2925,6 +2925,9 @@ extern STR16	szIMPGearDropDownNoneText[];
 // Flugente: militia movement
 extern STR16	szMilitiaStrategicMovementText[];
 
+// Flugente: enemy heli/SAM
+extern STR16	szEnemyHeliText[];
+
 #define TACTICAL_INVENTORY_DIALOG_NUM    16
 #define TACTICAL_COVER_DIALOG_NUM        16
 

Utils/_ChineseText.cpp

@@ -4155,6 +4155,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"存货",
 	L"离开",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4523,6 +4524,7 @@ STR16 pTransactionText[] =
 	L"释放俘虏所需的赎金", //L"Ransom for released prisoners",
 	L"记录捐款费", //L"WHO data subscription",  // Flugente: disease
 	L"Kerberus安保公司的费用", //L"Payment to Kerberus",　　// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8898,6 +8900,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d夜晚听力范围\n", //L" %s%d hearing range during the night\n",
 	L" %s%d白天听力范围\n", //L" %s%d hearing range during the day\n",
 	L" %s%d解除陷阱效率\n",
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
  
 	L" %s%d%％友好对话效果\n", //L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%％直接对话效果\n", //L" %s%d%% effectiveness to direct approach\n",
@@ -10846,6 +10849,21 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"民兵的志愿者: %d (+%5.3f)",  //L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 // WANNE: Some Chinese specific strings that needs to be in unicode!
 STR16 ChineseSpecString1 = L"%％";			//defined in _ChineseText.cpp as this file is already unicode
 STR16 ChineseSpecString2 = L"*%3d%％%%";	//defined in _ChineseText.cpp as this file is already unicode

Utils/_DutchText.cpp

@@ -4154,6 +4154,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inventaris",
 	L"OK",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4524,6 +4525,7 @@ STR16 pTransactionText[] =
 	L"Ransom for released prisoners",	// Flugente: prisoner system TODO.Translate
 	L"WHO data subscription",	// Flugente: disease TODO.Translate
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8912,6 +8914,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d hearing range during the night\n",
 	L" %s%d hearing range during the day\n",
 	L" %s%d effectivity at disarming traps\n",	// TODO.Translate
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%% effectiveness to direct approach\n",
@@ -10860,4 +10863,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //DUTCH

Utils/_EnglishText.cpp

@@ -4152,6 +4152,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inventory",
 	L"Exit",
+	L"Repair",
 };
 
 // town strings
@@ -4520,6 +4521,7 @@ STR16 pTransactionText[] =
 	L"Ransom for released prisoners",	// Flugente: prisoner system
 	L"WHO data subscription",	// Flugente: disease
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8896,6 +8898,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d hearing range during the night\n",
 	L" %s%d hearing range during the day\n",
 	L" %s%d effectivity at disarming traps\n",
+	L" %s%d%% CTH with SAMs\n",
 
 	L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%% effectiveness to direct approach\n",
@@ -10898,4 +10901,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //ENGLISH

Utils/_FrenchText.cpp

@@ -4158,6 +4158,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inventaire",
 	L"Quitter",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4528,6 +4529,7 @@ STR16 pTransactionText[] =
 	L"Argent des prisonniers libérés",	// Flugente: prisoner system
 	L"WHO data subscription",	// Flugente: disease TODO.Translate
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8897,6 +8899,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d en audition pendant la nuit\n",
 	L" %s%d en audition pendant la journée\n",
 	L" %s%d d'efficacité à désamorcer les pièges\n",
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% d'efficacité dans une approche amicale\n",
 	L" %s%d%% d'efficacité dans une approche directe\n",
@@ -10845,4 +10848,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //FRENCH

Utils/_GermanText.cpp

@@ -4153,6 +4153,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inventar",
 	L"Exit",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4500,6 +4501,7 @@ STR16 pTransactionText[] =
 	L"Lösegeld erpresst",	// Flugente: prisoner system
 	L"WHO data subscription",	// Flugente: disease TODO.Translate
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8728,6 +8730,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d hearing range during the night\n",
 	L" %s%d hearing range during the day\n",
 	L" %s%d effectivity at disarming traps\n",	// TODO.Translate
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%% effectiveness to direct approach\n",
@@ -10676,4 +10679,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //GERMAN

Utils/_ItalianText.cpp

@@ -4148,6 +4148,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inventario",
 	L"Uscita",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4518,6 +4519,7 @@ STR16 pTransactionText[] =
 	L"Ransom for released prisoners",	// Flugente: prisoner system TODO.Translate
 	L"WHO data subscription",	// Flugente: disease TODO.Translate
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8906,6 +8908,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d hearing range during the night\n",
 	L" %s%d hearing range during the day\n",
 	L" %s%d effectivity at disarming traps\n",	// TODO.Translate
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%% effectiveness to direct approach\n",
@@ -10854,4 +10857,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //ITALIAN

Utils/_PolishText.cpp

@@ -4159,6 +4159,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Inwentarz",
 	L"Zamknij",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4529,6 +4530,7 @@ STR16 pTransactionText[] =
 	L"Ransom for released prisoners",	// Flugente: prisoner system TODO.Translate
 	L"WHO data subscription",	// Flugente: disease TODO.Translate
 	L"Payment to Kerberus",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8919,6 +8921,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d hearing range during the night\n",
 	L" %s%d hearing range during the day\n",
 	L" %s%d effectivity at disarming traps\n",	// TODO.Translate
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% effectiveness to friendly approach\n",
 	L" %s%d%% effectiveness to direct approach\n",
@@ -10867,4 +10870,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //POLISH

Utils/_RussianText.cpp

@@ -4154,6 +4154,7 @@ STR16 pMapPopUpInventoryText[] =
 {
 	L"Инвентарь",
 	L"Выйти",
+	L"Repair",	// TODO.Translate
 };
 
 // town strings
@@ -4522,6 +4523,7 @@ STR16 pTransactionText[] =
 	L"Выкуп за освобожденных заключенных",	// Flugente: prisoner system
 	L"ВОЗ, подписка",	// Flugente: disease
 	L"Оплата услуг Цербер",	// Flugente: PMC
+	L"SAM site repair", // Flugente: SAM repair // TODO.Translate
 };
 
 STR16 pTransactionAlternateText[] =
@@ -8896,6 +8898,7 @@ STR16	szBackgroundText_Value[]=
 	L" %s%d дальность слуха ночью\n",
 	L" %s%d дальность слуха днем\n",
 	L" %s%d эффективность при разминировании ловушек\n",
+	L" %s%d%% CTH with SAMs\n",	// TODO.Translate
 
 	L" %s%d%% эффективность дружеского обращения\n",
 	L" %s%d%% эффективность прямого обращении\n",
@@ -10898,4 +10901,19 @@ STR16 szMilitiaStrategicMovementText[] =
 	L"Militia Volunteers: %d (+%5.3f)",
 };
 
+STR16 szEnemyHeliText[] =	// TODO.Translate
+{
+	L"Enemy helicopter shot down in %s!",
+	L"We... uhm... currently don't control that site, commander...",
+	L"The SAM does not need maintenance at the moment.",
+	L"We've already ordered the repair, this will take time.",
+
+	L"We do not have enough resources to do that.",
+	L"Repair SAM site? This will cost %d$ and take %d hours.",
+	L"Enemy helicopter hit in %s.",
+	L"%s fires %s at enemy helicopter in %s.",
+
+	L"SAM in %s fires at enemy helicopter in %s.",
+};
+
 #endif //RUSSIAN