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

Improved AI RPG use:

Browse Source 
- check for friendly fire chance when using rocket launcher
- only enemy team will try to use rocket launcher against single opponent in a room
- set min chance to hit 80% when deciding to use rocket launcher, except tanks or when shooting at tank
- changed min chance to hit to use launcher/RPG so that experienced soldiers prefer higher chance to hit

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-10-21 06:52:43 +00:00
parent 0d969503c5
commit b174d2a8ba
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TacticalAI/Attacks.cpp
+20 -4
View File
@@ -859,7 +859,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
UINT8 ubFriendCnt = 0,ubOpponentCnt = 0, ubOpponentID[MAXMERCS]; UINT8 ubFriendCnt = 0,ubOpponentCnt = 0, ubOpponentID[MAXMERCS];
UINT8 ubMaxPossibleAimTime; UINT8 ubMaxPossibleAimTime;
INT16 sRawAPCost, sMinAPcost; INT16 sRawAPCost, sMinAPcost;
UINT8 ubChanceToHit,ubChanceToGetThrough,ubChanceToReallyHit; UINT8 ubChanceToHit, ubChanceToGetThrough, ubChanceToReallyHit, ubFriendlyFireChance;
UINT32 uiPenalty; UINT32 uiPenalty;
UINT8 ubSearchRange; UINT8 ubSearchRange;
UINT16 usOppDist; UINT16 usOppDist;
@@ -1528,7 +1528,12 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
if ( EXPLOSIVE_GUN( usInHand ) ) if ( EXPLOSIVE_GUN( usInHand ) )
{ {
gUnderFire.Clear();
gUnderFire.Enable();
ubChanceToGetThrough = AISoldierToLocationChanceToGetThrough( pSoldier, sGridNo, bOpponentLevel[ubLoop], 0 ); ubChanceToGetThrough = AISoldierToLocationChanceToGetThrough( pSoldier, sGridNo, bOpponentLevel[ubLoop], 0 );
ubFriendlyFireChance = gUnderFire.Chance(pSoldier->bTeam, pSoldier->bSide, TRUE);
gUnderFire.Disable();
// anv: tanks shouldn't care about chance to get through - can't hit? At least we'll destroy their cover. // anv: tanks shouldn't care about chance to get through - can't hit? At least we'll destroy their cover.
// also AISoldierToLocationChanceToGetThrough used to return 0 for tanks, but that's a different story // also AISoldierToLocationChanceToGetThrough used to return 0 for tanks, but that's a different story
if ( (gGameExternalOptions.fEnemyTanksBlowObstaclesUp && ARMED_VEHICLE( pSoldier )) || gGameExternalOptions.fEnemiesBlowObstaclesUp ) if ( (gGameExternalOptions.fEnemyTanksBlowObstaclesUp && ARMED_VEHICLE( pSoldier )) || gGameExternalOptions.fEnemiesBlowObstaclesUp )
@@ -1539,11 +1544,18 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
{ {
continue; // next gridno continue; // next gridno
} }
// sevenfm: use rocket launchers more carefully
if (!ARMED_VEHICLE(pSoldier) && ubFriendlyFireChance > MIN_CHANCE_TO_ACCIDENTALLY_HIT_SOMEONE)
{
continue;
}
} }
else else
{ {
DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"calcbestthrow: checking chance for launcher to beat cover"); DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"calcbestthrow: checking chance for launcher to beat cover");
ubChanceToGetThrough = 100 * CalculateLaunchItemChanceToGetThrough( pSoldier, (pObjGL ? pObjGL : &pSoldier->inv[bPayloadPocket]), sGridNo, bOpponentLevel[ubLoop], 0, &sEndGridNo, TRUE, &bEndLevel, FALSE );//dnl ch63 240813 ubChanceToGetThrough = 100 * CalculateLaunchItemChanceToGetThrough( pSoldier, (pObjGL ? pObjGL : &pSoldier->inv[bPayloadPocket]), sGridNo, bOpponentLevel[ubLoop], 0, &sEndGridNo, TRUE, &bEndLevel, FALSE );//dnl ch63 240813
ubFriendlyFireChance = 0;
//NumMessage("Chance to get through = ",ubChanceToGetThrough); //NumMessage("Chance to get through = ",ubChanceToGetThrough);
// if we can't possibly get through all the cover // if we can't possibly get through all the cover
if (ubChanceToGetThrough == 0 ) if (ubChanceToGetThrough == 0 )
@@ -1596,7 +1608,7 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
if (Item[usInHand].rocketlauncher && if (Item[usInHand].rocketlauncher &&
ubOppsInRange < 2 && ubOppsInRange < 2 &&
!ARMED_VEHICLE(MercPtrs[ubOpponentID[ubLoop]]) && !ARMED_VEHICLE(MercPtrs[ubOpponentID[ubLoop]]) &&
!InARoom(sOpponentTile[ubLoop], NULL)) (!InARoom(sOpponentTile[ubLoop], NULL) || pSoldier->bTeam != ENEMY_TEAM))
{ {
continue; // next gridno continue; // next gridno
} }
@@ -1671,10 +1683,10 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
pBestThrow->bTargetLevel = bOpponentLevel[ubLoop]; pBestThrow->bTargetLevel = bOpponentLevel[ubLoop];
// set current stance // set current stance
pBestThrow->ubStance = gAnimControl[pSoldier->usAnimState].ubEndHeight; pBestThrow->ubStance = gAnimControl[pSoldier->usAnimState].ubEndHeight;
pBestThrow->ubFriendlyFireChance = ubFriendlyFireChance;
// bWeaponIn // bWeaponIn
// bScopeMode // bScopeMode
// ubFriendlyFireChance
} }
} }
} }
@@ -1687,10 +1699,14 @@ void CalcBestThrow(SOLDIERTYPE *pSoldier, ATTACKTYPE *pBestThrow)
{ {
ubMinChanceToReallyHit = 30; ubMinChanceToReallyHit = 30;
} }
else if (EXPLOSIVE_GUN(usInHand) && !ARMED_VEHICLE(pSoldier) && (pBestThrow->ubOpponent == NOBODY || !ARMED_VEHICLE(MercPtrs[pBestThrow->ubOpponent])))
{
ubMinChanceToReallyHit = 80;
}
else else
{ {
// 80-40% depending on soldier difficulty // 80-40% depending on soldier difficulty
ubMinChanceToReallyHit = 80 - 10 * ubDiff; ubMinChanceToReallyHit = 40 + 10 * ubDiff;
} }
if( pBestThrow->ubChanceToReallyHit < ubMinChanceToReallyHit ) if( pBestThrow->ubChanceToReallyHit < ubMinChanceToReallyHit )