From: Martin Taibr Date: Tue, 17 Sep 2019 05:36:29 +0000 (+0200) Subject: improve cvar descriptions, add ca to default votable modes X-Git-Tag: xonotic-v0.8.5~1257^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e6d039b81509fed940a226f9b09f5fd909399ba;p=xonotic%2Fxonotic-data.pk3dir.git improve cvar descriptions, add ca to default votable modes --- diff --git a/commands.cfg b/commands.cfg index d5da481b9..49090d37f 100644 --- a/commands.cfg +++ b/commands.cfg @@ -322,13 +322,13 @@ 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" "these commands can be voted or used directly by masters (vdo)" 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 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" +set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master, then run master commands directly using vdo" set sv_vote_master_playerlimit 2 "Minimum number of players needed for a player to be allowed to vote for master" set sv_vote_no_stops_vote 1 "Allow the vote caller to stop his own vote simply by voting no" set sv_vote_singlecount 0 "set to 1 to count votes once after timeout or to 0 to count with every vote" diff --git a/gamemodes-server.cfg b/gamemodes-server.cfg index 548a51223..a5f6f839d 100644 --- a/gamemodes-server.cfg +++ b/gamemodes-server.cfg @@ -57,15 +57,16 @@ alias sv_vote_gametype_hook_rc alias sv_vote_gametype_hook_tdm alias sv_vote_gametype_hook_duel -// Example preset to allow 1v1ctf to be used for the gametype voting screen +// Example preset to allow 1v1ctf to be used for the gametype voting screen. +// Aliases can have max 31 chars so the gametype can have max 9 chars. // sv_vote_gametype_*_type Must be set to the name of the gametype the option is based on // sv_vote_gametype_*_name Contains a human-readable name of the gametype // sv_vote_gametype_*_description Contains a longer description //set sv_vote_gametype_1v1ctf_type ctf //set sv_vote_gametype_1v1ctf_name "Capture the Flag Duel" //set sv_vote_gametype_1v1ctf_description "One vs One match in CTF" -//alias sv_vote_gametype_hook_all "set g_maxplayers 0" -//alias sv_vote_gametype_hook_1v1ctf "set g_maxplayers 2" +//alias sv_vote_gametype_hook_all "g_maxplayers 0" +//alias sv_vote_gametype_hook_1v1ctf "g_maxplayers 2" // =========== diff --git a/ruleset-XDF.cfg b/ruleset-XDF.cfg index a0cc24b7b..81439af0b 100644 --- a/ruleset-XDF.cfg +++ b/ruleset-XDF.cfg @@ -12,11 +12,11 @@ g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no g_balance_kill_antispam 0 g_forced_respawn 1 // g_playerclip_collisions 0 // do not check playerclips -g_powerups 0 // set to -1 or patch xonotic +g_powerups 0 g_spawnpoints_auto_move_out_of_solid 1 g_start_delay 3 -g_use_ammunition 0 "if set to 0 all weapons have unlimited ammunition" -g_weapon_stay 1 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo" +g_use_ammunition 0 +g_weapon_stay 1 teamplay_mode 2 // friendly fire and self damage sv_vote_nospectators 1 timelimit_override 20 diff --git a/xonotic-client.cfg b/xonotic-client.cfg index dfa3c0c57..a6494cc08 100644 --- a/xonotic-client.cfg +++ b/xonotic-client.cfg @@ -854,7 +854,7 @@ seta cl_ghost_items 0.45 "enable ghosted items (when between 0 and 1, overrides seta cl_ghost_items_color "-1 -1 -1" "color of ghosted items (colormod format: 0 0 0 leaves the color unchanged, negative values allowed)" seta cl_simple_items 0 "enable simple items (if server allows)" set cl_simpleitems_postfix "_luma" "posfix to add fo model name when simple items are enabled" -set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems)" +set cl_fullbright_items 0 "enable fullbright items (if server allows, controlled by g_fullbrightitems) - items are more visible in shadows" set cl_weapon_stay_color "2 0.5 0.5" "Color of picked up weapons when g_weapon_stay > 0 (colormod format: 0 0 0 leaves the color unchanged, negative values allowed)" set cl_weapon_stay_alpha 0.75 "Alpha of picked up weapons when g_weapon_stay > 0" diff --git a/xonotic-server.cfg b/xonotic-server.cfg index 89a04782f..47bab4440 100644 --- a/xonotic-server.cfg +++ b/xonotic-server.cfg @@ -189,7 +189,7 @@ set g_shootfromeye 0 "shots are fired from your eye/crosshair; visual gun positi set g_shootfromcenter 0 "weapon gets moved to the center, shots still come from the barrel of your weapon; visual gun position can still be influenced by cl_gunalign 1 and 2" set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved to the given y and z coordinates. If set to a string like x y z, the whole shot origin is used" set g_pinata 0 "if set to 1 you will not only drop your current weapon when you are killed, but you will drop all weapons that you possessed" -set g_weapon_stay 0 "1: ghost weapons can be picked up too but give no ammo, 2: ghost weapons refill ammo to one pickup size, thrown guns have no ammo" +set g_weapon_stay 0 "1: ghost weapons can be picked up but give no ammo, thrown guns have ammo 2: ghost weapons can be picked up and refill ammo to one pickup size, thrown guns have no ammo (to prevent infinite ammo abuse)" set g_weapon_throwable 1 "if set to 1, weapons can be dropped" set g_powerups -1 "if set to 0 the strength and shield (invincibility) will not spawn on the map, if 1 they will spawn in all game modes, -1 is game mode default" set g_use_ammunition 1 "if set to 0 all weapons have unlimited ammunition" @@ -203,7 +203,7 @@ set g_weaponarena_random_with_blaster "1" "additionally, always provide the blas set g_spawnpoints_auto_move_out_of_solid 0 "if set to 1 you will see a warning if a spawn point was placed inside a solid" set g_forced_respawn 0 "if set to 1 and a player died, that player gets automatically respawned once seconds are over" set g_fullbrightplayers 0 "brightens up player models (note that the color, skin or model of the players does not change!)" -set g_fullbrightitems 0 "brightens up items" +set g_fullbrightitems 0 "allows players to use cl_fullbright_items" set g_nodepthtestplayers 0 "disables depth testing on players" set g_nodepthtestitems 0 "disables depth testing on items" set g_casings 2 "specifies which casings (0: none, 1: only shotgun casings, 2: shotgun and machine gun casings) are sent to the client" @@ -347,7 +347,7 @@ set g_maplist_votable_screenshot_dir "maps levelshots" "where to look for map sc set sv_vote_gametype 0 "show a vote screen for gametypes before map vote screen" set sv_vote_gametype_keeptwotime 10 "show only 2 options after this amount of time during gametype vote screen" -set sv_vote_gametype_options "dm tdm ctf" "Keep the identifiers short, otherwise you'll run into issues with too long alias names (max is 31 characters) when using sv_vote_gametype_hook_*" +set sv_vote_gametype_options "dm tdm ca ctf" "identifiers of gamemodes on the voting screen, can be custom (max 9 chars) - see example in server/server.cfg" set sv_vote_gametype_timeout 20 "how long the gametype vote screen lasts" set sv_vote_gametype_default_current 1 "Keep the current gametype if no one votes"