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

Added new soldier flags: SOLDIER_BACK_ATTACK, SOLDIER_SNEAK_ATTACK (work for punch and stab attacks only).

Browse Source 
ClosestKnownOpponent() now can return ID of closest opponent.
CalcCoverValue: improved code to avoid friendly fire.
EVENT_SoldierBeginPunchAttack: use supplied gridno as sTargetGridNo may not be set yet

Boxing:
- added possibility of counterattack after failed attack
- added possibility of opportunity attack a passing enemy
- bonus in CTH for boxers for attack from the back

Boxing AI:
- for boxers, always use high morale so that they attack
- cautious boxer approach, reserve AP for two attacks (only if not attacking from the back)
- try to avoid frontal attack
- sometimes boxer may decide to restore breath instead of moving and attacking
- boxer can step back to move away from opponent, if he is low on breath
- improved main boxer AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-08-02 16:35:10 +00:00
parent 1a31b21ea4
commit e959d6893b
8 changed files with 463 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+53 -6
View File
@@ -7891,6 +7891,10 @@ void SOLDIERTYPE::EVENT_BeginMercTurn( BOOLEAN fFromRealTime, INT32 iRealTimeCou
this->usSoldierFlagMask2 &= ~SOLDIER_TAKEN_LARGE_HIT;
}
// sevenfm: reset AI flags
this->usSoldierFlagMask2 &= ~SOLDIER_BACK_ATTACK;
this->usSoldierFlagMask2 &= ~SOLDIER_SNEAK_ATTACK;
// Flugente: reset extra stats. Currently they only depend on drug effects, and those are reset every turn
this->ResetExtraStats( );
@@ -12780,13 +12784,32 @@ void SOLDIERTYPE::EVENT_SoldierBeginBladeAttack( INT32 sGridNo, UINT8 ubDirectio
{
GetSoldier( &pTSoldier, usSoldierIndex );
// sevenfm: set flag indicating back attack and sneak attack
if (pTSoldier)
{
pTSoldier->usSoldierFlagMask2 &= ~SOLDIER_BACK_ATTACK;
pTSoldier->usSoldierFlagMask2 &= ~SOLDIER_SNEAK_ATTACK;
UINT8 ubAttackDirection = AIDirection(this->sGridNo, pTSoldier->sGridNo);
if (ubAttackDirection == pTSoldier->ubDirection ||
ubAttackDirection == gOneCDirection[pTSoldier->ubDirection] ||
ubAttackDirection == gOneCCDirection[pTSoldier->ubDirection])
{
pTSoldier->usSoldierFlagMask2 |= SOLDIER_BACK_ATTACK;
}
if (pTSoldier->aiData.bOppList[this->ubID] != SEEN_CURRENTLY &&
pTSoldier->aiData.bOppList[this->ubID] != SEEN_THIS_TURN &&
pTSoldier->aiData.bOppList[this->ubID] != HEARD_THIS_TURN)
{
pTSoldier->usSoldierFlagMask2 |= SOLDIER_SNEAK_ATTACK;
}
}
// Flugente: if we attack with a bayonet, we don't need to change stance if even if we are standing and the target is prone...
// so we simulate here that the target is still standing
UINT8 targetheight = gAnimControl[pTSoldier->usAnimState].ubEndHeight;
#if 0//dnl ch73 031013 several reasons why disabling this; 1. no animation for bayonet, 2. if target is prone it look ridicules to swing through air instead stub target, 3. incorrect APs calculation
if ( this->bWeaponMode == WM_ATTACHED_BAYONET )
targetheight = ANIM_STAND;
#endif
// Look at stance of target
switch ( targetheight )
{
@@ -12927,8 +12950,10 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
//}
// get target.....
usSoldierIndex = WhoIsThere2( this->sTargetGridNo, this->pathing.bLevel );
// sevenfm: use supplied gridno as sTargetGridNo may not be set yet
//usSoldierIndex = WhoIsThere2( this->sTargetGridNo, this->pathing.bLevel );
usSoldierIndex = WhoIsThere2(sGridNo, this->pathing.bLevel);
if ( usSoldierIndex != NOBODY )
{
GetSoldier( &pTSoldier, usSoldierIndex );
@@ -12940,6 +12965,28 @@ void SOLDIERTYPE::EVENT_SoldierBeginPunchAttack( INT32 sGridNo, UINT8 ubDirectio
return;
}
// sevenfm: set flag indicating back attack and sneak attack
if (pTSoldier)
{
pTSoldier->usSoldierFlagMask2 &= ~SOLDIER_BACK_ATTACK;
pTSoldier->usSoldierFlagMask2 &= ~SOLDIER_SNEAK_ATTACK;
UINT8 ubAttackDirection = AIDirection(this->sGridNo, pTSoldier->sGridNo);
if (ubAttackDirection == pTSoldier->ubDirection ||
ubAttackDirection == gOneCDirection[pTSoldier->ubDirection] ||
ubAttackDirection == gOneCCDirection[pTSoldier->ubDirection])
{
pTSoldier->usSoldierFlagMask2 |= SOLDIER_BACK_ATTACK;
}
if (pTSoldier->aiData.bOppList[this->ubID] != SEEN_CURRENTLY &&
pTSoldier->aiData.bOppList[this->ubID] != SEEN_THIS_TURN &&
pTSoldier->aiData.bOppList[this->ubID] != HEARD_THIS_TURN)
{
pTSoldier->usSoldierFlagMask2 |= SOLDIER_SNEAK_ATTACK;
}
}
if ( fChangeDirection )
{
// CHANGE DIRECTION AND GOTO ANIMATION NOW