aim: improved ladder handling view direction
aim: improved enemy prediction once again nav: bots with hostages will try to take all hostages that are near with him instead of going directly to rescue zone manager: fixed engine errors when removing bots with kickall with instant parameter graph: strip http:// prefix from graph upload url, it should be always http for now bot: improve handling of smoke grenades on ground (restored code from old yapb2 branch)
This commit is contained in:
parent
5a2d0748c0
commit
a49a4000c9
16 changed files with 269 additions and 133 deletions
|
|
@ -395,6 +395,15 @@ CR_DECLARE_SCOPED_ENUM (Visibility,
|
|||
None = 0
|
||||
)
|
||||
|
||||
// goal tactic
|
||||
CR_DECLARE_SCOPED_ENUM (GoalTactic,
|
||||
Defensive = 0,
|
||||
Camp,
|
||||
Offensive,
|
||||
Goal,
|
||||
RescueHostage
|
||||
)
|
||||
|
||||
// frustum sides
|
||||
CR_DECLARE_SCOPED_ENUM (FrustumSide,
|
||||
Top = 0,
|
||||
|
|
|
|||
|
|
@ -99,8 +99,8 @@ private:
|
|||
BinaryHeap <RouteTwin <float>> m_routeQue {};
|
||||
Array <Route> m_routes {};
|
||||
|
||||
HeuristicFn m_hcalc;
|
||||
HeuristicFn m_gcalc;
|
||||
HeuristicFn m_hcalc {};
|
||||
HeuristicFn m_gcalc {};
|
||||
|
||||
int m_length {};
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,9 @@ public:
|
|||
// check if entity is a vip
|
||||
bool isPlayerVIP (edict_t *ent);
|
||||
|
||||
// check if entity is a hostage entity
|
||||
bool isHostageEntity (edict_t *ent);
|
||||
|
||||
// nearest player search helper
|
||||
bool findNearestPlayer (void **holder, edict_t *to, float searchDistance = 4096.0, bool sameTeam = false, bool needBot = false, bool needAlive = false, bool needDrawn = false, bool needBotWithC4 = false);
|
||||
|
||||
|
|
|
|||
|
|
@ -362,8 +362,9 @@ private:
|
|||
Vector m_throw {}; // origin of node to throw grenades
|
||||
Vector m_enemyOrigin {}; // target origin chosen for shooting
|
||||
Vector m_grenade {}; // calculated vector for grenades
|
||||
Vector m_entity {}; // origin of entities like buttons etc.
|
||||
Vector m_lookAtSafe {}; // aiming vector when camping.
|
||||
Vector m_entity {}; // origin of entities like buttons etc
|
||||
Vector m_lookAtSafe {}; // aiming vector when camping
|
||||
Vector m_lookAtPredict {}; // aiming vector when predicting
|
||||
Vector m_desiredVelocity {}; // desired velocity for jump nodes
|
||||
Vector m_breakableOrigin {}; // origin of breakable
|
||||
|
||||
|
|
@ -403,7 +404,7 @@ private:
|
|||
bool canDuckUnder (const Vector &normal);
|
||||
bool canJumpUp (const Vector &normal);
|
||||
bool doneCanJumpUp (const Vector &normal, const Vector &right);
|
||||
bool cantMoveForward (const Vector &normal, TraceResult *tr);
|
||||
bool isBlockedForward (const Vector &normal, TraceResult *tr);
|
||||
bool canStrafeLeft (TraceResult *tr);
|
||||
bool canStrafeRight (TraceResult *tr);
|
||||
bool isBlockedLeft ();
|
||||
|
|
@ -730,7 +731,7 @@ public:
|
|||
void pushChatterMessage (int message);
|
||||
void tryHeadTowardRadioMessage ();
|
||||
void kill ();
|
||||
void kick ();
|
||||
void kick (bool silent = false);
|
||||
void resetDoubleJump ();
|
||||
void startDoubleJump (edict_t *ent);
|
||||
void sendBotToOrigin (const Vector &origin);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue