1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added NEW_SUPPRESSION_CODE option, which makes suppression tolerance calculation more balanced.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-10-04 17:55:04 +00:00
parent 93f8484d56
commit d1911e421e
3 changed files with 58 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1
View File
@@ -1662,6 +1662,7 @@ void LoadGameExternalOptions()
// HEADROCK HAM 3.3: Minimum distance (in METERS) at which character suffer from friendly suppression.
gGameExternalOptions.usMinDistanceFriendlySuppression = iniReader.ReadInteger("Tactical Suppression Fire Settings","MIN_DISTANCE_FRIENDLY_SUPPRESSION", 30, 0, 65000);
gGameExternalOptions.fNewSuppressionCode = iniReader.ReadBoolean("Tactical Suppression Fire Settings", "NEW_SUPPRESSION_CODE", FALSE);
//################# Tactical Weather Settings ##################
GameSettings.h
+3
View File
@@ -1208,6 +1208,9 @@ typedef struct
// HEADROCK HAM 3.3: Minimum distance (in METERS) at which character suffer from friendly suppression.
UINT16 usMinDistanceFriendlySuppression;
// sevenfm: new suppression tolerance calculation
BOOLEAN fNewSuppressionCode;
// HEADROCK HAM 3.4: This controls the intensity of Hiding the Bullet Count during combat. The higher it is, the more intense the effect. Negative values reduce the effect.
UINT16 usBulletHideIntensity;
Tactical/Overhead.cpp
+54 -19
View File
@@ -8746,20 +8746,38 @@ BOOLEAN AttackOnGroupWitnessed( SOLDIERTYPE * pSoldier, SOLDIERTYPE * pTarget )
INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
{
INT8 bTolerance;
INT8 bTolerance;
// Calculate basic tolerance value
bTolerance = pSoldier->stats.bExpLevel * 2;
if (pSoldier->flags.uiStatusFlags & SOLDIER_PC)
{
// give +1 for every 10% morale from 50, for a maximum bonus/penalty of 5.
bTolerance += ( pSoldier->aiData.bMorale - 50 ) / 10;
}
else
{
// give +2 for every morale category from normal, for a max change of 4
bTolerance += ( pSoldier->aiData.bAIMorale - MORALE_NORMAL ) * 2;
}
if (gGameExternalOptions.fNewSuppressionCode)
{
INT8 bToleranceMorale;
INT8 bToleranceSkill;
if (pSoldier->flags.uiStatusFlags & SOLDIER_PC)
bToleranceMorale = pSoldier->aiData.bMorale;
else
bToleranceMorale = 20 + pSoldier->aiData.bAIMorale * 20 - pSoldier->aiData.bShock / 4;
// limit base tolerance to 75% when having max morale and experience level
bToleranceSkill = (bToleranceMorale + 20 * pSoldier->stats.bExpLevel) / 4;
// calculate tolerance as percent of max tolerance from INI
bTolerance = gGameExternalOptions.ubSuppressionToleranceMax * bToleranceSkill / 100;
}
else
{
bTolerance = pSoldier->stats.bExpLevel * 2;
if (pSoldier->flags.uiStatusFlags & SOLDIER_PC)
{
// give +1 for every 10% morale from 50, for a maximum bonus/penalty of 5.
bTolerance += (pSoldier->aiData.bMorale - 50) / 10;
}
else
{
// give +2 for every morale category from normal, for a max change of 4
bTolerance += (pSoldier->aiData.bAIMorale - MORALE_NORMAL) * 2;
}
}
if ( pSoldier->ubProfile != NO_PROFILE )
{
@@ -8808,7 +8826,8 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
}
// HEADROCK HAM 3.2: This is actually a feature from HAM 2.9. It adds bonuses/penalties for nearby friends.
if (gGameExternalOptions.fFriendliesAffectTolerance)
// sevenfm: disabled with new code as nearby friends should help morale which affects base tolerance
if (gGameExternalOptions.fFriendliesAffectTolerance && !gGameExternalOptions.fNewSuppressionCode)
{
bTolerance += CheckStatusNearbyFriendlies( pSoldier );
}
@@ -8818,6 +8837,7 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
{
bTolerance += pSoldier->bTilesMoved / gGameExternalOptions.ubTilesMovedPerBonusTolerancePoint;
}
// HEADROCK HAM 3.6: This value has moved here. It reduces tolerance if the character is massively shocked.
if (gGameExternalOptions.ubCowerEffectOnSuppression != 0)
{
@@ -8828,8 +8848,11 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
}
// SANDRO - STOMP traits - squadleader's bonus to suppression tolerance
if ( gGameOptions.fNewTraitSystem && IS_MERC_BODY_TYPE(pSoldier) &&
(pSoldier->bTeam == ENEMY_TEAM || pSoldier->bTeam == MILITIA_TEAM || pSoldier->bTeam == gbPlayerNum) )
// sevenfm: disabled as EffectiveExpLevel and morale bonus also affect tolerance
if (!gGameExternalOptions.fNewSuppressionCode &&
gGameOptions.fNewTraitSystem &&
IS_MERC_BODY_TYPE(pSoldier) &&
(pSoldier->bTeam == ENEMY_TEAM || pSoldier->bTeam == MILITIA_TEAM || pSoldier->bTeam == gbPlayerNum) )
{
UINT8 ubNumberOfSL = GetSquadleadersCountInVicinity( pSoldier, FALSE, FALSE );
// Also take ourselves into account
@@ -8842,11 +8865,17 @@ INT8 CalcSuppressionTolerance( SOLDIERTYPE * pSoldier )
bTolerance += (bTolerance * gSkillTraitValues.ubSLOverallSuppresionBonusPercent * ubNumberOfSL / 100);
}
// Flugente: add personal bonus to suppresion tolerance
bTolerance = (bTolerance * (100 + pSoldier->GetSuppressionResistanceBonus() ) / 100);
// sevenfm: make sure bTolerance is not negative before next calculation
bTolerance = max(bTolerance, 0);
// Flugente: add personal bonus to suppression tolerance
// sevenfm: apply in HandleSuppressionFire to AP loss instead
if (!gGameExternalOptions.fNewSuppressionCode)
bTolerance = (bTolerance * (100 + pSoldier->GetSuppressionResistanceBonus() ) / 100);
bTolerance = max(bTolerance, gGameExternalOptions.ubSuppressionToleranceMin);
bTolerance = min(bTolerance, gGameExternalOptions.ubSuppressionToleranceMax);
bTolerance = __max(bTolerance, gGameExternalOptions.ubSuppressionToleranceMin);
bTolerance = __min(bTolerance, gGameExternalOptions.ubSuppressionToleranceMax);
return( bTolerance );
}
@@ -9246,6 +9275,12 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker )
}
}
// sevenfm: reduce AP loss because of suppression resistance
if (sPointsLost > 0 && gGameExternalOptions.fNewSuppressionCode)
{
sPointsLost -= sPointsLost * pSoldier->GetSuppressionResistanceBonus() / 200;
}
// Reduce action points!
// HEADROCK HAM Beta 2.2: Enforce a minimum limit via INI.
if (pSoldier->bActionPoints - sPointsLost <= APBPConstants[AP_MIN_LIMIT] )