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

fix: logos config not initialized (resolves #691)

Browse source 
bot: make sure rescue zone icon blinking to consider bot reached rescue zone when escorting hostages (ref #688)
bot: remove hardcoded radio communication randoms, so they're now depends on bots personality
refactor: some refactoring of code
This commit is contained in:
jeefo 2025-05-07 13:07:40 +03:00
commit 6dfb09f110
No known key found for this signature in database
GPG key ID: D696786B81B667C8
26 changed files with 180 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/manager.cpp
View file

@ -669,7 +669,7 @@ void BotManager::killAllBots (int team, bool silent) {
// this function kills all bots on server (only this dll controlled bots)
for (const auto &bot : m_bots) {
if (team != -1 && game.getRealTeam (bot->ent ()) != team) {
if (team != Team::Invalid && game.getRealTeam (bot->ent ()) != team) {
continue;
}
bot->kill ();
@ -922,11 +922,14 @@ void BotManager::listBots () {
bot->index (),
bot->pev->netname.chars (),
bot->m_personality == Personality::Rusher ? "rusher" : bot->m_personality == Personality::Normal ? "normal" : "careful",
botTeam (bot->ent ()),
bot->m_difficulty,
static_cast <int> (bot->pev->frags),
bot->m_deathCount,
bot->m_isAlive ? "yes" : "no",
timelimitStr);
}
ctrl.msg ("%d bots", m_bots.length ());
@ -1123,7 +1126,7 @@ Bot::Bot (edict_t *bot, int difficulty, int personality, int team, int skin) {
}
}
char reject[StringBuffer::StaticBufferSize] = { 0, };
char reject[128] = { 0, };
MDLL_ClientConnect (bot, bot->v.netname.chars (), strings.format ("127.0.0.%d", clientIndex + 100), reject);
if (!strings.isEmpty (reject)) {
@ -1569,6 +1572,7 @@ void Bot::newRound () {
m_hitboxEnumerator = cr::makeUnique <PlayerHitboxEnumerator> ();
}
}
showChatterIcon (false);
m_approachingLadderTimer.invalidate ();
m_forgetLastVictimTimer.invalidate ();
@ -1609,6 +1613,24 @@ void Bot::newRound () {
m_buyState = BuyState::PrimaryWeapon;
m_lastEquipTime = 0.0f;
// setup radio percent each round
const auto badMorale = m_fearLevel > m_agressionLevel ? rg.chance (75) : rg.chance (35);
switch (m_personality) {
case Personality::Normal:
default:
m_radioPercent = badMorale ? rg (50, 75) : rg (25, 50);
break;
case Personality::Rusher:
m_radioPercent = badMorale ? rg (35, 50) : rg (15, 35);
break;
case Personality::Careful:
m_radioPercent = badMorale ? rg (70, 90) : rg (50, 70);
break;
}
// if bot died, clear all weapon stuff and force buying again
if (!m_isAlive) {
clearAmmoInfo ();