From 8562acde61f64726da35d6e42ccfa63bcff4f102 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Thu, 27 Feb 2014 00:42:45 +0000
Subject: [PATCH] Merged revision(s) 1965 from branches/ja2_data_official_2014:
 Fix: wrong background number

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1966 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/MercProfiles.xml | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index d246fb382..0fae68f30 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -16813,7 +16813,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>174</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>174</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>175</uiIndex>
@@ -16907,7 +16908,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>175</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>175</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>176</uiIndex>
@@ -17001,7 +17003,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>176</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>176</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>177</uiIndex>
@@ -17380,7 +17383,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>180</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>180</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>181</uiIndex>
@@ -18139,7 +18143,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>188</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>188</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>189</uiIndex>
@@ -18233,7 +18238,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>189</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>189</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>190</uiIndex>
@@ -18327,7 +18333,8 @@
 		<sSectorZ>0</sSectorZ>
 		<ubCivilianGroup>0</ubCivilianGroup>
 		<bTown>0</bTown>
-		<bTownAttachment>190</bTownAttachment>
+		<bTownAttachment>0</bTownAttachment>
+		<usBackground>190</usBackground>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>191</uiIndex>