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

Prevent bot auto-creation when removing bot, by delaying quota maintaining time.

Browse source
This commit is contained in:
jeefo 2016-11-02 18:36:05 +03:00
commit 6769ddca39
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/combat.cpp
View file

@ -972,7 +972,7 @@ bool Bot::IsWeaponBadInDistance (int weaponIndex, float distance)
int wid = g_weaponSelect[weaponIndex].id; int wid = g_weaponSelect[weaponIndex].id;
if (wid == WEAPON_KNIFE) if (wid == WEAPON_KNIFE)
return false; return false;
// check is ammo available for secondary weapon // check is ammo available for secondary weapon
if (m_ammoInClip[g_weaponSelect[GetBestSecondaryWeaponCarried ()].id] >= 1) if (m_ammoInClip[g_weaponSelect[GetBestSecondaryWeaponCarried ()].id] >= 1)

22
source/manager.cpp
View file

@ -368,19 +368,21 @@ void BotManager::AdjustQuota (bool isPlayerConnecting, edict_t *ent)
{ {
RemoveRandom (); RemoveRandom ();
m_balanceCount--; m_balanceCount--;
m_quotaMaintainTime = engine.Time () + 2.0f;
} }
} }
else if (m_balanceCount < 0) else if (m_balanceCount < 0)
{ {
AddRandom (false); AddRandom ();
m_balanceCount++; m_balanceCount++;
} }
} }
void BotManager::AddPlayerToCheckTeamQueue (edict_t *ent) void BotManager::AddPlayerToCheckTeamQueue (edict_t *ent)
{ {
if (!engine.IsDedicatedServer () || !yb_autovacate.GetBool () || IsValidBot (ent)) if (!engine.IsDedicatedServer () || !yb_autovacate.GetBool () || IsValidBot (ent))
return; return;
// entity must be unique // entity must be unique
bool hasFound = false; bool hasFound = false;
@ -400,8 +402,8 @@ void BotManager::AddPlayerToCheckTeamQueue (edict_t *ent)
void BotManager::VerifyPlayersHasJoinedTeam (int &desiredCount) void BotManager::VerifyPlayersHasJoinedTeam (int &desiredCount)
{ {
if (!engine.IsDedicatedServer () || !yb_autovacate.GetBool () || m_trackedPlayers.IsEmpty ()) if (!engine.IsDedicatedServer () || !yb_autovacate.GetBool () || m_trackedPlayers.IsEmpty ())
return; return;
for (int i = 0; i < engine.MaxClients (); i++) for (int i = 0; i < engine.MaxClients (); i++)
{ {
@ -475,21 +477,23 @@ void BotManager::MaintainBotQuota (void)
} }
int numBots = GetBotsNum (); int numBots = GetBotsNum ();
int numHumans = yb_autovacate_smart_kick.GetBool () ? GetHumansJoinedTeam () : GetHumansNum (); int numHumans = GetHumansNum ();
int desiredCount = yb_quota.GetInt (); int desiredCount = yb_quota.GetInt ();
if (yb_join_after_player.GetBool () && !numHumans) if (yb_join_after_player.GetBool () && !numHumans)
desiredCount = 0; desiredCount = 0;
int numHumansOnTeam = yb_autovacate_smart_kick.GetBool () ? GetHumansJoinedTeam () : numHumans;
// quota mode // quota mode
char mode = yb_quota_mode.GetString ()[0]; char mode = yb_quota_mode.GetString ()[0];
if (mode == 'f' || mode == 'F') // fill if (mode == 'f' || mode == 'F') // fill
desiredCount = A_max (0, desiredCount - numHumans); desiredCount = A_max (0, desiredCount - numHumansOnTeam);
else if (mode == 'm' || mode == 'M') // match else if (mode == 'm' || mode == 'M') // match
desiredCount = A_max (0, yb_quota.GetInt () * numHumans); desiredCount = A_max (0, yb_quota.GetInt () * numHumansOnTeam);
desiredCount = A_min (desiredCount, engine.MaxClients () - (numHumans + (yb_autovacate.GetBool () ? 1 : 0))); desiredCount = A_min (desiredCount, engine.MaxClients () - (numHumansOnTeam + (yb_autovacate.GetBool () ? 1 : 0)));
if (yb_autovacate_smart_kick.GetBool () && numBots > 1 && desiredCount > 1) if (yb_autovacate_smart_kick.GetBool () && numBots > 1 && desiredCount > 1)
VerifyPlayersHasJoinedTeam (desiredCount); VerifyPlayersHasJoinedTeam (desiredCount);