projects
/
xonotic
/
xonotic-data.pk3dir.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 'master'
[xonotic/xonotic-data.pk3dir.git]
/
qcsrc
/
server
/
bot
/
default
/
bot.qc
diff --git
a/qcsrc/server/bot/default/bot.qc
b/qcsrc/server/bot/default/bot.qc
index 2552cc4bab6827799f66f90244b715f9e2b5c52e..3911d596dc51859afd8058272ec394bf402014a7 100644
(file)
--- a/
qcsrc/server/bot/default/bot.qc
+++ b/
qcsrc/server/bot/default/bot.qc
@@
-215,13
+215,13
@@
void bot_setnameandstuff(entity this)
prio = 6;
prio = 6;
- #define READSKILL(f, w, r) MACRO_BEGIN
{
\
+ #define READSKILL(f, w, r) MACRO_BEGIN \
if(argv(prio) != "") \
this.f = stof(argv(prio)) * w; \
else \
this.f = (!autocvar_g_campaign) * (2 * random() - 1) * r * w; \
prio++; \
if(argv(prio) != "") \
this.f = stof(argv(prio)) * w; \
else \
this.f = (!autocvar_g_campaign) * (2 * random() - 1) * r * w; \
prio++; \
-
}
MACRO_END
+ MACRO_END
//print(bot_name, ": ping=", argv(9), "\n");
READSKILL(havocbot_keyboardskill, 0.5, 0.5); // keyboard skill
//print(bot_name, ": ping=", argv(9), "\n");
READSKILL(havocbot_keyboardskill, 0.5, 0.5); // keyboard skill
@@
-604,6
+604,8
@@
bool bot_fixcount()
else if ((realplayers || autocvar_bot_join_empty || (currentbots > 0 && time < 5)))
{
int minplayers = max(0, floor(autocvar_minplayers));
else if ((realplayers || autocvar_bot_join_empty || (currentbots > 0 && time < 5)))
{
int minplayers = max(0, floor(autocvar_minplayers));
+ if (teamplay)
+ minplayers = max(0, floor(autocvar_minplayers_per_team) * AvailableTeams());
int minbots = max(0, floor(autocvar_bot_number));
// add bots to reach minplayers if needed
int minbots = max(0, floor(autocvar_bot_number));
// add bots to reach minplayers if needed