From b0e98d0e3ff3ba93d184b4a2bd0552a8124435ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?= =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=BE=D0=B2?= <22411953+Vladislav4KZ@users.noreply.github.com> Date: Tue, 30 Apr 2024 16:19:10 +0000 Subject: [PATCH] fix: report that a bot has heard an enemy --- cfg/addons/yapb/conf/chatter.cfg | 1 - inc/constant.h | 1 - src/botlib.cpp | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cfg/addons/yapb/conf/chatter.cfg b/cfg/addons/yapb/conf/chatter.cfg index f4cf6e5..0c976a2 100644 --- a/cfg/addons/yapb/conf/chatter.cfg +++ b/cfg/addons/yapb/conf/chatter.cfg @@ -41,7 +41,6 @@ Event Chatter_GotBlinded = ive_been_blinded, my_eyes, i_cant_see, im_blind Event Chatter_GoingToPlantBomb = im_gonna_go_plant, im_gonna_go_plant_the_bomb Event Chatter_RescuingHostages = the_hostages_are_with_me, taking_the_hostages_to_safety, ive_got_the_hostages, i_have_the_hostages Event Chatter_GoingToCamp = im_going_to_camp -Event Chatter_HearSomething = hang_on_i_heard_something, i_hear_something, i_hear_them, i_heard_them, i_heard_something_over_there Event Chatter_TeamKill = what_happened, noo, oh_my_god, oh_man, oh_no_sad, what_have_you_done Event Chatter_ReportingIn = reporting_in Event Chatter_GuardingPlantedC4 = bombsite_secure, bombsite_under_control diff --git a/inc/constant.h b/inc/constant.h index 8953aa9..57df4e7 100644 --- a/inc/constant.h +++ b/inc/constant.h @@ -179,7 +179,6 @@ CR_DECLARE_SCOPED_ENUM (Chatter, GoingToPlantBomb, RescuingHostages, GoingToCamp, - HeardNoise, TeamAttack, TeamKill, ReportingIn, diff --git a/src/botlib.cpp b/src/botlib.cpp index 7f4e94c..96f31b0 100644 --- a/src/botlib.cpp +++ b/src/botlib.cpp @@ -2643,8 +2643,8 @@ void Bot::checkRadioQueue () { else if ((path.flags & NodeFlag::Camp) && rg.chance (75)) { pushChatterMessage (Chatter::GoingToCamp); } - else { - pushChatterMessage (Chatter::HeardNoise); + else if (m_states & Sense::HearingEnemy) { + pushChatterMessage (Chatter::HeardTheEnemy); } } else if (rg.chance (30)) {