diff --git a/cfg/addons/yapb/conf/chatter.cfg b/cfg/addons/yapb/conf/chatter.cfg index 1bb2639..f4cf6e5 100644 --- a/cfg/addons/yapb/conf/chatter.cfg +++ b/cfg/addons/yapb/conf/chatter.cfg @@ -44,7 +44,7 @@ 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_GuardDroppedC4 = bombsite, bombsite2 +Event Chatter_GuardingPlantedC4 = bombsite_secure, bombsite_under_control Event Chatter_Camp = im_waiting_here Event Chatter_PlantingC4 = planting_the_bomb, planting Event Chatter_DefusingC4 = defusing, defusing_bomb, defusing_bomb_now @@ -77,7 +77,7 @@ Event Chatter_BarelyDefused = i_wasnt_worried_for_a_minute, that_was_a_close_one Event Chatter_NiceshotCommander = good_one_sir, good_one_sir2, nice_shot_sir, nice_one_sir Event Chatter_NiceshotPall = good_one, good_one2, nice_shot, nice_shot2, good_shot, good_shot2, nice, nice2, very_nice Event Chatter_GoingToGuardHostages = camping_hostages, im_going_to_camp_the_hostages, im_going_to_guard_the_hostages, im_going_to_guard_the_hostages2 -Event Chatter_GoingToGuardDoppedBomb = im_going_to_guard_the_bomb, im_going_to_guard_the_bomb2, im_going_to_keep_an_eye_on_the_bomb, im_going_to_watch_the_bomb +Event Chatter_GoingToGuardDroppedBomb = im_going_to_guard_the_bomb, im_going_to_guard_the_bomb2, im_going_to_keep_an_eye_on_the_bomb, im_going_to_watch_the_bomb Event Chatter_OnMyWay = on_my_way, on_my_way2, im_coming, hang_on_im_coming, be_right_there Event Chatter_LeadOnSir = lead_on_sir, lead_the_way_sir, lead_the_way, ok_sir_lets_go, lead_on_commander, lead_the_way_commander, ok_cmdr_lets_go Event Chatter_Pinned_Down = they_got_me_pinned_down_here, im_pinned_down diff --git a/inc/constant.h b/inc/constant.h index c768929..8953aa9 100644 --- a/inc/constant.h +++ b/inc/constant.h @@ -183,7 +183,7 @@ CR_DECLARE_SCOPED_ENUM (Chatter, TeamAttack, TeamKill, ReportingIn, - GuardingDroppedC4, + GuardingPlantedC4, Camping, PlantingBomb, DefusingBomb, diff --git a/src/botlib.cpp b/src/botlib.cpp index 0610c7b..7f4e94c 100644 --- a/src/botlib.cpp +++ b/src/botlib.cpp @@ -2178,7 +2178,7 @@ void Bot::startTask (Task id, float desire, int data, float time, bool resume) { if (rg.chance (25) && tid == Task::Camp) { if (game.mapIs (MapFlags::Demolition) && bots.isBombPlanted ()) { - pushChatterMessage (Chatter::GuardingDroppedC4); + pushChatterMessage (Chatter::GuardingPlantedC4); } else { pushChatterMessage (Chatter::GoingToCamp); @@ -2661,7 +2661,7 @@ void Bot::checkRadioQueue () { case Task::Camp: if (rg.chance (40)) { if (bots.isBombPlanted () && m_team == Team::Terrorist) { - pushChatterMessage (Chatter::GuardingDroppedC4); + pushChatterMessage (Chatter::GuardingPlantedC4); } else if (m_inEscapeZone && m_team == Team::CT) { pushChatterMessage (Chatter::GuardingEscapeZone); diff --git a/src/config.cpp b/src/config.cpp index c102351..a5ba0a8 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -292,7 +292,7 @@ void BotConfig::loadChatterConfig () { { "Chatter_VIPSpotted", Chatter::VIPSpotted, 5.3f }, { "Chatter_FriendlyFire", Chatter::FriendlyFire, 2.1f }, { "Chatter_GotBlinded", Chatter::Blind, 12.0f }, - { "Chatter_GuardDroppedC4", Chatter::GuardingDroppedC4, 3.0f }, + { "Chatter_GuardingPlantedC4", Chatter::GuardingPlantedC4, 3.0f }, { "Chatter_DefusingC4", Chatter::DefusingBomb, 3.0f }, { "Chatter_FoundC4", Chatter::FoundC4, 5.5f }, { "Chatter_ScaredEmotion", Chatter::ScaredEmotion, 6.1f }, @@ -304,7 +304,7 @@ void BotConfig::loadChatterConfig () { { "Chatter_ThreeEnemiesLeft", Chatter::ThreeEnemiesLeft, 12.5f }, { "Chatter_NiceshotPall", Chatter::NiceShotPall, 2.0f }, { "Chatter_GoingToGuardHostages", Chatter::GoingToGuardHostages, 3.0f }, - { "Chatter_GoingToGuardDoppedBomb", Chatter::GoingToGuardDroppedC4, 6.0f }, + { "Chatter_GoingToGuardDroppedBomb", Chatter::GoingToGuardDroppedC4, 6.0f }, { "Chatter_OnMyWay", Chatter::OnMyWay, 1.5f }, { "Chatter_LeadOnSir", Chatter::LeadOnSir, 5.0f }, { "Chatter_Pinned_Down", Chatter::PinnedDown, 5.0f },