From 5302b4aa5b165995a2a8fe5ce4efcc438da2ee32 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 21 Mar 2016 21:29:40 +0000
Subject: [PATCH] The merc profile #71 (RPC71) is now used for all combat
 jeeps.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2306 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Backgrounds.xml   |  2 +-
 gamedir/Data-1.13/TableData/HiddenNames.xml   |  2 +-
 .../TableData/Inventory/MercStartingGear.xml  |  2 +-
 gamedir/Data-1.13/TableData/MercOpinions.xml  | 20 +++++++++----------
 gamedir/Data-1.13/TableData/MercProfiles.xml  |  6 +++---
 gamedir/Data-1.13/TableData/MercQuote.xml     |  2 +-
 gamedir/Data-1.13/TableData/Vehicles.xml      | 13 ++++++------
 7 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml
index 1a3d76fd5..e33f217ed 100644
--- a/gamedir/Data-1.13/TableData/Backgrounds.xml
+++ b/gamedir/Data-1.13/TableData/Backgrounds.xml
@@ -1652,7 +1652,7 @@
 		<no_male>1</no_male>
 		<no_female>1</no_female>
 	</BACKGROUND>
-	<!-- RPC 71 -->
+	<!-- Combat jeep -->
 	<BACKGROUND>
 		<uiIndex>71</uiIndex>
 		<szName>Placeholder</szName>
diff --git a/gamedir/Data-1.13/TableData/HiddenNames.xml b/gamedir/Data-1.13/TableData/HiddenNames.xml
index af0d2754b..fe62175a4 100644
--- a/gamedir/Data-1.13/TableData/HiddenNames.xml
+++ b/gamedir/Data-1.13/TableData/HiddenNames.xml
@@ -356,7 +356,7 @@
 	</NAME>
 	<NAME>
 		<uiIndex>71</uiIndex>
-		<description>RPC71</description>
+		<description>Combat jeep</description>
 		<Hidden>1</Hidden>
 	</NAME>
 	<NAME>
diff --git a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
index cf5e4fab6..a1d3da184 100644
--- a/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
+++ b/gamedir/Data-1.13/TableData/Inventory/MercStartingGear.xml
@@ -9521,7 +9521,7 @@
 	</MERCGEAR>
 	<MERCGEAR>
 		<mIndex>71</mIndex>
-		<mName>RPC71</mName>
+		<mName>Combat jeep</mName>
 		<GEARKIT>
 			<mPriceMod>0</mPriceMod>
 			<mGearKitName />
diff --git a/gamedir/Data-1.13/TableData/MercOpinions.xml b/gamedir/Data-1.13/TableData/MercOpinions.xml
index 8c9e41bac..d37eb0926 100644
--- a/gamedir/Data-1.13/TableData/MercOpinions.xml
+++ b/gamedir/Data-1.13/TableData/MercOpinions.xml
@@ -18674,13 +18674,13 @@
 	</OPINION>
 	<OPINION>
 		<uiIndex>71</uiIndex>
-		<zNickname>RPC71</zNickname>
+		<zNickname>Combat jeep</zNickname>
 		<Opinion0>0</Opinion0>
 		<Opinion1>0</Opinion1>
 		<Opinion2>0</Opinion2>
 		<Opinion3>0</Opinion3>
-		<Opinion4>-5</Opinion4>
-		<Opinion5>-5</Opinion5>
+		<Opinion4>0</Opinion4>
+		<Opinion5>0</Opinion5>
 		<Opinion6>0</Opinion6>
 		<Opinion7>0</Opinion7>
 		<Opinion8>0</Opinion8>
@@ -18692,9 +18692,9 @@
 		<Opinion14>0</Opinion14>
 		<Opinion15>0</Opinion15>
 		<Opinion16>0</Opinion16>
-		<Opinion17>-5</Opinion17>
+		<Opinion17>0</Opinion17>
 		<Opinion18>0</Opinion18>
-		<Opinion19>-5</Opinion19>
+		<Opinion19>0</Opinion19>
 		<Opinion20>0</Opinion20>
 		<Opinion21>0</Opinion21>
 		<Opinion22>0</Opinion22>
@@ -18704,8 +18704,8 @@
 		<Opinion26>0</Opinion26>
 		<Opinion27>0</Opinion27>
 		<Opinion28>0</Opinion28>
-		<Opinion29>-7</Opinion29>
-		<Opinion30>-5</Opinion30>
+		<Opinion29>0</Opinion29>
+		<Opinion30>0</Opinion30>
 		<Opinion31>0</Opinion31>
 		<Opinion32>0</Opinion32>
 		<Opinion33>0</Opinion33>
@@ -18734,14 +18734,14 @@
 		<Opinion56>0</Opinion56>
 		<Opinion57>0</Opinion57>
 		<Opinion58>0</Opinion58>
-		<Opinion59>-5</Opinion59>
+		<Opinion59>0</Opinion59>
 		<Opinion60>0</Opinion60>
 		<Opinion61>0</Opinion61>
 		<Opinion62>0</Opinion62>
 		<Opinion63>0</Opinion63>
-		<Opinion64>-5</Opinion64>
+		<Opinion64>0</Opinion64>
 		<Opinion65>0</Opinion65>
-		<Opinion66>-15</Opinion66>
+		<Opinion66>0</Opinion66>
 		<Opinion67>0</Opinion67>
 		<Opinion68>0</Opinion68>
 		<Opinion69>0</Opinion69>
diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index 1c57675b0..cb4cee073 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -6941,9 +6941,9 @@
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>71</uiIndex>
-		<Type>3</Type>
-		<zName></zName>
-		<zNickname>RPC71</zNickname>
+		<Type>5</Type>
+		<zName>Combat Jeep</zName>
+		<zNickname>C. Jeep</zNickname>
 		<ubFaceIndex>71</ubFaceIndex>
 		<usEyesX>0</usEyesX>
 		<usEyesY>0</usEyesY>
diff --git a/gamedir/Data-1.13/TableData/MercQuote.xml b/gamedir/Data-1.13/TableData/MercQuote.xml
index b3d4c9218..dda5f51d5 100644
--- a/gamedir/Data-1.13/TableData/MercQuote.xml
+++ b/gamedir/Data-1.13/TableData/MercQuote.xml
@@ -782,7 +782,7 @@
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>71</uiIndex>
-		<Name>RPC71</Name>
+		<Name>Combat jeep</Name>
 		<QuoteExpHeadShotOnly>0</QuoteExpHeadShotOnly>
 		<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
 		<QuoteExpGenderCode>0</QuoteExpGenderCode>
diff --git a/gamedir/Data-1.13/TableData/Vehicles.xml b/gamedir/Data-1.13/TableData/Vehicles.xml
index 7273d7ce1..a728e48d5 100644
--- a/gamedir/Data-1.13/TableData/Vehicles.xml
+++ b/gamedir/Data-1.13/TableData/Vehicles.xml
@@ -1106,19 +1106,20 @@ Compartment			Seats in different compartments cannot be swapped in combat.
 		<VehicleEnabled>0</VehicleEnabled>
 		<Pilot>-1</Pilot>
 	</VEHICLE>
+	<!-- this record is used by all combat jeeps -->
 	<VEHICLE>
 		<uiIndex>71</uiIndex>
-		<Name>None</Name>
-		<LongName></LongName>
-		<ShortName></ShortName>
-		<MvtTypes>0</MvtTypes>
+		<Name>Combat Jeep</Name>	
+		<LongName>Combat Jeep</LongName>
+		<ShortName>Jeep</ShortName>	
+		<MvtTypes>2</MvtTypes>
 		<StiFaceIcon></StiFaceIcon>
-		<SeatingCapacities>6</SeatingCapacities>
+		<SeatingCapacities>0</SeatingCapacities>
 		<EnterVehicleSndID>85</EnterVehicleSndID>
 		<MoveVehicleSndID>82</MoveVehicleSndID>
 		<VehicleArmourType>164</VehicleArmourType>
-		<Neutral>1</Neutral>
 		<VehicleEnabled>0</VehicleEnabled>
+		<Neutral>0</Neutral>
 		<Pilot>-1</Pilot>
 	</VEHICLE>
 	<VEHICLE>