markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

some work done in 9 months

Browse source
This commit is contained in:
Dmitriy 2015-06-04 11:52:48 +03:00
commit b3b157fab0
17 changed files with 1214 additions and 1272 deletions
Download patch file Download diff file Expand all files Collapse all files

64
include/core.h
View file

@ -189,7 +189,8 @@ enum TaskId_t
TASK_SHOOTBREAKABLE,
TASK_HIDE,
TASK_BLINDED,
TASK_SPRAY
TASK_SPRAY,
TASK_MAX
};
// supported cs's
@ -541,7 +542,6 @@ enum WaypointFlag
enum PathFlag
{
PATHFLAG_JUMP = (1 << 0), // must jump for this connection
PATHFLAG_DOUBLEJUMP = (1 << 1) // must use friend for this connection
};
// defines waypoint connection types
@ -672,28 +672,10 @@ struct WeaponSelect
int buySelect; // select item in buy menu (standard map)
int newBuySelectT; // for counter-strike v1.6
int newBuySelectCT; // for counter-strike v1.6
bool shootsThru; // can shoot thru walls
int penetratePower; // penetrate power
bool primaryFireHold; // hold down primary fire button to use?
};
// skill definitions
struct SkillDefinition
{
float minSurpriseTime; // surprise delay (minimum)
float maxSurpriseTime; // surprise delay (maximum)
float campStartDelay; // delay befor start camping
float campEndDelay; // delay before end camping
float minTurnSpeed; // initial minimum turnspeed
float maxTurnSpeed; // initial maximum turnspeed
float aimOffs_X; // X/Y/Z maximum offsets
float aimOffs_Y; // X/Y/Z maximum offsets
float aimOffs_Z; // X/Y/Z maximum offsets
int headshotFrequency; // precent to aiming to player head
int heardShootThruProb; // precent to shooting throug wall when seen something
int seenShootThruProb; // precent to shooting throug wall when heard something
int recoilAmount; // amount of recoil when the bot should pause shooting
};
// fire delay definiton
struct FireDelay
{
@ -753,7 +735,7 @@ struct ExperienceSave
// bot creation tab
struct CreateQueue
{
int skill;
int difficulty;
int team;
int member;
int personality;
@ -846,6 +828,7 @@ private:
int m_messageQueue[32]; // stack for messages
char m_tempStrings[160]; // space for strings (say text...)
int m_radioSelect; // radio entry
float m_headedTime;
float m_blindRecognizeTime; // time to recognize enemy
float m_itemCheckTime; // time next search for items needs to be done
@ -862,6 +845,7 @@ private:
float m_timeLogoSpray; // time bot last spray logo
float m_knifeAttackTime; // time to rush with knife (at the beginning of the round)
bool m_defendedBomb; // defend action issued
bool m_defendHostage;
float m_askCheckTime; // time to ask team
float m_collideTime; // time last collision
@ -886,7 +870,6 @@ private:
int m_waypointFlags; // current waypoint flags
int m_loosedBombWptIndex; // nearest to loosed bomb waypoint
int m_plantedBombWptIndex;// nearest to planted bomb waypoint
float m_skillOffset; // offset to bots skill
unsigned short m_currentTravelFlags; // connection flags like jumping
bool m_jumpFinished; // has bot finished jumping
@ -931,6 +914,7 @@ private:
float m_zoomCheckTime; // time to check zoom again
float m_shieldCheckTime; // time to check shiled drawing again
float m_grenadeCheckTime; // time to check grenade usage
float m_lastEquipTime; // last time we equipped in buyzone
bool m_checkKnifeSwitch; // is time to check switch to knife action
bool m_checkWeaponSwitch; // is time to check weapon switch
@ -1001,6 +985,7 @@ private:
bool DoWaypointNav (void);
bool EnemyIsThreat (void);
void FacePosition (void);
void SetIdealReactionTimes (bool actual = false);
bool IsRestricted (int weaponIndex);
bool IsRestrictedAMX (int weaponIndex);
@ -1015,6 +1000,7 @@ private:
int FindDefendWaypoint (Vector origin);
int FindGoal (void);
void FindItem (void);
void CheckTerrain (float movedDistance);
void GetCampDirection (Vector *dest);
void CollectGoalExperience (int damage, int team);
@ -1027,7 +1013,7 @@ private:
bool IsBombDefusing (Vector bombOrigin);
bool IsBlockedLeft (void);
bool IsBlockedRight (void);
bool IsWaypointUsed (int index);
bool IsPointOccupied (int index);
inline bool IsOnLadder (void) { return pev->movetype == MOVETYPE_FLY; }
inline bool IsOnFloor (void) { return (pev->flags & (FL_ONGROUND | FL_PARTIALGROUND)) != 0; }
inline bool IsInWater (void) { return pev->waterlevel >= 2; }
@ -1106,12 +1092,13 @@ public:
int m_wantedTeam; // player team bot wants select
int m_wantedClass; // player model bot wants to select
int m_skill; ;// bots play skill
int m_difficulty;
int m_moneyAmount; // amount of money in bot's bank
Personality m_personality;
float m_spawnTime; // time this bot spawned
float m_timeTeamOrder; // time of last radio command
float m_timePeriodicUpdate; // time to per-second think
bool m_isVIP; // bot is vip?
bool m_bIsDefendingTeam; // bot in defending team on this map
@ -1139,7 +1126,8 @@ public:
bool m_hasProgressBar; // has progress bar on a HUD
bool m_jumpReady; // is double jump ready
bool m_canChooseAimDirection; // can choose aiming direction
float m_breakableCheckTime;
float m_blindTime; // time when bot is blinded
float m_blindMoveSpeed; // mad speeds when bot is blind
float m_blindSidemoveSpeed; // mad side move speeds when bot is blind
@ -1204,14 +1192,13 @@ public:
Array <TaskItem> m_tasks;
Bot (edict_t *bot, int skill, int personality, int team, int member);
Bot (edict_t *bot, int difficulty, int personality, int team, int member);
~Bot (void);
int GetAmmo (void);
inline int GetAmmoInClip (void) { return m_ammoInClip[m_currentWeapon]; }
inline edict_t *GetEntity (void) { return ENT (pev); };
inline EOFFSET GetOffset (void) { return OFFSET (pev); };
inline edict_t *GetEntity (void) { return pev->pContainingEntity; };
int GetIndex (void);
inline Vector Center (void) { return (pev->absmax + pev->absmin) * 0.5; };
@ -1229,7 +1216,9 @@ public:
void DeleteSearchNodes (void);
void RemoveCertainTask (TaskId_t id);
void StartTask (TaskId_t id, float desire, int data, float time, bool canContinue);
void StartTask_ (int, const char *f, TaskId_t id, float desire, int data, float time, bool canContinue);
#define StartTask(i,d,a,t,c) StartTask_(__LINE__, __FUNCTION__,i,d,a,t,c)
void ResetTasks (void);
TaskItem *GetTask (void);
inline TaskId_t GetTaskId (void) { return GetTask ()->id; };
@ -1246,13 +1235,13 @@ public:
void RadioMessage (int message);
void ChatterMessage (int message);
void HandleChatterMessage (const char *sz);
void TryHeadTowardRadioEntity (void);
void Kill (void);
void Kick (void);
void ResetDoubleJumpState (void);
void MoveToVector (Vector to);
int FindPlantedBomb(void);
int FindLoosedBomb (void);
bool HasHostage (void);
bool UsesRifle (void);
@ -1286,7 +1275,7 @@ private:
bool m_deathMsgSent; // for fakeping
protected:
int CreateBot (String name, int skill, int personality, int team, int member);
int CreateBot (String name, int difficulty, int personality, int team, int member);
public:
BotManager (void);
@ -1314,9 +1303,9 @@ public:
void CheckAutoVacate (edict_t *ent);
void AddRandom (void) { AddBot ("", -1, -1, -1, -1); }
void AddBot (const String &name, int skill, int personality, int team, int member);
void AddBot (String name, String skill, String personality, String team, String member);
void FillServer (int selection, int personality = PERSONALITY_NORMAL, int skill = -1, int numToAdd = -1);
void AddBot (const String &name, int difficulty, int personality, int team, int member);
void AddBot (String name, String difficulty, String personality, String team, String member);
void FillServer (int selection, int personality = PERSONALITY_NORMAL, int difficulty = -1, int numToAdd = -1);
void RemoveAll (bool zeroQuota = true);
void RemoveRandom (void);
@ -1516,10 +1505,10 @@ enum VarType
VT_NORMAL = 0,
VT_READONLY,
VT_PASSWORD,
VT_NOSERVER,
VT_NOREGISTER
};
class ConVarWrapper : public Singleton <ConVarWrapper>
{
private:
@ -1613,7 +1602,7 @@ extern bool IsDedicatedServer (void);
extern bool IsVisible (const Vector &origin, edict_t *ent);
extern bool IsAlive (edict_t *ent);
extern bool IsInViewCone (Vector origin, edict_t *ent);
extern bool IsWeaponShootingThroughWall (int id);
extern int GetWeaponPenetrationPower (int id);
extern bool IsValidBot (edict_t *ent);
extern bool IsValidPlayer (edict_t *ent);
extern bool OpenConfig (const char *fileName, char *errorIfNotExists, File *outFile, bool languageDependant = false);
@ -1659,7 +1648,6 @@ extern void SoundSimulateUpdate (int playerIndex);
// very global convars
extern ConVar yb_jasonmode;
extern ConVar yb_communication_type;
extern ConVar yb_hardcore_mode;
extern ConVar yb_csdm_mode;
extern ConVar yb_ignore_enemies;

24
include/corelib.h
View file

@ -1,4 +1,4 @@
//
//
// Yet Another POD-Bot, based on PODBot by Markus Klinge ("CountFloyd").
// Copyright (c) YaPB Development Team.
//
@ -2404,8 +2404,7 @@ public:
~String (void)
{
if (m_bufferPtr != NULL)
delete [] m_bufferPtr;
delete [] m_bufferPtr;
}
String (const char *bufferPtr)
@ -2469,22 +2468,7 @@ public:
return &m_bufferPtr[0];
}
//
// Function: ToString
// Gets the string buffer (constant).
//
// Returns:
// Pointer to constant buffer.
//
const char *ToString (void) const
{
if (m_bufferPtr == NULL || *m_bufferPtr == 0x0)
return "";
return &m_bufferPtr[0];
}
//
// Function: ToFloat
// Gets the string as float, if possible.
@ -4034,7 +4018,7 @@ public:
static String result;
if (m_fileName != "(no)" && m_line != -1)
result.AssignFormat ("Exception: %s at %s:%i", m_exceptionText.ToString (), m_fileName.ToString (), m_line);
result.AssignFormat ("Exception: %s at %s:%i", m_exceptionText.GetBuffer (), m_fileName.GetBuffer (), m_line);
else
result = m_exceptionText;

14
include/globals.h
View file

@ -33,6 +33,7 @@ extern float g_timeRoundEnd;
extern float g_timeRoundMid;
extern float g_timeNextBombUpdate;
extern float g_timeRoundStart;
extern float g_timePerSecondUpdate;
extern float g_lastRadioTime[2];
extern int g_mapType;
@ -70,7 +71,6 @@ extern WeaponProperty g_weaponDefs[MAX_WEAPONS + 1];
extern Client g_clients[32];
extern MenuText g_menus[21];
extern SkillDefinition g_skillTab[6];
extern TaskItem g_taskFilters[];
extern Experience *g_experienceData;
@ -108,7 +108,17 @@ static inline edict_t *EntityOfIndex (const int index)
return static_cast <edict_t *> (g_worldEdict + index);
};
inline int IndexOfEntity (const edict_t *ent)
static inline int IndexOfEntity(const edict_t *ent)
{
return static_cast <int> (ent - g_worldEdict);
};
static inline int EntOffsetOfEntity(const edict_t *ent)
{
return (char *) ent - (char *) g_worldEdict;
}
static inline bool IsEntityNull (const edict_t *ent)
{
return !ent || !EntOffsetOfEntity (ent);
}

10
include/resource.h
View file

@ -11,17 +11,17 @@
// general product information
#define PRODUCT_NAME "YaPB"
#define PRODUCT_VERSION "2.6"
#define PRODUCT_VERSION "2.7"
#define PRODUCT_AUTHOR "YaPB Dev Team"
#define PRODUCT_URL "http://yapb.jeefo.net/"
#define PRODUCT_EMAIL "dmitry@jeefo.net"
#define PRODUCT_LOGTAG "YAPB"
#define PRODUCT_DESCRIPTION PRODUCT_NAME " v" PRODUCT_VERSION " - The Counter-Strike 1.6 Bot"
#define PRODUCT_COPYRIGHT "Copyright © 2014, by " PRODUCT_AUTHOR
#define PRODUCT_DESCRIPTION PRODUCT_NAME " v" PRODUCT_VERSION " - The Counter-Strike Bot"
#define PRODUCT_COPYRIGHT "Copyright © 2015, by " PRODUCT_AUTHOR
#define PRODUCT_LEGAL "Half-Life, Counter-Strike, Counter-Strike: Condition Zero, Steam, Valve is a trademark of Valve Corporation"
#define PRODUCT_ORIGINAL_NAME "yapb.dll"
#define PRODUCT_INTERNAL_NAME "podbot"
#define PRODUCT_VERSION_DWORD 2,6,0 // major version, minor version, WIP (or Update) version, BUILD number (generated with RES file)
#define PRODUCT_SUPPORT_VERSION "1.4 - CZ"
#define PRODUCT_VERSION_DWORD 2,7,0 // major version, minor version, WIP (or Update) version, BUILD number (generated with RES file)
#define PRODUCT_SUPPORT_VERSION "1.0 - CZ"
#define PRODUCT_DATE __DATE__