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

fix: wrong data type for flash level (flashbat message)

Browse source
This commit is contained in:
dmitry 2022-04-14 12:36:23 +03:00
commit af992c374c
No known key found for this signature in database
GPG key ID: 8297CE728B7A7E37
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inc/yapb.h
View file

@ -946,7 +946,6 @@ public:
float m_nextBuyTime {}; // next buy time float m_nextBuyTime {}; // next buy time
float m_checkDarkTime {}; // check for darkness time float m_checkDarkTime {}; // check for darkness time
float m_preventFlashing {}; // bot turned away from flashbang float m_preventFlashing {}; // bot turned away from flashbang
float m_flashLevel {}; // flashlight level
float m_blindTime {}; // time when bot is blinded float m_blindTime {}; // time when bot is blinded
float m_blindMoveSpeed {}; // mad speeds when bot is blind float m_blindMoveSpeed {}; // mad speeds when bot is blind
float m_blindSidemoveSpeed {}; // mad side move speeds when bot is blind float m_blindSidemoveSpeed {}; // mad side move speeds when bot is blind
@ -978,6 +977,7 @@ public:
float m_kpdRatio; // kill per death ratio float m_kpdRatio; // kill per death ratio
float m_healthValue; // clamped bot health float m_healthValue; // clamped bot health
int m_flashLevel {}; // flashlight level
int m_basePing; // base ping for bot int m_basePing; // base ping for bot
int m_numEnemiesLeft {}; // number of enemies alive left on map int m_numEnemiesLeft {}; // number of enemies alive left on map
int m_numFriendsLeft {}; // number of friend alive left on map int m_numFriendsLeft {}; // number of friend alive left on map

9
src/botlib.cpp
View file

@ -2891,7 +2891,7 @@ void Bot::updateAimDir () {
void Bot::checkDarkness () { void Bot::checkDarkness () {
// do not check for darkness at the start of the round // do not check for darkness at the start of the round
if (m_spawnTime + 5.0f > game.time () || !graph.exists (m_currentNodeIndex) || cr::fzero (m_path->light)) { if (m_spawnTime + 5.0f > game.time () || !graph.exists (m_currentNodeIndex)) {
return; return;
} }
@ -2900,19 +2900,20 @@ void Bot::checkDarkness () {
return; return;
} }
auto skyColor = illum.getSkyColor (); auto skyColor = illum.getSkyColor ();
auto flashOn = (pev->effects & EF_DIMLIGHT);
if (mp_flashlight.bool_ () && !m_hasNVG) { if (mp_flashlight.bool_ () && !m_hasNVG) {
auto task = Task (); auto task = Task ();
if (!(pev->effects & EF_DIMLIGHT) && task != Task::Camp && task != Task::Attack && m_heardSoundTime + 3.0f < game.time () && m_flashLevel > 30.0f && ((skyColor > 50.0f && m_path->light < 10.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) { if (!flashOn && task != Task::Camp && task != Task::Attack && m_heardSoundTime + 3.0f < game.time () && m_flashLevel > 30 && ((skyColor > 50.0f && m_path->light < 10.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) {
pev->impulse = 100; pev->impulse = 100;
} }
else if ((pev->effects & EF_DIMLIGHT) && (((m_path->light > 15.0f && skyColor > 50.0f) || (m_path->light > 45.0f && skyColor <= 50.0f)) || task == Task::Camp || task == Task::Attack || m_flashLevel <= 0 || m_heardSoundTime + 3.0f >= game.time ())) { else if (flashOn && (((m_path->light > 15.0f && skyColor > 50.0f) || (m_path->light > 45.0f && skyColor <= 50.0f)) || task == Task::Camp || task == Task::Attack || m_flashLevel <= 0 || m_heardSoundTime + 3.0f >= game.time ())) {
pev->impulse = 100; pev->impulse = 100;
} }
} }
else if (m_hasNVG) { else if (m_hasNVG) {
if (pev->effects & EF_DIMLIGHT) { if (flashOn) {
pev->impulse = 100; pev->impulse = 100;
} }
else if (!m_usesNVG && ((skyColor > 50.0f && m_path->light < 15.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) { else if (!m_usesNVG && ((skyColor > 50.0f && m_path->light < 15.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) {

2
src/manager.cpp
View file

@ -1354,7 +1354,7 @@ void Bot::newRound () {
m_currentWeapon = 0; m_currentWeapon = 0;
m_weaponType = 0; m_weaponType = 0;
} }
m_flashLevel = 100.0f; m_flashLevel = 100;
m_checkDarkTime = game.time (); m_checkDarkTime = game.time ();
m_knifeAttackTime = game.time () + rg.get (1.3f, 2.6f); m_knifeAttackTime = game.time () + rg.get (1.3f, 2.6f);

2
src/message.cpp
View file

@ -394,7 +394,7 @@ void MessageDispatcher::netMsgFlashBat () {
if (m_args.length () < min || !m_bot) { if (m_args.length () < min || !m_bot) {
return; return;
} }
m_bot->m_flashLevel = m_args[value].float_; m_bot->m_flashLevel = m_args[value].long_;
} }
MessageDispatcher::MessageDispatcher () { MessageDispatcher::MessageDispatcher () {