Added new laptop merc data subpage to display more stats that weren't displayed before, like dialogue approach points and whether merc is a 'good guy'

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

Utils/Text.h

@@ -2797,7 +2797,7 @@ enum
 	// links to other pages
 	TEXT_MERCCOMPARE_SUBSITE1,
 
-	TEXT_MERCCOMPARE_INTRO1 = TEXT_MERCCOMPARE_SUBSITE1 + 4,
+	TEXT_MERCCOMPARE_INTRO1 = TEXT_MERCCOMPARE_SUBSITE1 + 5,
 	TEXT_MERCCOMPARE_BULLET1,
 	TEXT_MERCCOMPARE_BULLET2,
 	TEXT_MERCCOMPARE_BULLET3,
@@ -2986,6 +2986,8 @@ extern STR16	szSMilitiaResourceText[];
 // Flugente: interactive actions
 extern STR16	szInteractiveActionText[];
 
+extern STR16	szLaptopStatText[];
+
 #define TACTICAL_INVENTORY_DIALOG_NUM    16
 #define TACTICAL_COVER_DIALOG_NUM        16
 

Utils/_ChineseText.cpp

@@ -11203,6 +11203,24 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 // 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

@@ -11221,4 +11221,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //DUTCH

Utils/_EnglishText.cpp

@@ -5021,10 +5021,10 @@ STR16 gsAtmSideButtonText[] =
 
 STR16 gsAtmStartButtonText[] =
 {
-	L"Transfer $", 		// transfer money to merc -- short form
 	L"Stats", 			// view stats of the merc
-	L"Inventory", 			// view the inventory of the merc
+	L"More Stats",
 	L"Employment",
+	L"Inventory", 			// view the inventory of the merc
 };
 
 STR16 sATMText[ ]=
@@ -5107,6 +5107,7 @@ STR16 pWebPagesTitles[] =
 	L"Mercs Love or Dislike You - Home",
 	L"Mercs Love or Dislike You - Analyze a team",
 	L"Mercs Love or Dislike You - Pairwise comparison",
+	L"Mercs Love or Dislike You - Personality",
 	L"Mercs Love or Dislike You - About us",
 	L"WHO - About WHO",
 	L"WHO - Disease in Arulco",
@@ -9752,8 +9753,9 @@ STR16	szMercCompareWebSite[] =
 	L"About us",
 	L"Analyse a team",
 	L"Pairwise comparison",
-	L"Customer voices",
-
+	L"Personalities",
+	L"Customer voices", 
+	
 	L"If your business provides innovative solutions for critical applications with realtime demands, perhaps some of these observations sound familiar to you:",
 	L"Your team struggles with itself.",
 	L"Your employees waste time working against each other.",
@@ -11204,4 +11206,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",
 };
 
+STR16	szLaptopStatText[] =
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //ENGLISH

Utils/_FrenchText.cpp

@@ -11203,4 +11203,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //FRENCH

Utils/_GermanText.cpp

@@ -11033,4 +11033,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //GERMAN

Utils/_ItalianText.cpp

@@ -11212,4 +11212,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //ITALIAN

Utils/_PolishText.cpp

@@ -11225,4 +11225,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //POLISH

Utils/_RussianText.cpp

@@ -11204,4 +11204,22 @@ STR16	szInteractiveActionText[] =
 	L"This machine doesn't seem to be working.",	// TODO.Translate
 };
 
+STR16	szLaptopStatText[] =	// TODO.Translate
+{
+	L"threaten effectiveness %d\n",
+	L"leadership %d\n",
+	L"approach modifier %.2f\n",
+	L"background modifier %.2f\n",
+
+	L"+50 (other) for assertive\n",
+	L"-50 (other) for malicious\n",
+	L"Good Guy",
+	L"%s eschews excessive violence and will refuse to attack non-hostiles.",
+
+	L"Friendly approach",
+	L"Direct approach",
+	L"Friendly approach",
+	L"Friendly approach",
+};
+
 #endif //RUSSIAN