From 4be244862644d7aa65322f7c790e2954edb68b9f 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, 7 Feb 2023 10:19:40 +0000 Subject: [PATCH 1/2] add: 5th playerclass for condition zero --- inc/yapb.h | 2 ++ src/control.cpp | 30 ++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/inc/yapb.h b/inc/yapb.h index 2e4c371..030fd94 100644 --- a/inc/yapb.h +++ b/inc/yapb.h @@ -60,6 +60,8 @@ CR_DECLARE_SCOPED_ENUM (Menu, TeamSelect, TerroristSelect, CTSelect, + TerroristSelectCZ, + CTSelectCZ, Commands, NodeMainPage1, NodeMainPage2, diff --git a/src/control.cpp b/src/control.cpp index 4848f8e..552a6f5 100644 --- a/src/control.cpp +++ b/src/control.cpp @@ -1123,6 +1123,9 @@ int BotControl::menuTeamSelect (int item) { m_interMenuData[2] = item; bots.addbot ("", m_interMenuData[0], m_interMenuData[3], m_interMenuData[1], m_interMenuData[2], true); } + else if (game.is (GameFlags::ConditionZero)) { + showMenu (item == 1 ? Menu::TerroristSelectCZ : Menu::CTSelectCZ); + } else { showMenu (item == 1 ? Menu::TerroristSelect : Menu::CTSelect); } @@ -1144,6 +1147,7 @@ int BotControl::menuClassSelect (int item) { case 3: case 4: case 5: + case 6: m_interMenuData[2] = item; bots.addbot ("", m_interMenuData[0], m_interMenuData[3], m_interMenuData[1], m_interMenuData[2], true); break; @@ -2217,6 +2221,32 @@ void BotControl::createMenus () { "0. Exit", &BotControl::menuClassSelect); + // condition zero terrorist model select menu + m_menus.emplace ( + Menu::TerroristSelectCZ, keys (6), + "\\ySelect an appearance\\w\n\n" + "1. Phoenix Connexion\n" + "2. L337 Krew\n" + "3. Arctic Avengers\n" + "4. Guerilla Warfare\n" + "5. Midwest Militia\n\n" + "6. Auto-select\n\n" + "0. Exit", + &BotControl::menuClassSelect); + + // condition zero counter-terrorist model select menu + m_menus.emplace ( + Menu::CTSelectCZ, keys (6), + "\\ySelect an appearance\\w\n\n" + "1. Seal Team 6 (DEVGRU)\n" + "2. German GSG-9\n" + "3. UK SAS\n" + "4. French GIGN\n" + "5. Russian Spetsnaz\n\n" + "6. Auto-select\n\n" + "0. Exit", + &BotControl::menuClassSelect); + // command menu m_menus.emplace ( Menu::Commands, keys (4), From 6b2098dcfd7b72486a7ec7f052ceb2c4ef4d5e87 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, 8 Feb 2023 17:39:05 +0600 Subject: [PATCH 2/2] cfg: ru_lang.cfg: translated new menus --- cfg/addons/yapb/conf/lang/ru_lang.cfg | 62 ++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/cfg/addons/yapb/conf/lang/ru_lang.cfg b/cfg/addons/yapb/conf/lang/ru_lang.cfg index febc1fe..89c1687 100644 --- a/cfg/addons/yapb/conf/lang/ru_lang.cfg +++ b/cfg/addons/yapb/conf/lang/ru_lang.cfg @@ -18,7 +18,6 @@ 0. Exit - [TRANSLATED] \yГлавное меню\w @@ -30,7 +29,6 @@ 0. Выход - [ORIGINAL] \yBots Features\w @@ -55,7 +53,6 @@ 0. Выход - [ORIGINAL] \yBots Control Menu\w @@ -108,7 +105,6 @@ 0. Выход - [ORIGINAL] \yBots Personality\w @@ -129,7 +125,6 @@ 0. Выход - [ORIGINAL] \yBots Difficulty Level\w @@ -152,7 +147,6 @@ 0. Выход - [ORIGINAL] \ySelect a team\w @@ -173,7 +167,6 @@ 0. Выход - [ORIGINAL] \ySelect an appearance\w 1. Phoenix Connexion @@ -197,7 +190,6 @@ 0. Выход - [ORIGINAL] \ySelect an appearance\w @@ -222,6 +214,56 @@ 0. Выход +[ORIGINAL] +\ySelect an appearance\w +1. Phoenix Connexion +2. L337 Krew +3. Arctic Avengers +4. Guerilla Warfare +5. Midwest Militia + +6. Auto-select + +0. Exit + +[TRANSLATED] +\yВыбор класса\w + +1. Подразделение Феникс +2. Элитное подразделение +3. Арктические мстители +4. Партизаны +5. Ополчение среднего запада + +6. Авто-выбор + +0. Выход + +[ORIGINAL] +\ySelect an appearance\w + +1. Seal Team 6 (DEVGRU) +2. German GSG-9 +3. UK SAS +4. French GIGN +5. Russian Spetsnaz + +6. Auto-select + +0. Exit + +[TRANSLATED] +\yВыбор класса\w + +1. Seal Team 6 (DEVGRU) +2. Немецкий GSG-9 +3. Великобританский SAS +4. Французский GIGN +5. Русский Спецназ + +6. Авто-выбор + +0. Выход [ORIGINAL] \yWaypoint Operations (Page 1)\w @@ -255,7 +297,6 @@ 0. Выход - [ORIGINAL] \yWaypoint Operations (Page 2)\w @@ -288,7 +329,6 @@ 0. Выход - [ORIGINAL] \yWaypoint Radius\w @@ -1325,7 +1365,7 @@ Could not delete node %d. Graph seems to be OK. [TRANSLATED] -Графы в порядке. +Граф в порядке. [ORIGINAL] Before calling for 'next' / 'end' camp point, you should hit 'begin'.