From 07c6dd358b57c73a519c4c437a4cacea9f9b56b8 Mon Sep 17 00:00:00 2001 From: Ryan Hunter Date: Fri, 10 Sep 2021 21:46:18 +0100 Subject: [PATCH] 0.800 Released --- Readme.txt | 18 ++++++++++--- bot.h | 3 +-- bot_combat.cpp | 2 +- bot_job_think.cpp | 66 +++++++++++++++++++++++------------------------ changelog.txt | 4 +-- dll.cpp | 2 +- meta_api.cpp | 2 +- util.cpp | 5 ---- vers_fox.h | 2 +- 9 files changed, 54 insertions(+), 50 deletions(-) diff --git a/Readme.txt b/Readme.txt index c4995ada..11a4bcd3 100644 --- a/Readme.txt +++ b/Readme.txt @@ -34,21 +34,29 @@ a section specifically about compiling the Linux version of Foxbot. -------------------------------------------------------------------------------- Version 0.800 -????-??-202? +September-10-2021 Updated by RoboCop -------------------------------------------------------------------------------- - Added new waypoints:- + + axlfly + botspree + dustbowl_old + dustbowl2_v2 + gen_complex + insideout + lbdustbowl + + madcanyon + mulch_dm2b1 + + murderball1_3 + + osaka_l + + osaka_r2 + + rats2v2 + rock2_2way_r + rock2_open_r - + turbine (incomplete) + + sandbowl_r + + turbine + + warpath_r2 - Reinstated the 'foxbot_commander' feature @@ -62,6 +70,10 @@ Updated by RoboCop - Fixed Listenserver foxbot.cfg and other .cfg load failures +- Added some support for murderball, murderball1_3 and murderball-2002 + +- Fixed the unreachable waypoint in warpath as well as enhanced its other waypoints + - Reduced StartFrame stack by reducing some unwanted features and lines that exceed it - Added more reaction time delay for bots to attack enemies as they were too quick to respond @@ -78,8 +90,6 @@ Known bugs:- >> Sniper bots tend to TK when Friendly Fire is on, when interacting with their team's sentries and teleports --------------------------------------------------------------------------------- - ____________________________________________________________ Compiling the source code diff --git a/bot.h b/bot.h index 294278ef..d595cd13 100644 --- a/bot.h +++ b/bot.h @@ -29,18 +29,17 @@ #define BOT_H #include "osdep.h" +#include // stuff for Win32 vs. Linux builds #ifndef __linux__ -#include typedef int(FAR *GETENTITYAPI)(DLL_FUNCTIONS *, int); typedef int(FAR *GETNEWDLLFUNCTIONS)(NEW_DLL_FUNCTIONS *, int *); typedef void(__stdcall *GIVEFNPTRSTODLL)(enginefuncs_t *, globalvars_t *); typedef void(FAR *LINK_ENTITY_FUNC)(entvars_t *); #else -#include #include #define GetProcAddress dlsym diff --git a/bot_combat.cpp b/bot_combat.cpp index 4c0de74e..0d53d4f2 100644 --- a/bot_combat.cpp +++ b/bot_combat.cpp @@ -2248,7 +2248,7 @@ void BotCheckForMultiguns(bot_t *pBot, float nearestdistance, edict_t *pNewEnemy // Skip this shit if neotf isnt present const char *cvar_ntf = const_cast(CVAR_GET_STRING("neotf")); - if (strcmp(cvar_ntf, "1")) // No neotf + if (strcmp(cvar_ntf, "1") != 0) // No neotf return; // Loop through all the multigun types, checking for a closer target diff --git a/bot_job_think.cpp b/bot_job_think.cpp index df0b87da..380fea67 100644 --- a/bot_job_think.cpp +++ b/bot_job_think.cpp @@ -123,51 +123,51 @@ static constexpr jobFunctions_struct jf[JOB_TYPE_TOTAL] = { // list of essential data for all known job types // these must be in the right order for each job to run properly const jobList_struct jl[JOB_TYPE_TOTAL] = { - {500, "JOB_SEEK_WAYPOINT"}, - {PRIORITY_MAXIMUM, "JOB_GET_UNSTUCK"}, {0, "JOB_ROAM"}, + {190, "JOB_FEIGN_AMBUSH"}, + {200, "JOB_GRAFFITI_ARTIST"}, + {210, "JOB_PATROL_HOME"}, + {220, "JOB_MELEE_WARRIOR"}, + {250, "JOB_GUARD_WAYPOINT"}, + {300, "JOB_AVOID_ENEMY"}, + {350, "JOB_HARRASS_DEFENSE"}, + {380, "JOB_ROCKET_JUMP"}, // Reduced RJ until fix is provided [APG]RoboCop[CL] {400, "JOB_CHAT"}, - {580, "JOB_REPORT"}, + {410, "JOB_DETPACK_WAYPOINT"}, + {430, "JOB_PIPETRAP"}, + {450, "JOB_ATTACK_TELEPORT"}, + {460, "JOB_GET_ARMOR"}, + {470, "JOB_GET_HEALTH"}, + {480, "JOB_CALL_MEDIC"}, // this should be a higher priority than JOB_GET_HEALTH {490, "JOB_PICKUP_ITEM"}, + {500, "JOB_SEEK_WAYPOINT"}, {510, "JOB_PICKUP_FLAG"}, - {790, "JOB_PUSH_BUTTON"}, - {680, "JOB_USE_TELEPORT"}, - {800, "JOB_MAINTAIN_OBJECT"}, - {780, "JOB_BUILD_SENTRY"}, {520, "JOB_BUILD_DISPENSER"}, - {690, "JOB_BUILD_TELEPORT"}, - {620, "JOB_BUFF_ALLY"}, - {610, "JOB_ESCORT_ALLY"}, - {480, "JOB_CALL_MEDIC"}, // this should be a higher priority than JOB_GET_HEALTH - {460, "JOB_GET_HEALTH"}, - {450, "JOB_GET_ARMOR"}, - {660, "JOB_GET_AMMO"}, - {630, "JOB_DISGUISE"}, - {190, "JOB_FEIGN_AMBUSH"}, {560, "JOB_SNIPE"}, - {250, "JOB_GUARD_WAYPOINT"}, - {670, "JOB_DEFEND_FLAG"}, - {650, "JOB_GET_FLAG"}, - {780, "JOB_CAPTURE_FLAG"}, - {340, "JOB_HARRASS_DEFENSE"}, - {380, "JOB_ROCKET_JUMP"}, // Reduced RJ until fix is provided [APG]RoboCop[CL] - {720, "JOB_CONCUSSION_JUMP"}, - {390, "JOB_DETPACK_WAYPOINT"}, - {430, "JOB_PIPETRAP"}, + {570, "JOB_SEEK_BACKUP"}, + {580, "JOB_REPORT"}, + {590, "JOB_ATTACK_BREAKABLE"}, {600, "JOB_INVESTIGATE_AREA"}, + {610, "JOB_ESCORT_ALLY"}, + {620, "JOB_BUFF_ALLY"}, + {630, "JOB_DISGUISE"}, {640, "JOB_PURSUE_ENEMY"}, - {210, "JOB_PATROL_HOME"}, + {650, "JOB_GET_FLAG"}, + {660, "JOB_GET_AMMO"}, + {670, "JOB_DEFEND_FLAG"}, + {680, "JOB_USE_TELEPORT"}, + {690, "JOB_BUILD_TELEPORT"}, {700, "JOB_SPOT_STIMULUS"}, - {590, "JOB_ATTACK_BREAKABLE"}, - {440, "JOB_ATTACK_TELEPORT"}, - {570, "JOB_SEEK_BACKUP"}, - {300, "JOB_AVOID_ENEMY"}, - {730, "JOB_AVOID_AREA_DAMAGE"}, {710, "JOB_INFECTED_ATTACK"}, + {720, "JOB_CONCUSSION_JUMP"}, + {730, "JOB_AVOID_AREA_DAMAGE"}, {740, "JOB_BIN_GRENADE"}, {760, "JOB_DROWN_RECOVER"}, - {240, "JOB_MELEE_WARRIOR"}, - {200, "JOB_GRAFFITI_ARTIST"}, + {770, "JOB_BUILD_SENTRY"}, + {780, "JOB_CAPTURE_FLAG"}, + {790, "JOB_PUSH_BUTTON"}, + {800, "JOB_MAINTAIN_OBJECT"}, + {PRIORITY_MAXIMUM, "JOB_GET_UNSTUCK"}, }; // This function clears the specified bots job buffer, and thus should diff --git a/changelog.txt b/changelog.txt index 61e001f2..3e268494 100644 --- a/changelog.txt +++ b/changelog.txt @@ -4,7 +4,7 @@ -------------------------------------------------------------------------------- Version 0.800 -????-??-2021 +September-10-2021 Updated by RoboCop -------------------------------------------------------------------------------- @@ -25,7 +25,7 @@ Updated by RoboCop + rock2_2way_r + rock2_open_r + sandbowl_r - + turbine (incomplete) + + turbine + warpath_r2 - Reinstated the 'foxbot_commander' feature diff --git a/dll.cpp b/dll.cpp index 6659912b..529de981 100644 --- a/dll.cpp +++ b/dll.cpp @@ -56,7 +56,7 @@ #define MENU_6 6 #define MENU_7 7 -cvar_t foxbot = {"foxbot", "0.800-beta3", FCVAR_SERVER | FCVAR_UNLOGGED, 0, nullptr}; +cvar_t foxbot = {"foxbot", "0.800", FCVAR_SERVER | FCVAR_UNLOGGED, 0, nullptr}; cvar_t enable_foxbot = {"enable_foxbot", "1", FCVAR_SERVER | FCVAR_UNLOGGED, 0, nullptr}; cvar_t sv_bot = {"bot", "", 0, 0, nullptr}; diff --git a/meta_api.cpp b/meta_api.cpp index c11a0b80..b71f64a7 100644 --- a/meta_api.cpp +++ b/meta_api.cpp @@ -36,7 +36,7 @@ static META_FUNCTIONS gMetaFunctionTable = { plugin_info_t Plugin_info = { META_INTERFACE_VERSION, // ifvers "FoxBot", // name - "0.800-beta3", // version + "0.800", // version __DATE__, // date "Tom Simpson & RoboCop ", // author "https://apg-clan.org/", // url diff --git a/util.cpp b/util.cpp index 62baf0f3..03a44452 100644 --- a/util.cpp +++ b/util.cpp @@ -24,13 +24,8 @@ #include "extdll.h" #include -#ifndef __linux__ -#include -#include -#else #include #include -#endif #include "bot.h" #include "bot_func.h" diff --git a/vers_fox.h b/vers_fox.h index a4400264..d0bcafee 100644 --- a/vers_fox.h +++ b/vers_fox.h @@ -21,7 +21,7 @@ #endif /* _MSC_VER */ #endif /* not OPT_TYPE */ -#define VDATE "2020/09/18" +#define VDATE "2021/09/10" #define VVERSION "0.800" #define RC_VERS_DWORD "0.800" // Version Windows DLL Resources in res_meta.rc