From 80890c25e131fa272c77d14d520022d4b529f4ce Mon Sep 17 00:00:00 2001 From: dmitry Date: Tue, 4 Jan 2022 00:10:36 +0300 Subject: [PATCH] fix: graph urls update: yapb.cfg with latest cvars --- cfg/addons/yapb/conf/avatars.cfg | 4 +- cfg/addons/yapb/conf/chatter.cfg | 4 +- cfg/addons/yapb/conf/custom.cfg | 2 +- cfg/addons/yapb/conf/difficulty.cfg | 4 +- cfg/addons/yapb/conf/lang/chs_lang.cfg | 4 +- cfg/addons/yapb/conf/lang/de_chat.cfg | 4 +- cfg/addons/yapb/conf/lang/de_lang.cfg | 4 +- cfg/addons/yapb/conf/lang/en_chat.cfg | 4 +- cfg/addons/yapb/conf/lang/en_names.cfg | 4 +- cfg/addons/yapb/conf/lang/ru_chat.cfg | 4 +- cfg/addons/yapb/conf/lang/ru_lang.cfg | 4 +- cfg/addons/yapb/conf/lang/ru_names.cfg | 4 +- cfg/addons/yapb/conf/logos.cfg | 4 +- cfg/addons/yapb/conf/weapon.cfg | 4 +- cfg/addons/yapb/conf/yapb.cfg | 128 ++++++++++++++++++------- inc/product.h | 2 +- src/control.cpp | 2 +- vc/yapb.vcxproj | 2 +- 18 files changed, 126 insertions(+), 62 deletions(-) diff --git a/cfg/addons/yapb/conf/avatars.cfg b/cfg/addons/yapb/conf/avatars.cfg index 67650b8..6775cbb 100644 --- a/cfg/addons/yapb/conf/avatars.cfg +++ b/cfg/addons/yapb/conf/avatars.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: avatars.cfg ; ; This is a list of 64-bit Steam IDs that are used to display avatar for diff --git a/cfg/addons/yapb/conf/chatter.cfg b/cfg/addons/yapb/conf/chatter.cfg index 91e09d3..e1b0a1a 100644 --- a/cfg/addons/yapb/conf/chatter.cfg +++ b/cfg/addons/yapb/conf/chatter.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: chatter.cfg ; ; Configuration file contains chatter definitions for bots. diff --git a/cfg/addons/yapb/conf/custom.cfg b/cfg/addons/yapb/conf/custom.cfg index 5893135..6c42808 100644 --- a/cfg/addons/yapb/conf/custom.cfg +++ b/cfg/addons/yapb/conf/custom.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB ; @version: 4.2 -; @author: YaPB Development Team +; @author: YaPB Project ; @filename: yapb.cfg ; ; Custom configuration file, allow to change some hardcoded stuff in bot code. diff --git a/cfg/addons/yapb/conf/difficulty.cfg b/cfg/addons/yapb/conf/difficulty.cfg index 0e6ab0f..4dc489b 100644 --- a/cfg/addons/yapb/conf/difficulty.cfg +++ b/cfg/addons/yapb/conf/difficulty.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: difficulty.cfg ; ; Configuration file contains some difficulty definitions for bots diff --git a/cfg/addons/yapb/conf/lang/chs_lang.cfg b/cfg/addons/yapb/conf/lang/chs_lang.cfg index 58561d1..06ca5c9 100644 --- a/cfg/addons/yapb/conf/lang/chs_lang.cfg +++ b/cfg/addons/yapb/conf/lang/chs_lang.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: chs_lang.cfg ; ; Configuration file contains Simplified Chinese translation for bots menus and messages. diff --git a/cfg/addons/yapb/conf/lang/de_chat.cfg b/cfg/addons/yapb/conf/lang/de_chat.cfg index 436969e..9c64861 100644 --- a/cfg/addons/yapb/conf/lang/de_chat.cfg +++ b/cfg/addons/yapb/conf/lang/de_chat.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: de_chat.cfg ; ; Configuration file contains German translation for bot chats. diff --git a/cfg/addons/yapb/conf/lang/de_lang.cfg b/cfg/addons/yapb/conf/lang/de_lang.cfg index a7b84c4..ffe5778 100644 --- a/cfg/addons/yapb/conf/lang/de_lang.cfg +++ b/cfg/addons/yapb/conf/lang/de_lang.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: de_lang.cfg ; ; Configuration file contains German translation for bots menus and messages. diff --git a/cfg/addons/yapb/conf/lang/en_chat.cfg b/cfg/addons/yapb/conf/lang/en_chat.cfg index fa67576..4f59203 100644 --- a/cfg/addons/yapb/conf/lang/en_chat.cfg +++ b/cfg/addons/yapb/conf/lang/en_chat.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: en_chat.cfg ; ; Configuration file contains English translation for bot chats. diff --git a/cfg/addons/yapb/conf/lang/en_names.cfg b/cfg/addons/yapb/conf/lang/en_names.cfg index 089eb54..b93bea6 100644 --- a/cfg/addons/yapb/conf/lang/en_names.cfg +++ b/cfg/addons/yapb/conf/lang/en_names.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: en_names.cfg ; ; Configuration file contains English bot names. diff --git a/cfg/addons/yapb/conf/lang/ru_chat.cfg b/cfg/addons/yapb/conf/lang/ru_chat.cfg index 552e556..cffd866 100644 --- a/cfg/addons/yapb/conf/lang/ru_chat.cfg +++ b/cfg/addons/yapb/conf/lang/ru_chat.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: ru_chat.cfg ; ; Configuration file contains Russian translation for bots chats. diff --git a/cfg/addons/yapb/conf/lang/ru_lang.cfg b/cfg/addons/yapb/conf/lang/ru_lang.cfg index 6f78db6..9fc9436 100644 --- a/cfg/addons/yapb/conf/lang/ru_lang.cfg +++ b/cfg/addons/yapb/conf/lang/ru_lang.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: ru_lang.cfg ; ; Configuration file contains Russian translation for bots menus and messages. diff --git a/cfg/addons/yapb/conf/lang/ru_names.cfg b/cfg/addons/yapb/conf/lang/ru_names.cfg index c2c965f..d330882 100644 --- a/cfg/addons/yapb/conf/lang/ru_names.cfg +++ b/cfg/addons/yapb/conf/lang/ru_names.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: ru_names.cfg ; ; Configuration file contains Russian bot names. diff --git a/cfg/addons/yapb/conf/logos.cfg b/cfg/addons/yapb/conf/logos.cfg index 4e56f55..fb3b9f3 100644 --- a/cfg/addons/yapb/conf/logos.cfg +++ b/cfg/addons/yapb/conf/logos.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: logos.cfg ; ; Configuration file contains logos definitions for bots. diff --git a/cfg/addons/yapb/conf/weapon.cfg b/cfg/addons/yapb/conf/weapon.cfg index ec81185..dcd2949 100644 --- a/cfg/addons/yapb/conf/weapon.cfg +++ b/cfg/addons/yapb/conf/weapon.cfg @@ -1,7 +1,7 @@ ; ; @package: YaPB -; @version: 4.0 -; @author: YaPB Development Team +; @version: 4.2 +; @author: YaPB Project ; @filename: weapon.cfg ; ; Configuration file contains weapon preferences for bots. diff --git a/cfg/addons/yapb/conf/yapb.cfg b/cfg/addons/yapb/conf/yapb.cfg index d7dbd1e..ad3cfa2 100644 --- a/cfg/addons/yapb/conf/yapb.cfg +++ b/cfg/addons/yapb/conf/yapb.cfg @@ -1,7 +1,7 @@ // // @package: YaPB -// @version: 4.0 -// @author: YaPB Development Team +// @version: 4.2 +// @author: YaPB Project // @filename: yapb.cfg // // YaPB main configuration file. Can be executed via "exec" command. @@ -22,7 +22,7 @@ yb_debug "0" yb_debug_goal "-1" // -// Specifies the percent of bots, than can follow leader on each round start. +// Specifies the percent of bots, that can follow leader on each round start. // --- // Default: "20", Min: "0", Max: "100" // @@ -31,7 +31,7 @@ yb_user_follow_percent "20" // // Specifies how many bots can follow a single user. // --- -// Default: "1", Min: "0", Max: "16" +// Default: "1", Min: "0", Max: "8" // yb_user_max_followers "1" @@ -68,12 +68,26 @@ yb_economics_rounds "1" yb_walking_allowed "1" // -// Allows or disallows bots to camp. Doesn't affects bomb/hostage defending tasks +// Allows or disallows bots to camp. Doesn't affects bomb/hostage defending tasks. // --- // Default: "1", Min: "0", Max: "1" // yb_camping_allowed "1" +// +// Lower bound of time from which time for camping is calculated +// --- +// Default: "15.0", Min: "5.0", Max: "90.0" +// +yb_camping_time_min "15.0" + +// +// Upper bound of time until which time for camping is calculated +// --- +// Default: "45.0", Min: "15.0", Max: "120.0" +// +yb_camping_time_max "45.0" + // // Allows or disallows bots to take revenge of teamkillers / team attacks. // --- @@ -82,14 +96,14 @@ yb_camping_allowed "1" yb_tkpunish "1" // -// If enabled the bots think function is disabled, so bots will not move anywhere from their spawn spots. +// If enabled, the bots think function is disabled, so bots will not move anywhere from their spawn spots. // --- // Default: "0", Min: "0", Max: "1" // yb_freeze_bots "0" // -// Allows or disallows the use of spay paints. +// Allows or disallows the use of spray paints. // --- // Default: "1", Min: "0", Max: "1" // @@ -109,6 +123,13 @@ yb_botbuy "1" // yb_destroy_breakables_around "1" +// +// The radius on which bot searches world for new objects, items, and weapons. +// --- +// Default: "450.0", Min: "64.0", Max: "1024.0" +// +yb_object_pickup_radius "450.0" + // // Specifies the paths for the bot chatter sound files. // --- @@ -123,6 +144,34 @@ yb_chatter_path "sound/radio/bot" // yb_restricted_weapons "" +// +// Allows or disallows bots to attack monsters. +// --- +// Default: "0", Min: "0", Max: "1" +// +yb_attack_monsters "0" + +// +// Allows or disallows bots to pickup custom items. +// --- +// Default: "0", Min: "0", Max: "1" +// +yb_pickup_custom_items "0" + +// +// Allows or disallows bots to do map objectives, i.e. plant/defuse bombs, and saves hostages. +// --- +// Default: "0", Min: "0", Max: "1" +// +yb_ignore_objectives "0" + +// +// Allows or disallows the ability for random knife attacks when bot is rushing and no enemy is nearby. +// --- +// Default: "1", Min: "0", Max: "1" +// +yb_random_knife_attacks "1" + // // Enables or disables bots chat functionality. // --- @@ -130,10 +179,17 @@ yb_restricted_weapons "" // yb_chat "1" +// +// Bot chances to send random dead chat when killed. +// --- +// Default: "30", Min: "0", Max: "100" +// +yb_chat_percent "30" + // // Specifies whether bots able to fire at enemies behind the wall, if they hearing or suspecting them. // --- -// Default: "2", Min: "0", Max: "3" +// Default: "2", Min: "0", Max: "2" // yb_shoots_thru_walls "2" @@ -166,7 +222,7 @@ yb_check_enemy_invincibility "0" yb_stab_close_enemies "1" // -// Bind's specified key for opening bots menu. +// Binds specified key for opening bots menu. // --- // Default: "=" // @@ -187,7 +243,7 @@ yb_ignore_cvars_on_changelevel "yb_quota,yb_autovacate" yb_display_menu_text "1" // -// The value (password) for the setinfo key, if user set's correct password, he's gains access to bot commands and menus. +// The value (password) for the setinfo key, if user sets correct password, he's gains access to bot commands and menus. // --- // Default: "" // @@ -205,8 +261,8 @@ yb_password_key "_ybpw" // Allowed values: '0', '1', '2', '3'. // If '0', CSDM / FFA mode is auto-detected. // If '1', CSDM mode is enabled, but FFA is disabled. -// If '2' CSDM and FFA mode is enabled. -// If '3' CSDM and FFA mode is disabled. +// If '2', CSDM and FFA mode is enabled. +// If '3', CSDM and FFA mode is disabled. // --- // Default: "0", Min: "0", Max: "3" // @@ -222,9 +278,9 @@ yb_graph_fixcamp "1" // // Specifies the URL from bots will be able to download graph in case of missing local one. Set to empty, if no downloads needed. // --- -// Default: "yapb.ru" +// Default: "yapb.jeefo.net" // -yb_graph_url "graph.yapb.ru" +yb_graph_url "yapb.jeefo.net" // // Kick bots to automatically make room for human players. @@ -260,9 +316,9 @@ yb_quota_match "0" // // Specifies how many times per second bot code will run. // --- -// Default: "30.0", Min: "30.0", Max: "90.0" +// Default: "26.0", Min: "24.0", Max: "90.0" // -yb_think_fps "30.0" +yb_think_fps "26.0" // // Specifies amount of time in seconds when bots will be killed if no humans left alive. @@ -328,7 +384,7 @@ yb_difficulty_max "-1" yb_difficulty_auto "0" // -// Enables or disabels displaying bot avatars in front of their names in scoreboard. Note, that is currently you can see only avatars of your steam friends. +// 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. // --- // Default: "1", Min: "0", Max: "1" // @@ -345,6 +401,13 @@ yb_show_avatars "1" // yb_show_latency "2" +// +// Allows to save bot names upon changelevel, so bot names will be the same after a map change +// --- +// Default: "1", Min: "0", Max: "1" +// +yb_save_bots_names "1" + // // Specifies the bots wanted skin for Terrorist team. // --- @@ -390,9 +453,23 @@ yb_whose_your_daddy "0" // // Selects the heuristic function mode. For debug purposes only. // --- -// Default: "0", Min: "0", Max: "4" +// Default: "4", Min: "0", Max: "4" // -yb_debug_heuristic_type "0" +yb_path_heuristic_mode "4" + +// +// Lower bound of danger factor that used to add additional danger to path based on practice. +// --- +// Default: "200", Min: "100", Max: "2400" +// +yb_path_danger_factor_min "200" + +// +// Upper bound of danger factor that used to add additional danger to path based on practice. +// --- +// Default: "400", Min: "200", Max: "4800" +// +yb_path_danger_factor_max "400" // // Enables or disables showing welcome message to host entity on game start. @@ -408,16 +485,3 @@ yb_display_welcome_text "1" // yb_enable_query_hook "0" -// -// Allows or disallows bots to attack monsters. -// --- -// Default: "0", Min: "0", Max: "1" -// -yb_attack_monsters "0" - -// -// Allows or disallows bots to pickup custom items. -// --- -// Default: "0", Min: "0", Max: "1" -// -yb_pickup_custom_items "0" diff --git a/inc/product.h b/inc/product.h index 3066618..075d484 100644 --- a/inc/product.h +++ b/inc/product.h @@ -33,7 +33,7 @@ public: StringRef author { "YaPB Project" }; StringRef email { "yapb@jeefo.net" }; StringRef url { "https://yapb.jeefo.net/" }; - StringRef download { "graph.yapb.ru" }; + StringRef download { "yapb.jeefo.net" }; StringRef folder { "yapb" }; StringRef logtag { "YB" }; StringRef dtime { __DATE__ " " __TIME__ }; diff --git a/src/control.cpp b/src/control.cpp index 2f08ae6..fd26621 100644 --- a/src/control.cpp +++ b/src/control.cpp @@ -766,7 +766,7 @@ int BotControl::cmdNodeUpload () { String mapName = game.getMapName (); // try to upload the file - if (http.uploadFile ("http://yapb.ru/upload", strings.format ("%sgraph/%s.graph", graph.getDataDirectory (false), mapName.lowercase ()))) { + if (http.uploadFile ("http://yapb.jeefo.net/upload", strings.format ("%sgraph/%s.graph", graph.getDataDirectory (false), mapName.lowercase ()))) { msg ("Graph file was successfully validated and uploaded to the YaPB Graph DB (%s).", product.download); msg ("It will be available for download for all YaPB users in a few minutes."); msg ("\n"); diff --git a/vc/yapb.vcxproj b/vc/yapb.vcxproj index 2049eb1..bb102c3 100644 --- a/vc/yapb.vcxproj +++ b/vc/yapb.vcxproj @@ -150,7 +150,7 @@ Disabled ..\vc;..\inc;..\ext;..\ext\crlib;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;CR_DEBUG;%(PreprocessorDefinitions) MultiThreadedDebug yapb.h