From b689b51962dabb6c972827372880d72c49b31730 Mon Sep 17 00:00:00 2001
From: Sevenfm <Sevenfm@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 5 Oct 2021 12:10:07 +0000
Subject: [PATCH] NEW_SUPPRESSION_CODE: calc base suppression tolerance for AI
 from health/shock instead of AI morale.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9175 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Overhead.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Tactical/Overhead.cpp b/Tactical/Overhead.cpp
index e6bc7c313..cbb7fc2f3 100644
--- a/Tactical/Overhead.cpp
+++ b/Tactical/Overhead.cpp
@@ -8753,11 +8753,12 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
 	{
 		INT8 bToleranceMorale;
 		INT8 bToleranceSkill;
+		UINT8 ubMaxShock = gGameExternalOptions.ubMaxSuppressionShock;
 
 		if (pSoldier->flags.uiStatusFlags & SOLDIER_PC)
 			bToleranceMorale = pSoldier->aiData.bMorale;
 		else
-			bToleranceMorale = 20 + pSoldier->aiData.bAIMorale * 20 - pSoldier->aiData.bShock / 4;
+			bToleranceMorale = (20 + 80 * pSoldier->stats.bLife / max(OKLIFE, pSoldier->stats.bLifeMax) - 40 * min(ubMaxShock, pSoldier->aiData.bShock) / max(1, ubMaxShock));
 
 		// limit base tolerance to 75% when having max morale and experience level
 		bToleranceSkill = (bToleranceMorale + 20 * pSoldier->stats.bExpLevel) / 4;