Skip to content

Advisor fight changes #312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Blixibon wants to merge 1 commit into
base: ez2/mapbase
Choose a base branch
from
Draft

Advisor fight changes #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
245 changes: 174 additions & 71 deletions sp/src/game/server/episodic/npc_advisor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ ConVar advisor_camera_debounce( "advisor_camera_debounce", "0.2" );

ConVar advisor_use_facing_override( "advisor_use_facing_override", "1" );
ConVar advisor_use_flyer_poses( "advisor_use_flyer_poses", "1" );
ConVar advisor_arms_extent_min( "advisor_arms_extent_dist", "-1.0" );
ConVar advisor_arms_extent_max( "advisor_arms_extent_dist", "1.0" );
ConVar advisor_arms_extent_dist( "advisor_arms_extent_dist", "1250" );
ConVar advisor_update_yaw( "advisor_update_yaw", "1" );

ConVar advisor_hurt_pose( "advisor_hurt_pose", "0" );
Expand Down Expand Up @@ -672,6 +675,9 @@ class CNPC_Advisor : public CAI_BaseActor

inline CBaseEntity *GetFirstStagingPosition() { return m_hvStagingPositions.Count() > 0 ? m_hvStagingPositions[0] : NULL; }

inline int GetNumStagingPositions() { return m_hvStagingPositions.Count(); }
inline CBaseEntity *GetStagingPosition( int i ) { return m_hvStagingPositions[i]; }

//-----------------------------------------------------------------------------

// This is ambiguous since arms are detachable and you can theoretically give them something else
Expand All @@ -695,7 +701,16 @@ class CNPC_Advisor : public CAI_BaseActor
//
// CAI_BaseNPC:
//
virtual float MaxYawSpeed() { return 90.0f; } //120.0f 90.0f
virtual float MaxYawSpeed()
{
#ifdef EZ2
if (IsCurSchedule( SCHED_ADVISOR_IDLE_STAND, false ))
return 10.0f;
#endif

return 90.0f; //120.0f 90.0f
}

inline float MaxPitchSpeed() const { return 10.0f; }

virtual Class_T Classify();
Expand Down Expand Up @@ -1614,6 +1629,11 @@ bool CNPC_Advisor::CanLevitateEntity( CBaseEntity *pEntity, int minMass, int max
if (!pPhys)
return false;

#ifdef EZ2
if (!pPhys->IsGravityEnabled())
return false;
#endif

float mass = pPhys->GetMass();

return ( mass >= minMass &&
Expand Down Expand Up @@ -1654,6 +1674,38 @@ void CNPC_Advisor::EndLevitateObject( CBaseEntity *pEnt )
#endif

#if NPC_ADVISOR_HAS_BEHAVIOR
#ifdef EZ2
//-----------------------------------------------------------------------------
// Purpose: Custom trace filter used for advisor staging LOS traces
//-----------------------------------------------------------------------------
class CTraceFilterAdvisorStage : public CTraceFilterSkipTwoEntities
{
public:
CTraceFilterAdvisorStage( IHandleEntity *pHandleEntity, int collisionGroup, IHandleEntity *pHandleEntity2 = NULL )
: CTraceFilterSkipTwoEntities( pHandleEntity, pHandleEntity2, collisionGroup )
{
m_pAdvisor = static_cast<CNPC_Advisor *>(pHandleEntity);
}

bool ShouldHitEntity( IHandleEntity *pHandleEntity, int contentsMask )
{
CBaseEntity *pEntity = EntityFromEntityHandle( pHandleEntity );

if ( pEntity->GetMoveType() == MOVETYPE_VPHYSICS )
{
// Don't hit staged props
if ( m_pAdvisor->IsThisPropStaged( pEntity ) )
return false;
}

return CTraceFilterSimple::ShouldHitEntity( pHandleEntity, contentsMask );
}

private:
CNPC_Advisor *m_pAdvisor;
};
#endif

// find an object to throw at the player and start the warning on it. Return object's
// pointer if we got something. Otherwise, return NULL if nothing left to throw. Will
// always leave the prepared object at the head of m_hvStagedEnts
Expand Down Expand Up @@ -2030,17 +2082,56 @@ void CNPC_Advisor::RunTask( const Task_t *pTask )

Assert(m_hvStagedEnts.Count() <= m_hvStagingPositions.Count());

#ifdef EZ2
// yank all objects into place
for (int ii = m_hvStagedEnts.Count() - 1 ; ii >= 0 ; --ii)
CUtlVector<int> vecOccupiedPositions;
for (int i = m_hvStagedEnts.Count() - 1; i >= 0; --i)
{
if (m_hvStagedEnts[i] == NULL)
continue;

CTraceFilterAdvisorStage traceFilter( this, COLLISION_GROUP_NONE, m_hvStagedEnts[i] );

// Find first unoccupied staging position this object can reach
CBaseEntity *pStagingPos = NULL;
for (int ii = m_hvStagingPositions.Count() - 1; ii >= 0; --ii)
{
if (vecOccupiedPositions.HasElement( ii ) || m_hvStagingPositions[ii] == NULL)
continue;

trace_t tr;

AI_TraceLine( m_hvStagedEnts[i]->GetAbsOrigin(), m_hvStagingPositions[ii]->GetAbsOrigin(), MASK_SOLID, &traceFilter, &tr );
if (tr.fraction == 1.0f)
{
pStagingPos = m_hvStagingPositions[ii];
vecOccupiedPositions.AddToTail( ii );
break;
}
}

if (!pStagingPos)
continue;

// just ignore lost objects (if the player destroys one, that's fine, leave a hole)
CBaseEntity *pThrowable = m_hvStagedEnts[i];
if (pThrowable)
{
PullObjectToStaging( pThrowable, pStagingPos->GetAbsOrigin() );
}
}
#else
// yank all objects into place
for (int ii = m_hvStagedEnts.Count() - 1 ; ii >= 0 ; --ii)
{
// just ignore lost objects (if the player destroys one, that's fine, leave a hole)
CBaseEntity *pThrowable = m_hvStagedEnts[ii];
if (pThrowable)
{
PullObjectToStaging(pThrowable, m_hvStagingPositions[ii]->GetAbsOrigin());
}
}
#endif

// are we done yet?
if (gpGlobals->curtime > m_flStagingEnd)
Expand Down Expand Up @@ -2175,7 +2266,6 @@ void CNPC_Advisor::RunTask( const Task_t *pTask )
else
m_iThrowAnimDir = 1; // left
}
Msg( "flObjectAngle = %f\n", flObjectAngle );

//float flDot = DotProduct2D( vec2DDelta, vecForward.AsVector2D() );
//if (abs(flDot) < 0.75f)
Expand Down Expand Up @@ -2419,12 +2509,33 @@ Activity CNPC_Advisor::NPC_TranslateActivity( Activity activity )
case ADVISOR_ACCESSORY_ARMS_STUBBED: // Try to attack fruitlessly
case ADVISOR_ACCESSORY_ARMS:
{
// Alternate between left, right, and both
switch (RandomInt( 0, 2 ))
int nNumMeleeTargets = 1;
if (GetEnemies()->NumEnemies() > 1)
{
AIEnemiesIter_t iter;
for ( AI_EnemyInfo_t *pEMemory = GetEnemies()->GetFirst(&iter); pEMemory != NULL; pEMemory = GetEnemies()->GetNext(&iter) )
{
if ( pEMemory->hEnemy && pEMemory->hEnemy->IsAlive() && pEMemory->hEnemy->GetAbsOrigin().DistToSqr(GetAbsOrigin()) <= Square(128.0f) )
{
nNumMeleeTargets++;
}
}
}

if (nNumMeleeTargets > 1)
{
case 0: break;
case 1: activity = ACT_MELEE_ATTACK2; break;
case 2: activity = ACT_MELEE_ATTACK_SWING; break;
// Always use both arms when multiple targets are available
activity = ACT_MELEE_ATTACK_SWING;
}
else
{
// Alternate between left, right, and both
switch (RandomInt( 0, 2 ))
{
case 0: break;
case 1: activity = ACT_MELEE_ATTACK2; break;
case 2: activity = ACT_MELEE_ATTACK_SWING; break;
}
}
}
break;
Expand Down Expand Up @@ -2597,6 +2708,8 @@ void CNPC_Advisor::FlyThink()
//-----------------------------------------------------------------------------
void CNPC_Advisor::UpdateAdvisorFacing()
{
Vector vecFaceTarget = vec3_invalid;

/*if (m_hAdvisorFlyer)
{
Vector vecDir;
Expand All @@ -2609,25 +2722,31 @@ void CNPC_Advisor::UpdateAdvisorFacing()
}
else*/ if (advisor_use_facing_override.GetBool())
{
switch ( GetState() )
if (GetState() == NPC_STATE_SCRIPT)
{
case NPC_STATE_COMBAT:
GetAdvisorMotor()->SetIdealYawAndPitchToTarget( GetEnemyLKP()/*, AI_KEEP_YAW_SPEED*/ );
break;
case NPC_STATE_SCRIPT:
GetAdvisorMotor()->SetIdealPitch( 0.0f );
break;
default:
if ( GetLooktarget() )
{
GetAdvisorMotor()->SetIdealYawAndPitchToTarget( GetLooktarget()->GetAbsOrigin()/*, AI_KEEP_YAW_SPEED*/ );
}
else if ( HasCondition( COND_SEE_PLAYER ) )
}
else
{
switch ( GetState() )
{
CBasePlayer * pPlayer = AI_GetSinglePlayer();
GetAdvisorMotor()->SetIdealYawAndPitchToTarget( pPlayer->GetAbsOrigin()/*, AI_KEEP_YAW_SPEED*/ );
case NPC_STATE_COMBAT:
vecFaceTarget = GetEnemyLKP();
break;
default:
if ( GetLooktarget() )
{
vecFaceTarget = GetLooktarget()->GetAbsOrigin();
}
else if ( HasCondition( COND_SEE_PLAYER ) )
{
CBasePlayer * pPlayer = AI_GetSinglePlayer();
vecFaceTarget = pPlayer->GetAbsOrigin();
}
break;
}
break;

GetAdvisorMotor()->SetIdealYawAndPitchToTarget( vecFaceTarget/*, AI_KEEP_YAW_SPEED*/ );
}
}

Expand Down Expand Up @@ -2655,14 +2774,14 @@ void CNPC_Advisor::UpdateAdvisorFacing()
SetPoseParameter( m_ParameterFlexHorz, UTIL_Approach( flYawDiff, yaw, MaxYawSpeed() ) );
SetPoseParameter( m_ParameterFlexVert, UTIL_Approach( flPitchDiff, pitch, MaxPitchSpeed() ) );

// Set arms extent as combination of velocity and distance to enemy
// Set arms extent as combination of velocity and distance to face target
// (higher up = more constricted)
float flArmsExtent;
if (GetEnemy())
float flArmsExtent = 0.0f;
if (vecFaceTarget != vec3_origin)
{
Vector vecDelta = (GetAbsOrigin() - GetEnemy()->GetAbsOrigin());
Vector vecDelta = (GetAbsOrigin() - vecFaceTarget);
float flVelocityLengthSqr = GetLocalVelocity().LengthSqr() + GetLocalAngularVelocity().LengthSqr();
flArmsExtent = RemapVal( (flVelocityLengthSqr + vecDelta.LengthSqr()), 0, Square( 1000 ), 0.0f, 1.0f );
flArmsExtent = RemapVal( (flVelocityLengthSqr + vecDelta.LengthSqr()), 0, Square( advisor_arms_extent_dist.GetFloat() ), advisor_arms_extent_min.GetFloat(), advisor_arms_extent_max.GetFloat() );
}
else
{
Expand Down Expand Up @@ -2876,36 +2995,6 @@ void CNPC_Advisor::TraceAttack( const CTakeDamageInfo &info, const Vector &vecDi

BaseClass::TraceAttack( info, vecDir, ptr, pAccumulator );
}

//-----------------------------------------------------------------------------
// Purpose: Custom trace filter used for advisor staging LOS traces
//-----------------------------------------------------------------------------
class CTraceFilterAdvisorStage : public CTraceFilterSkipTwoEntities
{
public:
CTraceFilterAdvisorStage( IHandleEntity *pHandleEntity, int collisionGroup, IHandleEntity *pHandleEntity2 = NULL )
: CTraceFilterSkipTwoEntities( pHandleEntity, pHandleEntity2, collisionGroup )
{
m_pAdvisor = static_cast<CNPC_Advisor *>(pHandleEntity);
}

bool ShouldHitEntity( IHandleEntity *pHandleEntity, int contentsMask )
{
CBaseEntity *pEntity = EntityFromEntityHandle( pHandleEntity );

if ( pEntity->GetMoveType() == MOVETYPE_VPHYSICS )
{
// Don't hit staged props
if ( m_pAdvisor->IsThisPropStaged( pEntity ) )
return false;
}

return CTraceFilterSimple::ShouldHitEntity( pHandleEntity, contentsMask );
}

private:
CNPC_Advisor *m_pAdvisor;
};
#endif


Expand All @@ -2921,7 +3010,9 @@ static bool AdvisorCanPickObject( CBasePlayer *pPlayer, CBaseEntity *pEnt, CNPC_
Assert( pPlayer != NULL );

// Is the player carrying something?
CBaseEntity *pHeldObject = GetPlayerHeldEntity(pPlayer);
CBaseEntity *pHeldObject = NULL;
if (pPlayer->GetUseEntity() && FClassnameIs( pPlayer->GetUseEntity(), "player_pickup" ))
pHeldObject = GetPlayerHeldEntity(pPlayer);

if( !pHeldObject )
{
Expand Down Expand Up @@ -2950,20 +3041,25 @@ static bool AdvisorCanPickObject( CBasePlayer *pPlayer, CBaseEntity *pEnt, CNPC_
#ifdef EZ2
if (pAdvisor)
{
// Can the prop reach our first staging position?
// TODO: Check all staging positions
CBaseEntity *pStagingPos = pAdvisor->GetFirstStagingPosition();
if (pStagingPos)
// Can the prop reach any staging positions?
int nCount = pAdvisor->GetNumStagingPositions();
int i = 0;
for (; i < nCount; i++)
Copy link

@bloodycop6385 bloodycop6385 Jan 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might be inexperienced or something, but shouldn't there be an 'i'

Copy link

@bloodycop6385 bloodycop6385 Jan 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nevermind, just tested it, this is new to me

{
CBaseEntity *pStagingPos = pAdvisor->GetStagingPosition( i );
CTraceFilterAdvisorStage traceFilter( pAdvisor, COLLISION_GROUP_NONE, pEnt );
trace_t tr;

Vector stagingPos = pStagingPos->GetAbsOrigin();
AI_TraceLine( pEnt->GetAbsOrigin(), stagingPos, MASK_SOLID, &traceFilter, &tr );

if (tr.fraction != 1.0f)
return false;
if (tr.fraction == 1.0f)
break;
}

// Return false if none traced
if (i == nCount)
return false;
}
#endif

Expand Down Expand Up @@ -4283,18 +4379,25 @@ void CNPC_Advisor::InputElightOff( inputdata_t &inputdata )
//------------------------------------------------------------------------------
float CNPC_AdvisorFlyer::GetGoalDistance()
{
float flGoalDist = m_flGoalOverrideDistance;
if (m_flGoalOverrideDistance != 0.0f)
{
// (SCANNER_SPOTLIGHT_NEAR_DIST + ((SCANNER_SPOTLIGHT_FAR_DIST - SCANNER_SPOTLIGHT_NEAR_DIST) / 2)) * 0.5
flGoalDist = 80.0f;
}

if (GetOwnerEntity())
{
CNPC_Advisor *pAdvisor = static_cast<CNPC_Advisor *>(GetOwnerEntity());

// If preparing to throw or have no defenses, get away
if (pAdvisor->IsPreparingToThrow() || !(pAdvisor->CapabilitiesGet() & bits_CAP_INNATE_MELEE_ATTACK1))
{
return BaseClass::GetGoalDistance() * 2.5f;
return flGoalDist * 2.5f;
}
}

return BaseClass::GetGoalDistance();
return flGoalDist;
}

//------------------------------------------------------------------------------
Expand Down Expand Up @@ -4683,10 +4786,10 @@ AI_BEGIN_CUSTOM_NPC( npc_advisor, CNPC_Advisor )
" TASK_MELEE_ATTACK1 0"
""
" Interrupts"
" COND_NEW_ENEMY"
" COND_ENEMY_DEAD"
" COND_LIGHT_DAMAGE"
" COND_HEAVY_DAMAGE"
//" COND_NEW_ENEMY"
//" COND_ENEMY_DEAD"
//" COND_LIGHT_DAMAGE"
//" COND_HEAVY_DAMAGE"
)
#endif

Expand Down
Loading