From 4fd1ad6e7a1df0a7ee3aa123e5de74143f350c10 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Mon, 22 Dec 2014 17:51:22 +0000
Subject: [PATCH] Merged from revision: 2198 Fixed a few errors in XMLs (thx to
 ATigersClaw) - Fixed text "Combat instructor" -> "Combat Instructor" - Fixed
 too long text "New Age Spiritualist" -> "Spiritualist" - Changed Blood's
 nationality from American to South African

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2194 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/Backgrounds.xml  | 6 +++---
 gamedir/Data-1.13/TableData/MercProfiles.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/Backgrounds.xml b/gamedir/Data-1.13/TableData/Backgrounds.xml
index afc0dcd05..d9daca226 100644
--- a/gamedir/Data-1.13/TableData/Backgrounds.xml
+++ b/gamedir/Data-1.13/TableData/Backgrounds.xml
@@ -386,7 +386,7 @@
 	<!-- Hitman -->
 	<BACKGROUND>
 		<uiIndex>22</uiIndex>
-		<szName>Combat instructor</szName>
+		<szName>Combat Instructor</szName>
 		<szShortName>Combat instructor</szShortName>
 		<szDescription>This might be Frank's last tour - there are several private &#10;organisations that are interested in recruiting him to train their staff.</szDescription>
 		<agility>-5</agility>
@@ -577,8 +577,8 @@
 	<!-- Thor -->
 	<BACKGROUND>
 		<uiIndex>35</uiIndex>
-		<szName>New Age Spiritualist</szName>
-		<szShortName>New Age Spiritualist</szShortName>
+		<szName>Spiritualist</szName>
+		<szShortName>Spiritualist</szShortName>
 		<szDescription>Who needs an exam to be a practicing healer?</szDescription>
 		<speed_bandaging>10</speed_bandaging>              
 		<approach_friendly>10</approach_friendly>
diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index 9eb0de57e..2937c28c6 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -349,12 +349,12 @@
 		<bLearnToHate>50</bLearnToHate>
 		<bLearnToHateTime>8</bLearnToHateTime>
 		<bRace>1</bRace>
-		<bNationality>0</bNationality>
+		<bNationality>15</bNationality>
 		<bAppearance>2</bAppearance>
 		<bAppearanceCareLevel>0</bAppearanceCareLevel>
 		<bRefinement>0</bRefinement>
 		<bRefinementCareLevel>0</bRefinementCareLevel>
-		<bHatedNationality>15</bHatedNationality>
+		<bHatedNationality>0</bHatedNationality>
 		<bHatedNationalityCareLevel>0</bHatedNationalityCareLevel>
 		<bRacist>0</bRacist><bSexist>0</bSexist><bRacist>0</bRacist>
 		<bSexist>0</bSexist>