1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for AI CTH evaluation with NCTH

Browse Source 
The assumed target area was much to small for the calculated aperture so AI got abysmal CTH values all of the time and wouldn't use guns from far away because of that.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
silversurfer
2014-01-30 15:20:40 +00:00
parent 0c03bd402a
commit 4c5e98c801
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+20 -7
View File
@@ -9030,14 +9030,18 @@ UINT32 AICalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTim
// aimed. To get a good idea of whether or not a shot is likely to hit the target,
// we need to take other factors into consideration.
FLOAT d2DDistance = (FLOAT) PythSpacesAway( pSoldier->sGridNo, sGridNo ) * 10.0f;
// distance to target
FLOAT d2DDistance = (FLOAT) PythSpacesAway( pSoldier->sGridNo, sGridNo ) * (FLOAT) CELL_X_SIZE;
// magnification (1.0 or higher if scope is used)
FLOAT dMagFactor = CalcMagFactor( pSoldier, &(pSoldier->inv[pSoldier->ubAttackingHand]), d2DDistance, sGridNo, (UINT8)ubAimTime );
FLOAT dDistanceFactor = (d2DDistance / gGameCTHConstants.NORMAL_SHOOTING_DISTANCE);
uiChance = (UINT32)((uiChance * dMagFactor) / dDistanceFactor);
// basic aperture that is equal for everyone
FLOAT dBasicAperture = CalcBasicAperture( );
FLOAT dAperture = (dBasicAperture * (100-uiChance)) / 100.0f;
// aperture at target distance without magnification
FLOAT dAperture = dBasicAperture * (d2DDistance / gGameCTHConstants.NORMAL_SHOOTING_DISTANCE);
// modify aperture with magnification
dAperture = dAperture / dMagFactor;
// real aperture for shooter based on CTH calculation
dAperture = dAperture * ( 100 - uiChance ) / 100.0f;
if (dAperture == 0)
{
@@ -9045,7 +9049,16 @@ UINT32 AICalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTim
}
else
{
FLOAT dTargetArea = 28.26f; // Calculated area of a target given known homan body size.
// silversurfer: This cannot be correct. An aperture of 10 already gives a very good chance to hit. If we take this value and
// calculate the target area it's PI * 10 * 10 which results in ~300 (rounded down) and not 28.26. This low number was the reason why AI
// was so reluctant to fire their weapons from farther away. It just never got any useful uiChance.
//FLOAT dTargetArea = 28.26f; // Calculated area of a target given known human body size.
FLOAT dTargetArea = 300.0f; // new definition
// Aiming at the head is much harder. Assume aperture 5 for this.
if ( ubAimPos == AIM_SHOT_HEAD )
dTargetArea = 80.0f;
FLOAT dApertureArea = (FLOAT)(PI * (dAperture * dAperture));
uiChance = (UINT32)__min(100, (dTargetArea / dApertureArea) * 100);