From 922a896f0b8c9f463a96255357716b50d8c0deb8 Mon Sep 17 00:00:00 2001 From: ds Date: Sat, 22 Aug 2020 01:38:59 +0300 Subject: [PATCH] fix: bot names fix: minor tweaks to translations. --- cfg/addons/yapb/conf/lang/ru_names.cfg | 170 ++++++++++++------------- inc/control.h | 2 +- src/config.cpp | 2 +- src/control.cpp | 23 ++-- src/graph.cpp | 1 + src/manager.cpp | 2 + 6 files changed, 105 insertions(+), 95 deletions(-) diff --git a/cfg/addons/yapb/conf/lang/ru_names.cfg b/cfg/addons/yapb/conf/lang/ru_names.cfg index 940e47e..c2c965f 100644 --- a/cfg/addons/yapb/conf/lang/ru_names.cfg +++ b/cfg/addons/yapb/conf/lang/ru_names.cfg @@ -85,12 +85,12 @@ caianic Smoky BlooD EnViRoN - +Грига 4yDo B nePb9lx DrSid KickAll sorrow - +на Nikita R. Gering CS_KAPOBA @@ -155,7 +155,7 @@ gram eX1sT RallosZek Sh@doW -_? +Защемили_чтоли? Sorka Ant0n1 Rastaman @@ -163,7 +163,7 @@ Krem Cooler Light SeNCoR - +Смирт Winni_Pyx PiCSeL smile @@ -171,16 +171,16 @@ Steplerok Sour T-Bird Troll - +Эпло DaNTe Nameless SubmeAt Enchanter Varf incognito - +Антон SaoSin - +Добряк sanek GAS1K Sania @@ -203,19 +203,19 @@ N4K3d p4ela DarkHaze M I N C I N G - +ШАНЯ SUPER_BOT - +сушки McLaren $$*KH9I3b_FOBOS*$$ - +сергей tweenis - +Стриж other DemoN Bonebreaker Old_Gamer - +малой sergoid S1ncher DarkAven @@ -231,9 +231,9 @@ Xenon ZubaZuba knifast R1zZ0 - +Родион Frank - +Кирилл XuMka N1CKOLAS WonderWorker @@ -246,7 +246,7 @@ zulich Butterfly Nile BAHO - +Игорь Dakota Phantom UnlimiteD @@ -256,7 +256,7 @@ ultima Explode lolo flashRider - +Крестор Sm@kE7Z roody misha19 @@ -266,11 +266,11 @@ Felix GooDLucK Byr LanceloT - +Водяной ded_mopo3 Nizkii GambiT - +Серёга Cocroac4e Galvanize Cube @@ -309,7 +309,7 @@ pip aRcHie pernamently Gosu - +саша Orchid Mayo Ra1N @@ -331,15 +331,15 @@ kegonni KILLVAN Kaktys pro`gay KozlonoGG - +Артур Walkman Soychiro sheff BAUTOBblU Aleksey -ϸ - - +Пётр +роги +СЕРЫЙ Alex4Life Varf4eg Integra @@ -349,41 +349,41 @@ Roy PoisonFear Russian simple gay blackdragon - +Катя nadinnt - +фура Sanorin NoNik roma Pawka1991 Ermak gaiver - +сергейка krishti pahanbel nomidb - +Олег John Dorian 2gud AzLexx Jamaz -- +Димон-Митяй Antonio. sergo K@CTET coyote2 Metallist lesmus - +валера stas - +ЛАЛАЛА nigushka Boon SHAMAN - +Аляулю Cawka eugen - +коля Cop Slevin avenger @@ -398,12 +398,12 @@ marshe1 miff soytik Bob - +кирман Max Z mZ tirlik 6on9_6_let - +Димоха p5ta4eQ Jutko bai @@ -417,9 +417,9 @@ VATAMAN bigunok Blood nemesis Trend - - KOROL - +Нанот +Александр KOROL +тёма N1NJA _FUCK_ Nasok @@ -449,8 +449,8 @@ Croel RSR dsvd timmy - - +Слесарь +Тимофей Aracurd NeyTy l1yod @@ -506,7 +506,7 @@ spouccifs vladimir47@GTN.RU Nimf Evi1 -anGel[n00b] +anGel[n00b]™ asens GoNziK Shtreex @@ -515,12 +515,12 @@ NoMoneyNoFunny Hom Madlen VladSalat - +Максим pecheneg - +Влад ToP4ok Satarsa -13 +игорь13 dachallar Zaporozhets adurrykal @@ -570,12 +570,12 @@ Neaxtuff Faake VoloV yasha -- - +Анна-Рысь +Дашка Milan - +шура foward - +Екатерина pa3roBoPbI o Hanacax Death Knighnt bygaga Tellliaique @@ -589,14 +589,14 @@ AbrabGarp amazing Friy Denka - - +Юля +Вовка Agent Jekcs anonymouse `adidas Most_Die - +владимир romantik gtn-mazahaka Inf3ktRo @@ -634,7 +634,7 @@ Grishagrisha Mete0 locb headshot_qrt - +Евгений alex-burn vya6797 Put @@ -642,45 +642,45 @@ Chris jastice12 kakaohaltiger gena2077 - +Андрей glof guy purtizzun - +артём daanviol AssassinCCCP name becks Avis Para.doc's Vanes - +жук @ROTOR@ wwwitus zombu zver - +Светлана Jeex AlexJkee m::dL vovan_gtn - +даниил stk shalatonchik - +Прянечег Goldiy buredos NAMREG-GM Jam no 1 konstantin - +Андрей Степанов t3ddy -taburet ! +taburet вов не торт! independent vladlen522 alexs555 jedi_master. swanwhite - +Дашулика Zuxxel cibercom Levsha @@ -692,7 +692,7 @@ PaidService .souL imp0ssible an1maL -09 +Серёга09 free offmagic botmode @@ -702,7 +702,7 @@ oNixs Duke13 Kak Tak !? minolin - +Руслан kEN iKE skill bomj :j @@ -716,7 +716,7 @@ PFG (ICE)-VAmPIR piska fendero4ek - +Руся NvR Mercuriy1983 junior @@ -730,14 +730,14 @@ ochkooo georg d[*]s alex-knut2 - +Дмитрий venchik Dmitriy yAkoVv Lagfaster - - - +Егор +Егорр +алексей flash1965 d::and1 sasha6960 @@ -754,17 +754,17 @@ MyPuK mastersim 4ymavou SE bAs - +умник pillman slava mavjach <3 6yrara 6yrara gadji - +жЫвое No S.E.A.M lalala - +Берт {0,0} Hegdehog 47region @@ -777,7 +777,7 @@ Scept Pan1qa N1le Cherry_Lucifer - +Злюка ZooM test23456 love bus @@ -804,8 +804,8 @@ fanual ??? Marsel??? loginza843 soul <3 medal'ka - - ! +забей +Плохая киса! nZk-ru loginza845 Gro Hakopyan @@ -829,7 +829,7 @@ SPOR loginza860 screamer Vydik -\m/\m/ +МЕТАЛЛЮГА Nicolay.Myasnikov Oma Perfect @@ -861,7 +861,7 @@ qq? meat? qq bb Paolo Di Canio xtpolosatiy g00d1n1 - +Женя Прохоров Midl DEZ'0 loginza903 @@ -904,7 +904,7 @@ Vovik.Pavlov drummer191 e b l o 0 f f MEGAMASTERUS - +Слип Bacek 47 4make nAkeda)) indeus @@ -915,7 +915,7 @@ eGoistoooo FroZy isvalentinis loginza928 - +ПростоВалера <3 /7pocTo egich Frants.Ionnikov @@ -935,9 +935,9 @@ sashkin 170kilogramm FATANNNONERCREW aka. - +Прохоров Евгений hammer1202 -[ A>< ]Groser +[ A<< ]Groser e3dzNNNNNNNNNNN2H nov.Caut^vamp!rka THE BOSS @@ -949,7 +949,7 @@ hammy SASHA@EMAIIIA@ roOlyA NIKEN - +Николай Игрок l1ND lelouch21 v0vEx @@ -960,7 +960,7 @@ ILyA d4M4G3R Blind 4you c0sM14eSk1y - +НАРОМАН kluevsky kot3 Flyag Pavel @@ -1001,12 +1001,12 @@ fczenit ^gR hineman_ilia VRV <3 rA3oK - +Грачев Андрей nike BMW X6 ////M zorak - - +Александр Филатов +Николаич blokh Ilya.Lisenko SupPorTer @@ -1021,7 +1021,7 @@ RUSAsh Eg0r41k RaZOR_ skemm - +Саня bebo221 P1aYneT Aleksandr.Popov diff --git a/inc/control.h b/inc/control.h index 46fc024..74e64d8 100644 --- a/inc/control.h +++ b/inc/control.h @@ -196,7 +196,7 @@ public: // global heloer for sending message to correct channel template inline void BotControl::msg (const char *fmt, Args &&...args) { - auto result = strings.format (fmt, cr::forward (args)...); + auto result = strings.format (conf.translate (fmt), cr::forward (args)...); // if no receiver or many message have to appear, just print to server console if (game.isNullEntity (m_ent) || m_rapidOutput) { diff --git a/src/config.cpp b/src/config.cpp index 0806c66..aa3330f 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -495,7 +495,7 @@ void BotConfig::loadLanguageConfig () { } if (!lang.second.empty () && !lang.first.empty ()) { - m_language[hashLangString (lang.first.trim ().chars ())] = lang.second; + m_language[hashLangString (lang.first.trim ().chars ())] = lang.second.trim (); } } else if (line.startsWith ("[TRANSLATED]") && !temp.empty ()) { diff --git a/src/control.cpp b/src/control.cpp index f841bce..7485ed2 100644 --- a/src/control.cpp +++ b/src/control.cpp @@ -619,10 +619,7 @@ int BotControl::cmdNodeSetRadius () { else { radiusIndex = intValue (index); } - float value = strValue (radius).float_ (); - - graph.setRadius (radiusIndex, value); - msg ("Node %d has been set to radius %.2f.", radiusIndex, value); + graph.setRadius (radiusIndex, strValue (radius).float_ ()); return BotCommandResult::Handled; } @@ -1282,8 +1279,13 @@ int BotControl::menuGraphPage2 (int item) { else { graph.setEditFlag (GraphEdit::Auto); } - msg ("Auto-Add-Nodes %s", graph.hasEditFlag (GraphEdit::Auto) ? "Enabled" : "Disabled"); + if (graph.hasEditFlag (GraphEdit::Auto)) { + msg ("Enabled auto nodes placement."); + } + else { + msg ("Disabled auto nodes placement."); + } showMenu (Menu::NodeMainPage2); break; @@ -1756,8 +1758,13 @@ void BotControl::kickBotByMenu (int page) { return; } + static StringRef headerTitle = conf.translate ("Bots Remove Menu"); + static StringRef notABot = conf.translate ("Not a Bot"); + static StringRef backKey = conf.translate ("Back"); + static StringRef moreKey = conf.translate ("More"); + String menus; - menus.assignf ("\\yBots Remove Menu (%d/4):\\w\n\n", page); + menus.assignf ("\\y%s (%d/4):\\w\n\n", headerTitle, page); int menuKeys = (page == 4) ? cr::bit (9) : (cr::bit (8) | cr::bit (9)); int menuKey = (page - 1) * 8; @@ -1771,10 +1778,10 @@ void BotControl::kickBotByMenu (int page) { menus.appendf ("%1.1d. %s%s\n", i - menuKey + 1, bot->pev->netname.chars (), bot->m_team == Team::CT ? " \\y(CT)\\w" : " \\r(T)\\w"); } else { - menus.appendf ("\\d %1.1d. Not a Bot\\w\n", i - menuKey + 1); + menus.appendf ("\\d %1.1d. %s\\w\n", i - menuKey + 1, notABot); } } - menus.appendf ("\n%s 0. Back", (page == 4) ? "" : " 9. More...\n"); + menus.appendf ("\n%s 0. %s", (page == 4) ? "" : strings.format (" 9. %s...\n", moreKey), backKey); // force to clear current menu showMenu (Menu::None); diff --git a/src/graph.cpp b/src/graph.cpp index acb0b11..7b5255b 100644 --- a/src/graph.cpp +++ b/src/graph.cpp @@ -893,6 +893,7 @@ void BotGraph::setRadius (int index, float radius) { // play "done" sound... game.playSound (m_editor, "common/wpn_hudon.wav"); + ctrl.msg ("Node %d has been set to radius %.2f.", node, radius); } } diff --git a/src/manager.cpp b/src/manager.cpp index 6f6a918..88e4325 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -194,6 +194,8 @@ BotCreateResult BotManager::create (StringRef name, int difficulty, int personal if (name.empty ()) { botName = conf.pickBotName (); + game.print ("PICKED NAME: %s", botName->name); + if (botName) { resultName = botName->name; }