Merge branch 'master' into martin-t/vbots

diff --git a/commands.cfg b/commands.cfg
index d5da481b9794517a219a0879092a01bf01c64c0a..88371f5e4c69e705f7211053ff967b2e603f09f2 100644 (file)
--- a/commands.cfg
+++ b/commands.cfg
@@ -235,6 +235,8 @@ alias warp                 "qc_cmd_sv     warp                 ${* ?}" // Choose
 
 // other aliases for server commands
 alias endmatch "timelimit -1"
+alias bots "minplayers 4; minplayers_per_team 2"
+alias nobots "minplayers 0; minplayers_per_team 0"
 
 alias savedb "sv_cmd database save \"${1 ?}\""
 alias dumpdb "sv_cmd database dump \"${1 ?}\""
@@ -322,10 +324,10 @@ set sv_vote_command_help_gotomap "\nUsage:^3 vcall gotomap mapname\n^7  Where 'm
 // =================================
 set sv_vote_call 1 "Allow users to call a vote for the commands in sv_vote_commands"
 set sv_vote_change 1 "Allow voters to change their mind after already voting"
-set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams" "these commands can be voted"
+set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams bots nobots" "these commands can be voted"
 set sv_vote_only_commands ""
 set sv_vote_limit 160 "Maximum allowed length of a vote command"
-set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink movetospec " "Extra commands which vote masters can execute by themselves, along with the normal sv_vote_commands." // maybe add kickban here (but then sv_vote_master 0)
+set sv_vote_master_commands "movetored movetoblue movetoyellow movetopink movetospec" "Extra commands which vote masters can execute by themselves, along with the normal sv_vote_commands." // maybe add kickban here (but then sv_vote_master 0)
 set sv_vote_master 0   "Allows the use of the vote master system"
 set sv_vote_master_callable 0 "When set, users can use \"vmaster\" to call a vote to become master of voting commands"
 set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
@@ -372,4 +374,4 @@ alias vext "vcall extendmatchtime"
 //  rcon server commands
 // ======================
 rcon_secure 1
-set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoauto movetored movetoblue movetoyellow movetopink movetospec"
+set rcon_restricted_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoauto shuffleteams bots nobots movetored movetoblue movetoyellow movetopink movetospec kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\""

diff --git a/xonotic-server.cfg b/xonotic-server.cfg
index 89a04782f8828ccf4329fe30a10a48121bfdf864..c5697f4aa272e056fadf52fe11ee42c9549b835a 100644 (file)
--- a/xonotic-server.cfg
+++ b/xonotic-server.cfg
@@ -114,6 +114,7 @@ set bot_usemodelnames 0     "Use player model names for bot names"
 set bot_nofire 0       "When set, bots never fire. Mainly for testing in g_waypointeditor mode"
 set bot_prefix [BOT]   "Prefix in front of the bot names"
 set bot_suffix ""      "Suffix behind the bot names"
+set skill 8
 set skill_auto 0       "when 1, \"skill\" gets adjusted to match the best player on the map"
 set bot_debug_tracewalk 0 "Enable visual indicators for short-term navigation. Green: Goal Reached / Yellow: Obstacle found / Red: Unsolvable obstacle found"
 set bot_debug_goalstack 0 "Visualize the current path that each bot is following. Use with as few bots as possible."