From 851cb2ab9368d1e7b9db771e6cc64483ab4144bd 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: Wed, 19 Apr 2023 06:39:18 +0000 Subject: [PATCH] fix: some typos in cvar descriptions, etc. --- cfg/addons/yapb/conf/lang/de_lang.cfg | 2 +- cfg/addons/yapb/conf/lang/ru_lang.cfg | 6 +++--- cfg/addons/yapb/conf/yapb.cfg | 2 +- inc/yapb.h | 2 +- src/botlib.cpp | 6 +++--- src/combat.cpp | 4 ++-- src/graph.cpp | 4 ++-- src/manager.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cfg/addons/yapb/conf/lang/de_lang.cfg b/cfg/addons/yapb/conf/lang/de_lang.cfg index 9bd170a..cc16734 100644 --- a/cfg/addons/yapb/conf/lang/de_lang.cfg +++ b/cfg/addons/yapb/conf/lang/de_lang.cfg @@ -1852,7 +1852,7 @@ Specifies whether bot should not 'fix' camp directions of camp waypoints when lo Legt fest, ob der Bot beim Laden des alten PWF-Formats die Camping-Richtungen der Camping-Wegpunkte nicht 'beheben' soll. [ORIGINAL] -Specifies the URL from bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. +Specifies the URL from which bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. [TRANSLATED] Gibt die URL an, von der Bots den Graph herunterladen können, falls eine lokale URL fehlt. Leer lassen, wenn keine Downloads benötigt werden. diff --git a/cfg/addons/yapb/conf/lang/ru_lang.cfg b/cfg/addons/yapb/conf/lang/ru_lang.cfg index 5f65c81..c7bfc3f 100644 --- a/cfg/addons/yapb/conf/lang/ru_lang.cfg +++ b/cfg/addons/yapb/conf/lang/ru_lang.cfg @@ -2060,13 +2060,13 @@ Specifies whether bot should not 'fix' camp directions of camp waypoints when lo Определяет, должен ли бот 'исправлять' направления кемперских вэйпоинтов при загрузке старого формата PWF. [ORIGINAL] -Specifies the URL from bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. +Specifies the URL from which bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. [TRANSLATED] Указывает URL-адрес для скачивания graph файлов если они отсутствуют. Задайте пустое значение, если вы не хотите их скачивать. [ORIGINAL] -Specifies the URL to bots will try to upload te graph file to database. +Specifies the URL to which bots will try to upload the graph file to database. [TRANSLATED] Указывает URL-адрес, по которому боты будут пытаться загружать graph файл в базу данных. @@ -2180,7 +2180,7 @@ Enables each bot balances own difficulty based kd-ratio of team. Позволяет каждому боту уравновесить собственную сложность на основе коэффициента убийств/смертей команды. [ORIGINAL] -Interval in which bots will balance theird difficulty. +Interval in which bots will balance their difficulty. [TRANSLATED] Интервал, в котором боты будут балансировать свою сложность. diff --git a/cfg/addons/yapb/conf/yapb.cfg b/cfg/addons/yapb/conf/yapb.cfg index 19682da..1f97407 100644 --- a/cfg/addons/yapb/conf/yapb.cfg +++ b/cfg/addons/yapb/conf/yapb.cfg @@ -325,7 +325,7 @@ yb_breakable_health_limit "500.0" yb_graph_fixcamp "0" // -// Specifies the URL from bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. +// Specifies the URL from which bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. // --- // Default: "yapb.jeefo.net" // diff --git a/inc/yapb.h b/inc/yapb.h index fe1d74e..eaf1885 100644 --- a/inc/yapb.h +++ b/inc/yapb.h @@ -1074,7 +1074,7 @@ public: void pushMsgQueue (int message); void prepareChatMessage (StringRef message); void checkForChat (); - void showChaterIcon (bool show, bool disconnect = false); + void showChatterIcon (bool show, bool disconnect = false); void clearSearchNodes (); void checkBreakable (edict_t *touch); void checkBreakablesAround (); diff --git a/src/botlib.cpp b/src/botlib.cpp index 0875015..e0886ca 100644 --- a/src/botlib.cpp +++ b/src/botlib.cpp @@ -770,7 +770,7 @@ Vector Bot::getCampDirection (const Vector &dest) { return nullptr; } -void Bot::showChaterIcon (bool show, bool disconnect) { +void Bot::showChatterIcon (bool show, bool disconnect) { // this function depending on show boolen, shows/remove chatter, icon, on the head of bot. if (!game.is (GameFlags::HasBotVoice) || cv_radio_mode.int_ () != 2) { @@ -814,7 +814,7 @@ void Bot::instantChatter (int type) { const auto &painSound = conf.pickRandomFromChatterBank (Chatter::DiePain); if (m_notKilled) { - showChaterIcon (true); + showChatterIcon (true); } MessageWriter msg; int ownIndex = index (); @@ -2811,7 +2811,7 @@ void Bot::frame () { checkBreakablesAround (); if (game.is (GameFlags::HasBotVoice)) { - showChaterIcon (false); // end voice feedback + showChatterIcon (false); // end voice feedback } // kick the bot if stay time is over, the quota maintain will add new bot for us later diff --git a/src/combat.cpp b/src/combat.cpp index a0e9aa1..d8186c7 100644 --- a/src/combat.cpp +++ b/src/combat.cpp @@ -886,9 +886,9 @@ void Bot::selectWeapons (float distance, int index, int id, int choosen) { if (distance < kSprayDistance || m_blindTime > game.time () || usesKnife ()) { if (id == Weapon::Knife) { if (distance < 64.0f) { - const auto primaryAtackChance = (m_oldButtons & IN_ATTACK2) ? 80 : 40; + const auto primaryAttackChance = (m_oldButtons & IN_ATTACK2) ? 80 : 40; - if (rg.chance (primaryAtackChance) || hasShield ()) { + if (rg.chance (primaryAttackChance) || hasShield ()) { pev->button |= IN_ATTACK; // use primary attack } else { diff --git a/src/graph.cpp b/src/graph.cpp index 159db4f..c293d4b 100644 --- a/src/graph.cpp +++ b/src/graph.cpp @@ -8,8 +8,8 @@ #include ConVar cv_graph_fixcamp ("yb_graph_fixcamp", "0", "Specifies whether bot should not 'fix' camp directions of camp waypoints when loading old PWF format."); -ConVar cv_graph_url ("yb_graph_url", product.download.chars (), "Specifies the URL from bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed.", false, 0.0f, 0.0f); -ConVar cv_graph_url_upload ("yb_graph_url_upload", "http://yapb.jeefo.net/upload", "Specifies the URL to bots will try to upload te graph file to database.", false, 0.0f, 0.0f); +ConVar cv_graph_url ("yb_graph_url", product.download.chars (), "Specifies the URL from which bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed.", false, 0.0f, 0.0f); +ConVar cv_graph_url_upload ("yb_graph_url_upload", "http://yapb.jeefo.net/upload", "Specifies the URL to which bots will try to upload the graph file to database.", false, 0.0f, 0.0f); ConVar cv_graph_auto_save_count ("yb_graph_auto_save_count", "15", "Every N graph nodes placed on map, the graph will be saved automatically (without checks).", true, 0.0f, kMaxNodes); ConVar cv_graph_draw_distance ("yb_graph_draw_distance", "400", "Maximum distance to draw graph nodes from editor viewport.", true, 64.0f, 3072.0f); diff --git a/src/manager.cpp b/src/manager.cpp index f9a0d2c..8b16a56 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -26,7 +26,7 @@ ConVar cv_difficulty ("yb_difficulty", "3", "All bots difficulty level. Changing ConVar cv_difficulty_min ("yb_difficulty_min", "-1", "Lower bound of random difficulty on bot creation. Only affects newly created bots. -1 means yb_difficulty only used.", true, -1.0f, 4.0f); ConVar cv_difficulty_max ("yb_difficulty_max", "-1", "Upper bound of random difficulty on bot creation. Only affects newly created bots. -1 means yb_difficulty only used.", true, -1.0f, 4.0f); ConVar cv_difficulty_auto ("yb_difficulty_auto", "0", "Enables each bot balances own difficulty based kd-ratio of team.", true, 0.0f, 1.0f); -ConVar cv_difficulty_auto_balance_interval ("yb_difficulty_auto_balance_interval", "30", "Interval in which bots will balance theird difficulty.", true, 30.0f, 240.0f); +ConVar cv_difficulty_auto_balance_interval ("yb_difficulty_auto_balance_interval", "30", "Interval in which bots will balance their difficulty.", true, 30.0f, 240.0f); ConVar cv_show_avatars ("yb_show_avatars", "1", "Enables or disables displaying bot avatars in front of their names in scoreboard. Note, that is currently you can see only avatars of your steam friends."); ConVar cv_show_latency ("yb_show_latency", "2", "Enables latency display in scoreboard.\nAllowed values: '0', '1', '2'.\nIf '0', there is nothing displayed.\nIf '1', there is a 'BOT' is displayed.\nIf '2' fake ping is displayed.", true, 0.0f, 2.0f); @@ -1506,7 +1506,7 @@ void Bot::kick () { } void Bot::markStale () { - showChaterIcon (false, true); + showChatterIcon (false, true); // clear the bot name conf.clearUsedName (this);