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

Switch scope mode to default for suppressed soldier if he uses alt weapon holding.

Browse Source 
Improved AI path tweaks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2019-12-04 13:27:24 +00:00
parent 92b6f40a17
commit b367fad899
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+8 -2
View File
@@ -8785,11 +8785,11 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker )
DebugAttackBusy( String("!!!!!!! Starting suppression, on %d\n", pSoldier->ubID ) ); DebugAttackBusy( String("!!!!!!! Starting suppression, on %d\n", pSoldier->ubID ) );
//gTacticalStatus.ubAttackBusyCount++; //gTacticalStatus.ubAttackBusyCount++;
// make sure supressor ID is the same! // make sure suppressor ID is the same!
pSoldier->ubSuppressorID = ubCausedAttacker; pSoldier->ubSuppressorID = ubCausedAttacker;
} }
// AI people will have to have their actions cancelled // AI people will have to have their actions canceled
if (!(pSoldier->flags.uiStatusFlags & SOLDIER_PC)) if (!(pSoldier->flags.uiStatusFlags & SOLDIER_PC))
{ {
CancelAIAction( pSoldier, TRUE ); CancelAIAction( pSoldier, TRUE );
@@ -8809,6 +8809,12 @@ void HandleSuppressionFire( UINT8 ubTargetedMerc, UINT8 ubCausedAttacker )
gTacticalStatus.ubAttackBusyCount++; gTacticalStatus.ubAttackBusyCount++;
DebugAttackBusy( String( "Attack busy %d due to suppression fire on %d\n", gTacticalStatus.ubAttackBusyCount, pSoldier->ubID )); DebugAttackBusy( String( "Attack busy %d due to suppression fire on %d\n", gTacticalStatus.ubAttackBusyCount, pSoldier->ubID ));
// sevenfm: switch scope mode as alt holding can only be used in standing stance
if (pSoldier->bScopeMode == USE_ALT_WEAPON_HOLD)
{
pSoldier->bScopeMode = USE_BEST_SCOPE;
}
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("HandleSuppressionFire: change stance")); DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("HandleSuppressionFire: change stance"));
pSoldier->ChangeSoldierStance( ubNewStance ); pSoldier->ChangeSoldierStance( ubNewStance );
Tactical/PATHAI.cpp
+1 -1
View File
@@ -3849,7 +3849,7 @@ if(!GridNoOnVisibleWorldTile(iDestination))
IS_MERC_BODY_TYPE(s) && IS_MERC_BODY_TYPE(s) &&
(InGasSpot(s, newLoc, bLevel) || (InGasSpot(s, newLoc, bLevel) ||
DeepWater(newLoc, bLevel) && (s->numFlanks == 0 || s->numFlanks >= MAX_FLANKS_RED) || DeepWater(newLoc, bLevel) && (s->numFlanks == 0 || s->numFlanks >= MAX_FLANKS_RED) ||
(s->aiData.bAlertStatus >= STATUS_RED && (s->aiData.bAttitude == CUNNINGSOLO || s->aiData.bAttitude == CUNNINGAID || s->aiData.bAIMorale < MORALE_FEARLESS)) && s->bTeam == ENEMY_TEAM && s->aiData.bAlertStatus >= STATUS_RED && (s->aiData.bAttitude == CUNNINGSOLO || s->aiData.bAttitude == CUNNINGAID || s->aiData.bAIMorale < MORALE_FEARLESS) &&
(InLightAtNight(newLoc, bLevel) || GetNearestRottingCorpseAIWarning(newLoc) > 0))) (InLightAtNight(newLoc, bLevel) || GetNearestRottingCorpseAIWarning(newLoc) > 0)))
{ {
nextCost += 20; nextCost += 20;