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

CalcChanceHTH:

Browse Source 
- slightly lowered base chance
- reduce chance if defender is blind
- reduce chance if attacker is blind
- bonus for boxers for attacking from the back

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-08-02 16:55:46 +00:00
parent e959d6893b
commit e9107eab34
1 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+35 -18
View File
@@ -9418,7 +9418,7 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
}
else
{
// SANDRO - this is so idiotic, it actiually means, that martial artists and HtH
// SANDRO - this is so idiotic, it actually means, that martial artists and HtH
// soldiers do not get their dodging bonus if they have a knife in hands, but do
// have it if having anything else! I just had to change it, for it is a bug more
// than an intended feature
@@ -9486,10 +9486,15 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
}
//////////////////////////////////////////////////////////////////////////////////////////////////////
// sevenfm: reduce chance if defender is blind
if ((IS_MERC_BODY_TYPE(pDefender) || IS_CIV_BODY_TYPE(pDefender)) && (pDefender->bBlindedCounter || !SoldierToSoldierLineOfSightTest(pDefender, pAttacker, TRUE, CALC_FROM_ALL_DIRS)))
{
iDefRating = iDefRating / 4;
}
if (iDefRating < 1)
iDefRating = 1;
//NumMessage("CalcChanceToStab - Attacker's Rating = ",iAttRating);
//NumMessage("CalcChanceToStab - Defender's Rating = ",iDefRating);
@@ -9506,7 +9511,9 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
else
{
// Changed from DG by CJC to give higher chances of hitting with a stab or punch
iChance = 67 + (iAttRating - iDefRating) / 3;
// sevenfm: lowered base chance
iChance = 50 + (iAttRating - iDefRating) / 3;
//iChance = 67 + (iAttRating - iDefRating) / 3;
// SANDRO - Enhanced Close Combat System - chances to hit for punches aimed at body parts
if (gGameExternalOptions.fEnhancedCloseCombatSystem)
@@ -9556,25 +9563,35 @@ UINT32 CalcChanceHTH( SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAi
iChance += ((iChance * gGameExternalOptions.sEnemyEliteCtHBonusPercent) /100);
//////////////////////////////////////////////////////////////////////////////////////
// MAKE SURE CHANCE TO HIT IS WITHIN DEFINED LIMITS
// HEADROCK: I urinate on your Defined Limits! Power Rangers, Externalize!
// Disclaimer: No offense meant, all in good fun ;)
if (iChance < gGameExternalOptions.ubMinimumCTH)
// sevenfm: bonus for boxers for attacking from the back
if (ubMode == HTH_MODE_PUNCH &&
(pAttacker->flags.uiStatusFlags & SOLDIER_BOXER) &&
(pDefender->flags.uiStatusFlags & SOLDIER_BOXER) &&
iChance < 100 &&
!pAttacker->bBlindedCounter &&
gAnimControl[pDefender->usAnimState].ubEndHeight > ANIM_PRONE &&
(AIDirection(pAttacker->sGridNo, pDefender->sGridNo) == pDefender->ubDirection ||
AIDirection(pAttacker->sGridNo, pDefender->sGridNo) == gOneCDirection[pDefender->ubDirection] ||
AIDirection(pAttacker->sGridNo, pDefender->sGridNo) == gOneCCDirection[pDefender->ubDirection]))
{
iChance = gGameExternalOptions.ubMinimumCTH;
}
else
{
// HEADROCK (HAM): Externalized maximum to JA2_OPTIONS.INI
//if (iChance > MAXCHANCETOHIT)
// iChance = MAXCHANCETOHIT;
if (iChance > gGameExternalOptions.ubMaximumCTH)
iChance = gGameExternalOptions.ubMaximumCTH;
iChance += (100 - iChance) / 2;
}
//NumMessage("ChanceToStab = ",chance);
// sevenfm: reduce chance if attacker is blind
if (IS_MERC_BODY_TYPE(pDefender) && (pAttacker->bBlindedCounter || !SoldierToSoldierLineOfSightTest(pAttacker, pDefender, TRUE, CALC_FROM_ALL_DIRS)))
{
iChance = iChance / 4;
}
return (iChance);
// MAKE SURE CHANCE TO HIT IS WITHIN DEFINED LIMITS
// HEADROCK: I urinate on your Defined Limits! Power Rangers, Externalize!
// Disclaimer: No offense meant, all in good fun ;)
iChance = max(iChance, gGameExternalOptions.ubMinimumCTH);
iChance = min(iChance, gGameExternalOptions.ubMaximumCTH);
//NumMessage("ChanceToStab = ",chance);
return (iChance);
}
UINT32 CalcChanceToStab(SOLDIERTYPE * pAttacker,SOLDIERTYPE *pDefender, INT16 ubAimTime)