MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-02-15 00:08:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Shadow Walker: Added experimental squad behavior

Browse Source
This commit is contained in:
1upD 2018-09-27 14:29:34 -04:00
parent 0b42a245d1
commit 86bb8f7c7e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sp/src/game/server/mod/npc_shadow_walker.cpp
View File

@ -356,9 +356,10 @@ int CNPC_ShadowWalker::SelectCombatSchedule()
} }
// If I'm scared of this enemy and he's looking at me, run away // If I'm scared of this enemy and he's looking at me, run away
if (IRelationType(GetEnemy()) == D_FR) // If in a squad, all but one Shadow walker must be afraid of the player
if (IRelationType(GetEnemy()) == D_FR || !OccupyStrategySlotRange(SQUAD_SLOT_ATTACK1))
{ {
if (HasCondition(COND_SEE_ENEMY) && HasCondition(COND_ENEMY_FACING_ME)) if (HasCondition(COND_SEE_ENEMY) && HasCondition(COND_ENEMY_FACING_ME) && HasCondition(COND_HAVE_ENEMY_LOS))
{ {
// TODO: Check if silent // TODO: Check if silent
FearSound(); FearSound();
@ -384,11 +385,17 @@ int CNPC_ShadowWalker::SelectCombatSchedule()
// we can see the enemy // we can see the enemy
if (HasCondition(COND_CAN_MELEE_ATTACK1)) if (HasCondition(COND_CAN_MELEE_ATTACK1)) {
return SCHED_MELEE_ATTACK1; //if (OccupyStrategySlotRange(SQUAD_SLOT_ATTACK1, SQUAD_SLOT_ATTACK2))
return SCHED_MELEE_ATTACK1;
//return SCHED_RUN_FROM_ENEMY;
}
if (HasCondition(COND_CAN_MELEE_ATTACK2)) if (HasCondition(COND_CAN_MELEE_ATTACK2)) {
return SCHED_MELEE_ATTACK2; //if (OccupyStrategySlotRange(SQUAD_SLOT_ATTACK1, SQUAD_SLOT_ATTACK2))
return SCHED_MELEE_ATTACK2;
//return SCHED_RUN_FROM_ENEMY;
}
if (HasRangedWeapon() && GetShotRegulator()->IsInRestInterval()) if (HasRangedWeapon() && GetShotRegulator()->IsInRestInterval())
{ {