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

graph: reworked buckets so they can handle very large number of nodes

Browse source 
graph: reworked buckets so they can handle very large number of nodes
aim: bots should more respect headshot allow option (needs testing)
aim: incorporated never-finished changes from pr #204
nav: increased reachability timers a bit
nav: ensure buckets has enough nodes before use they
conf: introduced max recoil in difficulty config file
bot: overall fixes to jason mode, treat knife in hands and no weapons as jason mode too
bot: changed default difficulty level for bots to level 3
fix: knife attacks not working since last commit (fixes #429)
fix: hostage rescue not working since last commit (fixes #427)
refactor: use range loops for graph outside graph class when possible
This commit is contained in:
jeefo 2023-04-11 22:32:28 +03:00
commit 1a650c57ce
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
14 changed files with 426 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/config.cpp
View file

@ -20,6 +20,7 @@ BotConfig::BotConfig () {
void BotConfig::loadConfigs () {
setupMemoryFiles ();
loadCustomConfig ();
loadNamesConfig ();
loadChatConfig ();
loadChatterConfig ();
@ -28,7 +29,6 @@ void BotConfig::loadConfigs () {
loadLogosConfig ();
loadAvatarsConfig ();
loadDifficultyConfig ();
loadCustomConfig ();
}
void BotConfig::loadMainConfig (bool isFirstLoad) {
@ -533,27 +533,27 @@ void BotConfig::loadDifficultyConfig () {
// initialize defaults
m_difficulty[Difficulty::Noob] = {
{ 0.8f, 1.0f }, 5, 0, 0
{ 0.8f, 1.0f }, 5, 0, 0, 38, { 30.0f, 30.0f, 40.0f }
};
m_difficulty[Difficulty::Easy] = {
{ 0.6f, 0.8f }, 30, 10, 10
{ 0.6f, 0.8f }, 30, 10, 10, 32, { 15.0f, 15.0f, 24.0f }
};
m_difficulty[Difficulty::Normal] = {
{ 0.4f, 0.6f }, 50, 30, 40
{ 0.4f, 0.6f }, 50, 30, 40, 26, { 5.0f, 5.0f, 10.0f }
};
m_difficulty[Difficulty::Hard] = {
{ 0.2f, 0.4f }, 75, 60, 70
{ 0.2f, 0.4f }, 75, 60, 70, 23, { 0.0f, 0.0f, 0.0f }
};
m_difficulty[Difficulty::Expert] = {
{ 0.1f, 0.2f }, 100, 90, 90
{ 0.1f, 0.2f }, 100, 90, 90, 21, { 0.0f, 0.0f, 0.0f }
};
// currently, mindelay, maxdelay, headprob, seenthruprob, heardthruprob
constexpr uint32_t kMaxDifficultyValues = 5;
// currently, mindelay, maxdelay, headprob, seenthruprob, heardthruprob, recoil, aim_error {x,y,z}
constexpr uint32_t kMaxDifficultyValues = 9;
// helper for parsing each level
auto parseLevel = [&] (int32_t level, StringRef data) {
@ -570,6 +570,10 @@ void BotConfig::loadDifficultyConfig () {
diff->headshotPct = values[2].int_ ();
diff->seenThruPct = values[3].int_ ();
diff->hearThruPct = values[4].int_ ();
diff->maxRecoil = values[5].int_ ();
diff->aimError.x = values[6].float_ ();
diff->aimError.y = values[7].float_ ();
diff->aimError.z = values[8].float_ ();
};
// avatars inititalization