From c23d62de024f9c9c9c25d57c86dd8457cceff9b3 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Tue, 1 Mar 2022 17:49:24 +0000 Subject: [PATCH] Makes it so that if ASSIGN_SKILL_TRAITS_TO_ENEMY or MILIATIA is disables then enemies or militia will not get penalties/bonuses from new traits which then should fix the issue where enemies do not use mortars at all when this option is disabled. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9312 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Weapons.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index ae5403a20..cee137074 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -10134,7 +10134,7 @@ UINT32 CalcThrownChanceToHit(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTi //////////////////////////////////////////////////////////////////////////////////////////////// // SANDRO - old/new traits - if ( gGameOptions.fNewTraitSystem ) + if (gGameOptions.fNewTraitSystem && (pSoldier->bTeam == OUR_TEAM || (pSoldier->bTeam == ENEMY_TEAM && gGameExternalOptions.fAssignTraitsToEnemy) || (pSoldier->bTeam == MILITIA_TEAM && gGameExternalOptions.fAssignTraitsToMilitia))) { if ( Item[ usHandItem ].mortar ) {