From aeb7c7a46d6bdf9d28d0d1e23363297093c28614 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@4f8fa57e-7814-0410-bad4-adc449f26b7c>
Date: Sat, 4 May 2013 15:04:29 +0000
Subject: [PATCH] - Minor fixes (by anv & merc05) o Hector has bad MouthY
 coordinate (should be two numbers higher) o Stella has Fox as a hated merc
 (should be Hurl) o Reaper has Shadow as a buddy merc o Reaper has Blood as
 "learn to like" o Changed some GenderQuotes o fixing Larry's alumni page text

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1669 4f8fa57e-7814-0410-bad4-adc449f26b7c
---
 gamedir/Data-1.13/TableData/MercOpinions.xml     |  4 ++--
 gamedir/Data-1.13/TableData/MercProfiles.xml     | 16 ++++++++--------
 gamedir/Data-1.13/TableData/MercQuote.xml        | 10 +++++-----
 gamedir/Data-1.13/TableData/OldAIMArchive.xml    |  2 +-
 .../TableData/Sounds/SoundsProfiles.xml          |  2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gamedir/Data-1.13/TableData/MercOpinions.xml b/gamedir/Data-1.13/TableData/MercOpinions.xml
index 4c496ca5c..5244a2dd9 100644
--- a/gamedir/Data-1.13/TableData/MercOpinions.xml
+++ b/gamedir/Data-1.13/TableData/MercOpinions.xml
@@ -3168,7 +3168,7 @@
 		<Opinion7>0</Opinion7>
 		<Opinion8>-1</Opinion8>
 		<Opinion9>-2</Opinion9>
-		<Opinion10>0</Opinion10>
+		<Opinion10>25</Opinion10>
 		<Opinion11>-1</Opinion11>
 		<Opinion12>0</Opinion12>
 		<Opinion13>0</Opinion13>
@@ -65240,7 +65240,7 @@
 		<Opinion11>0</Opinion11>
 		<Opinion12>0</Opinion12>
 		<Opinion13>0</Opinion13>
-		<Opinion14>-25</Opinion14>
+		<Opinion14>-5</Opinion14>
 		<Opinion15>0</Opinion15>
 		<Opinion16>0</Opinion16>
 		<Opinion17>0</Opinion17>
diff --git a/gamedir/Data-1.13/TableData/MercProfiles.xml b/gamedir/Data-1.13/TableData/MercProfiles.xml
index 41731a74c..b44c96a54 100644
--- a/gamedir/Data-1.13/TableData/MercProfiles.xml
+++ b/gamedir/Data-1.13/TableData/MercProfiles.xml
@@ -1052,13 +1052,13 @@
 		<bNewSkillTrait1>3</bNewSkillTrait1>
 		<bNewSkillTrait2>3</bNewSkillTrait2>
 		<bNewSkillTrait3>14</bNewSkillTrait3>
-		<bBuddy1>255</bBuddy1>
+		<bBuddy1>10</bBuddy1>
 		<bBuddy2>255</bBuddy2>
 		<bBuddy3>255</bBuddy3>
 		<bBuddy4>255</bBuddy4>
 		<bBuddy5>255</bBuddy5>
-		<bLearnToLike>255</bLearnToLike>
-		<bLearnToLikeTime>0</bLearnToLikeTime>
+		<bLearnToLike>1</bLearnToLike>
+		<bLearnToLikeTime>42</bLearnToLikeTime>
 		<bHated1>255</bHated1>
 		<bHatedTime1>0</bHatedTime1>
 		<bHated2>255</bHated2>
@@ -20672,7 +20672,7 @@
 		<usEyesX>8</usEyesX>
 		<usEyesY>7</usEyesY>
 		<usMouthX>8</usMouthX>
-		<usMouthY>21</usMouthY>
+		<usMouthY>23</usMouthY>
 		<uiEyeDelay>0</uiEyeDelay>
 		<uiMouthDelay>0</uiMouthDelay>
 		<uiBlinkFrequency>3000</uiBlinkFrequency>
@@ -20883,10 +20883,10 @@
 		<bBuddy5>-1</bBuddy5>
 		<bLearnToLike>0</bLearnToLike>
 		<bLearnToLikeTime>0</bLearnToLikeTime>
-		<bHated1>14</bHated1>
-		<bHatedTime1>8</bHatedTime1>
-		<bHated2>227</bHated2>
-		<bHatedTime2>24</bHatedTime2>
+		<bHated1>227</bHated1>
+		<bHatedTime1>24</bHatedTime1>
+		<bHated2>-1</bHated2>
+		<bHatedTime2>0</bHatedTime2>
 		<bHated3>0</bHated3>
 		<bHatedTime3>0</bHatedTime3>
 		<bHated4>0</bHated4>
diff --git a/gamedir/Data-1.13/TableData/MercQuote.xml b/gamedir/Data-1.13/TableData/MercQuote.xml
index 63e10b0cb..28bb08daf 100644
--- a/gamedir/Data-1.13/TableData/MercQuote.xml
+++ b/gamedir/Data-1.13/TableData/MercQuote.xml
@@ -1984,7 +1984,7 @@
 		<Name>Weasel</Name>
 		<QuoteExpHeadShotOnly>0</QuoteExpHeadShotOnly>
 		<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
-		<QuoteExpGenderCode>0</QuoteExpGenderCode>
+		<QuoteExpGenderCode>2</QuoteExpGenderCode>
 		<QuoteExpGotGunOrUsedGun>61</QuoteExpGotGunOrUsedGun>
 		<QuoteExpPassingDislike>1</QuoteExpPassingDislike>
 		<QuoteExpWitnessQueenBugDeath>1</QuoteExpWitnessQueenBugDeath>
@@ -1995,7 +1995,7 @@
 		<Name>It</Name>
 		<QuoteExpHeadShotOnly>1</QuoteExpHeadShotOnly>
 		<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
-		<QuoteExpGenderCode>0</QuoteExpGenderCode>
+		<QuoteExpGenderCode>2</QuoteExpGenderCode>
 		<QuoteExpGotGunOrUsedGun>62</QuoteExpGotGunOrUsedGun>
 		<QuoteExpPassingDislike>1</QuoteExpPassingDislike>
 		<QuoteExpWitnessQueenBugDeath>1</QuoteExpWitnessQueenBugDeath>
@@ -2006,8 +2006,8 @@
 		<Name>Bernie</Name>
 		<QuoteExpHeadShotOnly>1</QuoteExpHeadShotOnly>
 		<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
-		<QuoteExpGenderCode>0</QuoteExpGenderCode>
-		<QuoteExpGotGunOrUsedGun>62</QuoteExpGotGunOrUsedGun>
+		<QuoteExpGenderCode>2</QuoteExpGenderCode>
+		<QuoteExpGotGunOrUsedGun>61</QuoteExpGotGunOrUsedGun>
 		<QuoteExpPassingDislike>1</QuoteExpPassingDislike>
 		<QuoteExpWitnessQueenBugDeath>1</QuoteExpWitnessQueenBugDeath>
 		<QuoteExpWitnessDeidrannaDeath>1</QuoteExpWitnessDeidrannaDeath>
@@ -2710,7 +2710,7 @@
 		<Name>Hector</Name>
 		<QuoteExpHeadShotOnly>0</QuoteExpHeadShotOnly>
 		<QuoteExpTeamSpecific>0</QuoteExpTeamSpecific>
-		<QuoteExpGenderCode>2</QuoteExpGenderCode>
+		<QuoteExpGenderCode>1</QuoteExpGenderCode>
 		<QuoteExpGotGunOrUsedGun>62</QuoteExpGotGunOrUsedGun>
 		<QuoteExpPassingDislike>1</QuoteExpPassingDislike>
 		<QuoteExpWitnessQueenBugDeath>1</QuoteExpWitnessQueenBugDeath>
diff --git a/gamedir/Data-1.13/TableData/OldAIMArchive.xml b/gamedir/Data-1.13/TableData/OldAIMArchive.xml
index 150488e96..98429fb6e 100644
--- a/gamedir/Data-1.13/TableData/OldAIMArchive.xml
+++ b/gamedir/Data-1.13/TableData/OldAIMArchive.xml
@@ -22,7 +22,7 @@
 		<uiIndex>1</uiIndex>
 		<NickName>Larry</NickName>
 		<Name>Larry Roachburn</Name>
-		<Bio>After eight attempts at rehab without any sustained success, A.I.M. was left with little choice but to terminate Larry Roachburn's membership within the organization. From what we understand, the death of Larry's father persuaded him to make yet another attempt at ridding himself of his demons and cleansing his body from decades of toxicity. The organization wishes him the best of luck in all his future endeavors.</Bio>
+		<Bio>After eight attempts at rehab without any sustained success, A.I.M. was left with little choice but to terminate Larry Roachburn's membership within the organization. From what we understand, Larry's father persuaded him to make yet another attempt at ridding himself of his demons and cleansing his body from decades of toxicity. The organization wishes him the best of luck in all his future endeavors.</Bio>
 		<FaceID>10</FaceID>
 	</MERC>
 	<MERC>
diff --git a/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml b/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml
index d62dfd3ad..3d64817a5 100644
--- a/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml
+++ b/gamedir/Data-1.13/TableData/Sounds/SoundsProfiles.xml
@@ -1232,7 +1232,7 @@
 	<PROFILE>
 		<uiIndex>246</uiIndex>
 		<Name>Hector</Name>
-		<EnabledSound>0</EnabledSound>
+		<EnabledSound>1</EnabledSound>
 	</PROFILE>
 	<PROFILE>
 		<uiIndex>247</uiIndex>