From 74bfaaf9009c0493960f1d64e0d82a309d498943 Mon Sep 17 00:00:00 2001 From: Flugente Date: Fri, 8 May 2015 19:09:55 +0000 Subject: [PATCH] Fix: good guys and pacifists should feel bad about excessive violence, not good. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7853 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/DynamicDialogue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/DynamicDialogue.cpp b/Tactical/DynamicDialogue.cpp index 0dcb6dc9d..7f840fdc6 100644 --- a/Tactical/DynamicDialogue.cpp +++ b/Tactical/DynamicDialogue.cpp @@ -2244,7 +2244,7 @@ void HandleDynamicOpinionChange( SOLDIERTYPE* pSoldier, UINT8 usEvent, BOOLEAN f // if we are a good guy or a pacifist, then we dislike excessive violence if ( gMercProfiles[pTeamSoldier->ubProfile].ubMiscFlags3 & PROFILE_MISC_FLAG3_GOODGUY || gMercProfiles[pTeamSoldier->ubProfile].bCharacterTrait == CHAR_TRAIT_PACIFIST ) - usEventUsed = OPINIONEVENT_BRUTAL_GOOD; + usEventUsed = OPINIONEVENT_BRUTAL_BAD; // if we are malicious, agressive or a psycho, then we like it else if ( gMercProfiles[pTeamSoldier->ubProfile].bDisability == PSYCHO || MercUnderTheInfluence( pTeamSoldier, DRUG_TYPE_PSYCHO ) || gMercProfiles[pTeamSoldier->ubProfile].bCharacterTrait == CHAR_TRAIT_AGGRESSIVE ||