1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: mercs with average refinement and extreme care level would dislike even other average mercs

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2019-06-27 18:04:58 +00:00
parent e39652f6e2
commit e650ea8733
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+2 -2
View File
@@ -55,8 +55,8 @@
#endif #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 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 // SAVE_GAME_VERSION is defined in header, change it there
Laptop/merccompare.cpp
+1 -1
View File
@@ -582,7 +582,7 @@ BOOLEAN DisplayMercData( UINT8 usProfileA, UINT8 usProfileB )
{ {
if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 ) if ( pProfileA->bRefinement * pProfileB->bRefinement == 2 )
val = -2 * gGameExternalOptions.sMoraleModRefinement; 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; val = -gGameExternalOptions.sMoraleModRefinement;
else else
val = gGameExternalOptions.sMoraleModRefinement; val = gGameExternalOptions.sMoraleModRefinement;
Tactical/DynamicDialogue.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ INT8 SoldierRelation( SOLDIERTYPE* pSoldierA, SOLDIERTYPE* pSoldierB )
{ {
if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 2 ) if ( pProfile->bRefinement * gMercProfiles[pSoldierB->ubProfile].bRefinement == 2 )
bOpinion -= 2 * gGameExternalOptions.sMoraleModRefinement; 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; bOpinion -= gGameExternalOptions.sMoraleModRefinement;
else else
bOpinion += gGameExternalOptions.sMoraleModRefinement; bOpinion += gGameExternalOptions.sMoraleModRefinement;