Helicopter features (by anv):

- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

Appropriate Data in GameDir r1897.

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

Utils/ExportStrings.cpp

@@ -173,7 +173,8 @@ bool Loc::ExportStrings()
 	ExportSection(props, L"Repair",						Loc::pRepairStrings,				0,	4);
 	ExportSection(props, L"PreStatBuild",				Loc::sPreStatBuildString,			0,	6);
 	ExportSection(props, L"StatGain",					Loc::sStatGainStrings,				0,	11);
-	ExportSection(props, L"HelicopterEta",				Loc::pHelicopterEtaStrings,			0,	10);
+	ExportSection(props, L"HelicopterEta",				Loc::pHelicopterEtaStrings,			0,	TEXT_NUM_STR_HELI_ETA);
+	ExportSection(props, L"HelicopterRepair",			Loc::pHelicopterRepairRefuelStrings,		0,	TEXT_NUM_STR_HELI_REPAIRS);
 	ExportSection(props, L"MapLevel",					Loc::sMapLevelString,				0,	1);
 	ExportSection(props, L"Loyal",						Loc::gsLoyalString,					0,	1);
 	ExportSection(props, L"Underground",				Loc::gsUndergroundString,			0,	1);

Utils/Text.h

@@ -195,6 +195,7 @@ extern STR16 pRepairStrings[];
 extern STR16 sPreStatBuildString[];
 extern STR16 sStatGainStrings[];
 extern STR16 pHelicopterEtaStrings[];
+extern STR16 pHelicopterRepairRefuelStrings[];
 extern STR16 sMapLevelString[];
 extern STR16 gsLoyalString[];
 extern STR16 pMapHeliErrorString[];
@@ -617,6 +618,39 @@ enum
 	TEXT_NUM_STR_TT
 };
 
+enum
+{
+	STR_HELI_ETA_TOTAL_DISTANCE,
+	STR_HELI_ETA_SAFE,
+	STR_HELI_ETA_UNSAFE,
+	STR_HELI_ETA_TOTAL_COST,
+	STR_HELI_ETA_ETA,
+
+	STR_HELI_ETA_LOW_ON_FUEL_HOSTILE_TERRITORY,
+	STR_HELI_ETA_PASSENGERS,
+	STR_HELI_ETA_SELECT_SKYRIDER_OR_ARRIVALS,
+	STR_HELI_ETA_SKYRIDER,
+	STR_HELI_ETA_ARRIVALS,
+
+	STR_HELI_ETA_HELI_DAMAGED_HOSTILE_TERRITORY,
+	STR_HELI_ETA_KICK_OUT_PASSENGERS_PROMPT,
+	STR_HELI_ETA_REMAINING_FUEL,
+	STR_HELI_ETA_DISTANCE_TO_REFUEL_SITE,
+
+	TEXT_NUM_STR_HELI_ETA,
+};
+
+// anv: helicopter repairs
+enum
+{
+	STR_HELI_RR_REPAIR_PROMPT,
+	STR_HELI_RR_REPAIR_IN_PROGRESS,
+	STR_HELI_RR_REPAIR_FINISHED,
+	STR_HELI_RR_REFUEL_FINISHED,
+
+	TEXT_NUM_STR_HELI_REPAIRS,
+};
+
 #define LARGE_STRING_LENGTH			200
 #define MED_STRING_LENGTH				80
 #define	SMALL_STRING_LENGTH			20
@@ -1018,23 +1052,23 @@ enum
 	PRISONER_OFFER_SURRENDER_STR,
 	PRISONER_TALK_STR,
 
-        // sevenfm: new disarm trap dialog, new messages for wrong mines when arming
-        DISARM_DIALOG_DISARM,
-        DISARM_DIALOG_INSPECT,
-        DISARM_DIALOG_REMOVE_BLUEFLAG,
-        DISARM_DIALOG_BLOWUP,
-        DISARM_DIALOG_ACTIVATE_TRIPWIRE,
-        DISARM_DIALOG_DEACTIVATE_TRIPWIRE,
-        DISARM_DIALOG_REVEAL_TRIPWIRE,
-        ARM_MESSAGE_NO_DETONATOR,
-        ARM_MESSAGE_ALREADY_ARMED,
-        INSPECT_RESULT_SAFE,
-        INSPECT_RESULT_MOSTLY_SAFE,
-        INSPECT_RESULT_RISKY,
-        INSPECT_RESULT_DANGEROUS,
-        INSPECT_RESULT_HIGH_DANGER,
-	
-        TEXT_NUM_TACTICAL_STR,
+    // sevenfm: new disarm trap dialog, new messages for wrong mines when arming
+    DISARM_DIALOG_DISARM,
+    DISARM_DIALOG_INSPECT,
+    DISARM_DIALOG_REMOVE_BLUEFLAG,
+    DISARM_DIALOG_BLOWUP,
+    DISARM_DIALOG_ACTIVATE_TRIPWIRE,
+    DISARM_DIALOG_DEACTIVATE_TRIPWIRE,
+    DISARM_DIALOG_REVEAL_TRIPWIRE,
+    ARM_MESSAGE_NO_DETONATOR,
+    ARM_MESSAGE_ALREADY_ARMED,
+    INSPECT_RESULT_SAFE,
+    INSPECT_RESULT_MOSTLY_SAFE,
+    INSPECT_RESULT_RISKY,
+    INSPECT_RESULT_DANGEROUS,
+    INSPECT_RESULT_HIGH_DANGER,
+
+	TEXT_NUM_TACTICAL_STR
 };
 
 enum{

Utils/_ChineseText.cpp

@@ -3304,6 +3304,17 @@ STR16 pHelicopterEtaStrings[] =
   L"选择Skyrider还是“着陆点”？",
   L"Skyrider",
   L"着陆点",
+  L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+  L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4105,8 +4116,11 @@ STR16 pHistoryStrings[] =
 	L"宰掉了血猫",
 	L"%s被干掉了",
 	L"把一个恐怖分子的头颅给了Carmen。",
+	//76-80
 	L"Slay走了",
 	L"干掉了%s",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_DutchText.cpp

@@ -3299,6 +3299,17 @@ STR16 pHelicopterEtaStrings[] =
 	L"Selecteer Skyrider of Aanvoer Drop-plaats?",			// L"Select Skyrider or the Arrivals Drop-off?",
 	L"Skyrider",
 	L"Aanvoer",						// L"Arrivals",
+	L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+	L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4104,8 +4115,11 @@ STR16 pHistoryStrings[] =
 	L"Afgeslacht door bloodcats",				// ("Slaughtered bloodcats")
 	L"%s was gedood",						// ("%s was killed")
 	L"Carmen kop v.e. terrorist gegeven",		// ("Gave Carmen a terrorist's head")
+	//76-80
 	L"Slay vertrok",						// ("Slay left")
 	L"%s vermoord",						// ("Killed %s")
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_EnglishText.cpp

@@ -3299,10 +3299,23 @@ STR16 pHelicopterEtaStrings[] =
 	L"Total Cost: ", 		// total cost of trip by helicopter
 	L"ETA:  ", 			// ETA is an acronym for "estimated time of arrival" 
 	L"Helicopter is low on fuel and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
-  L"Passengers: ",
-  L"Select Skyrider or the Arrivals Drop-off?",
-  L"Skyrider",
-  L"Arrivals",
+	L"Passengers: ",
+	L"Select Skyrider or the Arrivals Drop-off?",
+	L"Skyrider",
+	L"Arrivals",
+	L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+	L"Helicopter will now return straight to base, do you want to drop down passengers before?",
+	L"Remaining Fuel:",
+	L"Dist. To Refuel Site:",
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4104,8 +4117,11 @@ STR16 pHistoryStrings[] =
 	L"Slaughtered bloodcats",
 	L"%s was killed",
 	L"Gave Carmen a terrorist's head",
+	//76-80
 	L"Slay left",
 	L"Killed %s",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_FrenchText.cpp

@@ -3308,6 +3308,17 @@ STR16 pHelicopterEtaStrings[] =
   L"Sélectionner Skyrider ou l'aire d'atterrissage ?",
   L"Skyrider",
   L"Arrivée",
+  L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+  L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4112,8 +4123,11 @@ STR16 pHistoryStrings[] =
 	L"Élimination des chats sauvages",
 	L"%s a été tué(e)",
 	L"Tête de terroriste donnée à Carmen",
+	//76-80
 	L"Reste Slay",
 	L"%s a été tué(e)",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_GermanText.cpp

@@ -3300,6 +3300,17 @@ STR16 pHelicopterEtaStrings[] =
 	L"Skyrider oder Absprungsort auswählen?",
 	L"Skyrider",
 	L"Absprung",	//make sure length doesn't exceed 8 characters (used to be "Absprungsort")
+	L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+	L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4054,8 +4065,11 @@ STR16 pHistoryStrings[] =
 	L"Bloodcats getötet",
 	L"%s wurde getötet",	
 	L"Carmen den Kopf eines Terroristen gegeben",
+	//76-80
 	L"Slay ist gegangen",						//Slay is a merc and has left the team
 	L"%s getötet",							//History log for when a merc kills an NPC or PC
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_ItalianText.cpp

@@ -3294,6 +3294,17 @@ STR16 pHelicopterEtaStrings[] =
   L"Seleziona Skyrider o gli Arrivi Drop-off?",
   L"Skyrider",
   L"Arrivi",
+  L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+  L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4094,8 +4105,11 @@ STR16 pHistoryStrings[] =
 	L"Massacrati dai Bloodcat",
 	L"%s è stato ucciso",
 	L"Data a Carmen la testa di un terrorista",
+	//76-80
 	L"Massacro sinistro",
 	L"Ucciso %s",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_PolishText.cpp

@@ -3306,10 +3306,22 @@ STR16 pHelicopterEtaStrings[] =
 	L"Całkowity koszt: ", 		// total cost of trip by helicopter
 	L"PCP:  ", 			// ETA is an acronym for "estimated time of arrival" 
 	L"Helikopter ma mało paliwa i musi wylądować na terenie wroga.",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
-  L"Pasażerowie: ",
-  L"Wybór Skyridera lub pasażerów?",
-  L"Skyrider",
-  L"Pasażerowie",
+	L"Pasażerowie: ",
+	L"Wybór Skyridera lub pasażerów?",
+	L"Skyrider",
+	L"Pasażerowie",
+	L"Helikopter został poważnie uszkodzony i musi wylądować na terenie wroga!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+	L"Helikopter powróci teraz wprost do bazy, czy chcesz najpierw wysadzić pasażerów?"
+
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Czy chcesz aby %s rozpoczął naprawę? Będzie to kosztować %d$, a helikopter pozostanie niedostępny przez około %d godzin(y).",
+	L"Helikopter jest obecnie rozmontowany. Zaczekaj aż naprawa zostanie ukończona.",
+	L"Helikopter jest znów dostępny do lotu.",
+	L"Helicopter jest zatankowany do pełna.",
 };
 
 STR16 sMapLevelString[] =
@@ -4113,8 +4125,11 @@ STR16 pHistoryStrings[] =
 	L"Wyrżnięto dzikie koty",
 	L"%s zabity(ta)",
 	L"Przekazano Carmenowi głowę terrorysty",
+	//76-80
 	L"Slay odszedł",
 	L"Zabito: %s",
+	L"Spotkanie z Waldo - mechanikiem lotniczym.",
+	L"Rozpoczęto naprawę helikoptera. Szacowany czas: %d godzin(y).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_RussianText.cpp

@@ -3301,6 +3301,17 @@ STR16 pHelicopterEtaStrings[] =
   L"Выбрать вертолет или точку высадки?",
   L"Вертолёт",
   L"Высадка",
+  L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+  L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4102,8 +4113,11 @@ STR16 pHistoryStrings[] =
 	L"Все кошки-убийцы убиты",
 	L"%s был убит(а).",
 	L"Отдали Кармену голову террориста.",
+	//76-80
 	L"Убийца ушёл.",
 	L"%s убит(а) вашим отрядом.",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =

Utils/_TaiwaneseText.cpp

@@ -3305,6 +3305,17 @@ STR16 pHelicopterEtaStrings[] =
   L"Select Skyrider or the Arrivals Drop-off?",
   L"Skyrider",
   L"Arrivals",
+  L"Helicopter is seriously damaged and must land in hostile territory!",	// warning that the sector the helicopter is going to use for refueling is under enemy control -> 
+  L"Helicopter will now return straight to base, do you want to drop down passengers before?"
+};
+
+STR16 pHelicopterRepairRefuelStrings[]=
+{
+	// anv: Waldo The Mechanic - prompt and notifications
+	L"Do you want %s to start repairs? It will cost $%d, and helicopter will be unavailable for around %d hour(s).",
+	L"Helicopter is currently disassembled. Wait until repairs are finished.",
+	L"Repairs completed. Helicopter is available again.",
+	L"Helicopter is fully refueled.",
 };
 
 STR16 sMapLevelString[] =
@@ -4108,8 +4119,11 @@ STR16 pHistoryStrings[] =
 	L"Slaughtered bloodcats",
 	L"%s was killed",
 	L"Gave Carmen a terrorist's head",
+	//76-80
 	L"Slay left",
 	L"Killed %s",
+	L"Met Waldo - aircraft mechanic.",
+	L"Helicopter repairs started. Estimated time: %d hour(s).",
 };
 
 STR16 pHistoryLocations[] =