From e650ea8733736e1f96106ce3ec4b457c49617eaf Mon Sep 17 00:00:00 2001
From: silversurfer <silversurfer@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 27 Jun 2019 18:04:58 +0000
Subject: [PATCH] Fix: mercs with average refinement and extreme care level
 would dislike even other average mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp              | 4 ++--
 Laptop/merccompare.cpp       | 2 +-
 Tactical/DynamicDialogue.cpp | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index ffd96ab1..605bf477 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -55,8 +55,8 @@
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 19.04.22" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 19.06.27" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
-CHAR16		zRevisionNumber[16] = { L"Revision 8675" };
+CHAR16		zRevisionNumber[16] = { L"Revision 8679" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Laptop/merccompare.cpp b/Laptop/merccompare.cpp
index 4f8c029f..ea1ed512 100644
--- a/Laptop/merccompare.cpp
+++ b/Laptop/merccompare.cpp
@@ -582,7 +582,7 @@ BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB )
 	{
 		if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 )
 			val = -2 * gGameExternalOptions.sMoraleModRefinement;
-		else if ( pProfileA->bRefinement * pProfileB->bRefinement == 0 )
+		else if ( (pProfileA->bRefinement * pProfileB->bRefinement == 0) && (pProfileA->bRefinement != pProfileB->bRefinement) )
 			val = -gGameExternalOptions.sMoraleModRefinement;
 		else
 			val = gGameExternalOptions.sMoraleModRefinement;
diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp
index 61133858..907946b5 100644
--- a/Tactical/DynamicDialogue.cpp
+++ b/Tactical/DynamicDialogue.cpp
@@ -166,7 +166,7 @@ INT8	SoldierRelation( SOLDIERTYPE* pSoldierA, SOLDIERTYPE* pSoldierB )
 	{
 		if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 2 )
 			bOpinion -= 2 * gGameExternalOptions.sMoraleModRefinement;
-		else if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 0 )
+		else if ( (pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 0) && (pProfile->bRefinement != gMercProfiles[pSoldierB->ubProfile].bRefinement) )
 			bOpinion -= gGameExternalOptions.sMoraleModRefinement;
 		else
 			bOpinion += gGameExternalOptions.sMoraleModRefinement;