X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=defaultXonotic.cfg;h=27f56a8a17c9fbf28437d06c333af09615f34fcc;hb=8e21305d89d7486a4d61117df0bcc5b5b8eeb3f8;hp=96771d33d413810f3dbb1170b0969190c4aaebc8;hpb=e48821ed9b999615d6b04449c533cd92ff615b72;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 96771d33d..27f56a8a1 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -29,15 +29,6 @@ alias setreport "set \"$1\" \"$2\" ; sendcvar \"$1\"" seta cl_firststart "" "how many times the client has been run" seta cl_startcount 0 "how many times the client has been run" -// detect dedicated server or client -alias "_detect_dedicated_$qport" "${* asis}" -alias "_detect_dedicated_0" "" -alias _if_dedicated "_detect_dedicated_$qport ${* asis}" -alias if_client "${* asis}" -alias if_dedicated "${* asis}" -_if_dedicated alias if_client "" -if_client alias if_dedicated "" - seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg" // say aliases @@ -53,44 +44,15 @@ alias asay_drop "say_team (%l) dropped %w ; impulse 17" alias +hook +button6 alias -hook -button6 alias use "impulse 21" -alias ready "cmd ready" -alias lockteams "sv_cmd lockteams" -alias unlockteams "sv_cmd unlockteams" -alias nospectators "sv_cmd nospectators" -alias cointoss "sv_cmd cointoss" -alias timeout "cmd timeout" //use this command to call a timeout -alias timein "cmd timein" //use this command to resume the game before timeout is finished - -alias bsp "ls maps/*.bsp" -alias chmap "changelevel $*" -alias gotomap "sv_cmd gotomap \"$1\"" - -alias rec "record demos/$1" -alias ply "playdemo $1" -alias tdem "timedemo $1" // for backwards compatibility -alias savedb "sv_cmd database save \"$1\"" -alias dumpdb "sv_cmd database dump \"$1\"" -alias loaddb "sv_cmd database load \"$1\"" alias dropweapon "impulse 17" alias +show_info +button7 alias -show_info -button7 -alias team_red "cmd selectteam red; cmd join" -alias team_blue "cmd selectteam blue; cmd join" -alias team_pink "cmd selectteam pink; cmd join" -alias team_yellow "cmd selectteam yellow; cmd join" -alias team_auto "cmd selectteam auto; cmd join" bind f6 team_auto -alias movetoteam_red "sv_cmd movetoteam $1 red" -alias movetoteam_blue "sv_cmd movetoteam $1 blue" -alias movetoteam_pink "sv_cmd movetoteam $1 pink" -alias movetoteam_yellow "sv_cmd movetoteam $1 yellow" -alias movetoteam_auto "sv_cmd movetoteam $1 auto" - // merge lightmaps up to 2048x2048 textures mod_q3bsp_lightmapmergepower 4 @@ -297,13 +259,6 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b r_motionblur 0 // motion blur value, default is 0 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic) -r_bloom_blur 6 -r_bloom_brighten 1.5 -r_bloom_colorexponent 2 -r_bloom_colorscale 1.75 -r_bloom_colorsubtract 0.1 -r_bloom_resolution 320 - seta vid_x11_display "" "xonotic-linux-*.sh will use this to start xonotic on an other/new X display" // This can have three possible settings: // "" run as usual @@ -342,11 +297,12 @@ set teamplay_lockonrestart 0 "it set to 1 in a team-based game, the teams are lo set g_maxplayers 0 "maximum number of players allowed to play at the same time, set to 0 to allow all players to join the game" set g_maxplayers_spectator_blocktime 5 "if the players voted for the \"nospectators\" command, this setting defines the number of seconds a observer/spectator has time to join the game before he gets kicked" -//tournament mod +// tournament mod set g_warmup 0 "split the game into a warmup- and match-stage when set to 1" set g_warmup_limit 60 "if set to -1 the warmup-stage is not affected by any timelimit, if set to 0 the usual timelimit also affects warmup-stage, otherwise warmup will be limited to this time in SECONDS (useful for public matches)" set g_warmup_allow_timeout 0 "if set to 1 timeouts can also be called in the warmup-stage, when sv_timeout is set to 1" set g_warmup_allguns 0 "if set players start with all guns in warmup mode" +set g_warmup_majority_factor 0.8 "minimum percentage of players ready needed for warmup to end" set g_chat_nospectators 0 "if 0 spec/observer chat is always visible to the player, if 1 it is never visible to players, if 2 it is only visible to players during warmup stage" set sv_vote_nospectators 0 "if set only players can call a vote (thus spectators and observers can't call a vote)" @@ -427,9 +383,6 @@ cl_movement 1 cl_movement_track_canjump 0 cl_stairsmoothspeed 200 -seta cl_autoswitch 1 "automatically switch to newly picked up weapons if they are better than what you are carrying" -alias autoswitch "set cl_autoswitch $1 ; cmd autoswitch $1" - set bot_config_file bots.txt "Name and path of the bot configuration file" set bot_number 0 "Minimum number of bots" seta bot_usemodelnames 0 "Use player model names for bot names" @@ -512,12 +465,9 @@ set g_shootfromfixedorigin "" "if set to a string like 0 y z, the gun is moved t 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 "if set to 1 or 2, weapons stay after they were picked up (1: weapons you don't have yet give you ammo of their type and they can not be dropped, 2: weapons don't give ammo, but instead players start with one pickup-load of ammo by default, 3: weapons give ammo, weapons only stay as ammo-less ghosts)" set g_weapon_throwable 1 "if set to 1, weapons can be dropped" -set g_powerup_superhealth 1 "if set to 0 the mega health powerup will not spawn on the map" -set g_powerup_strength 1 "if set to 0 the strength powerup will not spawn on the map" -set g_powerup_shield 1 "if set to 0 the shield (invincibility) powerup will not spawn on the map" -set g_balance_powerup_timer 1 "if set to 0 the powerups dont wear off" +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" -set g_pickup_items 1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map" +set g_pickup_items -1 "if set to 0 all items (health, armor, ammo, weapons...) are removed from the map, if 1 they are forced to spawn" set g_minstagib 0 "enable minstagib" set g_minstagib_extralives 2 "how many extra lives you will get per powerup" set g_minstagib_ammo_start 10 "starting ammo" @@ -585,7 +535,6 @@ seta menu_sandbox_edit_physics 1 seta menu_sandbox_edit_force 1 seta menu_sandbox_edit_material "" -alias menu_showsandboxtools "menu_cmd directmenu SandboxTools" bind f7 menu_showsandboxtools set g_playerclip_collisions 1 "0 = disable collision testing against playerclips, might be useful on some defrag maps" @@ -850,7 +799,6 @@ set g_arena 0 "Arena: many one-on-one rounds are played to find the winner" set g_arena_maxspawned 2 "maximum number of players to spawn at once (the rest is spectating, waiting for their turn)" set g_arena_roundbased 1 "if disabled, the next player will spawn as soon as someone dies" set g_arena_warmup 5 "time, newly spawned players have to prepare themselves in round based matches" -set g_arena_powerups 0 "enables powerups (superhealth, strength and shield), which are removed by default" // ca set g_ca 0 "Clan Arena: Played in rounds, once you're dead you're out! The team with survivors wins the round." @@ -1012,8 +960,6 @@ seta cl_notify_carried_items "3" "notify you of carried items when you obtain th // startmap_dm is used when running with the -listen or -dedicated commandline options set serverconfig server.cfg alias startmap_dm "set _sv_init 0; map _init/_init; exec $serverconfig; set _sv_init 1; map _init/_init" -alias sv_loadconfig "exec $serverconfig" -alias sv_restart "say \"Server will restart at the end of the match, you will all be reconnected automatically. $* \"; quit_and_redirect self" // aliases: alias +fire +attack @@ -1043,8 +989,6 @@ alias togglezoom "${_togglezoom}zoom" alias reload "impulse 20" -alias sandbox "cmd g_sandbox $*" - // movement bind w +forward bind a +moveleft @@ -1069,6 +1013,7 @@ alias weapon_group_7 "impulse 7" alias weapon_group_8 "impulse 8" alias weapon_group_9 "impulse 9" alias weapon_group_0 "impulse 14" // cycles the superweapons +exec weapons.cfg bind 0 weapon_group_0 bind 1 weapon_group_1 bind 2 weapon_group_2 @@ -1160,51 +1105,10 @@ bind kp_enter "+userbind 16" bind kp_plus "+userbind 17" bind kp_minus "+userbind 18" -set sv_vote_commands "restart fraglimit chmap gotomap nextmap endmatch reducematchtime extendmatchtime allready kick cointoss movetoteam_auto" "these commands can be voted" -set sv_vote_only_commands "" -set sv_vote_master_commands "movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" "maybe add kickban here (but then sv_vote_master 0)" -set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban *\" status \"sv_cmd teamstatus\" movetoteam_auto movetoteam_red movetoteam_blue movetoteam_yellow movetoteam_pink" -set sv_vote_call 1 "users can call a vote for the above commands" -set sv_vote_master 1 "users can call a vote to become master" -set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master" -set sv_vote_change 1 "set to 1 to allow to change you vote/mind" -set sv_vote_singlecount 0 "set to 1 to count votes once after timeout or to 0 to count with every vote" -set sv_vote_timeout 30 "a vote will timeout after this many seconds" -set sv_vote_wait 120 "a player can not call a vote again for this many seconds when his vote was not accepted" -set sv_vote_stop 15 "a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)" -set sv_vote_majority_factor 0.5 "which quotient of the PLAYERS constitute a majority? (try: 0.666, 0.75 when using the above)" -set sv_vote_simple_majority_factor 0.666 "which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)" -// when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities" -set sv_vote_override_mostrecent 0 -alias vhelp "cmd vote help" -alias vstatus "cmd vote status" -alias vcall "cmd vote call $*" -alias vstop "cmd vote stop" -alias vmaster "cmd vote master" -alias vlogin "cmd vote login $*" -alias vdo "cmd vote do $*" -alias vyes "cl_cmd vyes" -alias vno "cl_cmd vno" -alias vdontcare "cmd vote dontcare" -alias vabstain "cmd vote abstain" - -alias vmap "vcall gotomap $1" -alias vnextmap "vcall nextmap $1" -alias vkick "vcall kick $1" -alias vkickban "vcall kickban $1" -alias vend "vcall endmatch" -alias vdomap "vdo gotomap $1" -alias vdokick "vdo kick $*" -alias vdokickban "vdo kickban $*" -alias vdoend "vdo endmatch" - -alias lsmaps "cmd lsmaps" // lists all maps on server (for vmap, suggestmap, vnextmap) -alias lsnewmaps "cmd lsnewmaps" // lists all maps on server that do not yet have a record set (race/cts) bind F1 vyes bind F2 vno //used for spectate/observer mode -alias spec "cmd spectate" bind F3 spec // NIX (No Items Xonotic) - at each time, everyone uses the same weapon, @@ -1239,7 +1143,6 @@ set g_campaign 0 set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink" seta g_campaign_name "xonoticbeta" set g_campaign_skill 0 -alias warp "sv_cmd warp $*" alias singleplayer_start "g_campaign_index 0; set scmenu_campaign_goto 0" alias singleplayer_continue "set scmenu_campaign_goto -1" @@ -1274,7 +1177,6 @@ seta g_maplist_votable_suggestions_override_mostrecent 0 seta g_maplist_votable_nodetail 1 "nodetail only shows total count instead of all vote counts per map, so votes don't influence others that much" seta g_maplist_votable_abstain 0 "when 1, you can abstain from your vote" seta g_maplist_votable_screenshot_dir "maps levelshots" "where to look for map screenshots" -alias suggestmap "cmd suggestmap $1" set g_chat_flood_spl 3 "normal chat: seconds between lines to not count as flooding" set g_chat_flood_lmax 2 "normal chat: maximum number of lines per chat message at once" @@ -1339,21 +1241,6 @@ seta cl_hidewaypoints 0 "disable static waypoints, only show team waypoints" seta g_waypointsprites_turrets 1 "disable turret waypoints" seta g_waypointsprites_turrets_maxdist 4000 "max distace for turret sprites" -// command extension -alias qc_cmd "sv_cmd $*" // menu QC will override this to menu_cmd -alias adminmsg "sv_cmd adminmsg $*" -alias teamstatus "cmd teamstatus; sv_cmd teamstatus" // yes, it is broken on listen servers that way, but well, who cares :P -alias printstats "sv_cmd printstats" // print status on demand -alias g_maplist_add "qc_cmd maplist add $*" -alias g_maplist_remove "qc_cmd maplist remove $*" -alias g_maplist_putfirst "qc_cmd maplist remove $* ; qc_cmd maplist add $*" -alias g_maplist_shufflenow "qc_cmd maplist shuffle" -alias g_maplist_cleanup "qc_cmd maplist cleanup" // removes maps that don't exist from the map list -alias gametype "sv_cmd gametype $*" - -alias addfav "qc_cmd addtolist net_slist_favorites $*" -alias addvote "qc_cmd addtolist sv_vote_commands $*" - // key hunt set g_keyhunt 0 "Key Hunt: collect all keys from the enemies and bring them together to score" set g_balance_keyhunt_delay_return 60 @@ -1406,23 +1293,9 @@ set g_ban_default_bantime 5400 "90 minutes" set g_ban_default_masksize 3 "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)" set g_banned_list "" "format: IP remainingtime IP remainingtime ..." set g_banned_list_idmode "1" "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)" -alias bans "sv_cmd bans" -alias ban "sv_cmd ban $*" // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds) -alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes) -alias unban "sv_cmd unban $*" // usage: unban 3 (number from bans) r_labelsprites_scale 0.40625 // labels sprites get displayed at 0.5x from 640x480 to 1280x1024, and at 1x from 1600x1200 onwards -// settemp subsystem. Do not touch. Usage: settemp variable value, next map resets it. -set settemp_list 0 -set settemp_idx 0 -set _settemp_var UNUSED -alias settemp "_settemp_var \"_settemp_x$settemp_idx\"; qc_cmd rpn /settemp_idx settemp_idx 1 add def; _settemp \"$1\" \"$2\"" -alias _settemp "settemp_list \"1 $1 $_settemp_var $settemp_list\"; set $_settemp_var \"${$1}\"; $1 \"$2\"" -alias settemp_restore "_settemp_restore_${settemp_list asis}" -alias _settemp_restore_0 "set settemp_var 0; set settemp_list 0" -alias _settemp_restore_1 "$1 \"${$2}\"; _settemp_restore_${3- asis}" - // usercommands. These can be edited and bound by the menu. seta "userbind1_press" "say_team quad soon"; seta "userbind1_release" ""; seta "userbind1_description" "team: quad soon" seta "userbind2_press" "say_team free item %x^7 (l:%y^7); g_waypointsprite_team_here_p"; seta "userbind2_release" ""; seta "userbind2_description" "team: free item, icon" @@ -1525,19 +1398,11 @@ set menu_weaponarena_with_laser 0 "also enable the Laser in this weapon arena" seta menu_maxplayers 16 "maxplayers value when the menu starts a game" -// command executed before loading a map by the menu -// makes sure maxplayers is at least minplayers or bot_number + 1 -alias _menu_loadmap_prepare_maxpl "maxplayers $_menu_loadmap_maxplayers" -alias menu_loadmap_prepare "disconnect; wait; g_campaign 0; menu_cmd rpn /_menu_loadmap_maxplayers menu_maxplayers minplayers bot_number 1 add max max def; _menu_loadmap_prepare_maxpl; g_maplist_shufflenow" - // useful vote aliases set timelimit_increment 5 set timelimit_decrement 5 set timelimit_min 5 set timelimit_max 60 -alias extendmatchtime "sv_cmd extendmatchtime" -alias reducematchtime "sv_cmd reducematchtime" -alias endmatch "timelimit -1" // useful keybind to maximize the chat area temporarily // HUD code takes care of many of these now... @@ -1649,9 +1514,7 @@ sv_allowdownloads 0 // download protocol is evil set g_jump_grunt 0 "Do you make a grunting noise every time you jump? Is it the same grunting noise every time?" -alias allready "sv_cmd allready" - -seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink rifle uzi electro tuba shotgun laser hook porto" "weapon priority list" +seta cl_weaponpriority "minstanex nex fireball grenadelauncher uzi hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "weapon priority list" seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)" seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives" seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy" @@ -1665,18 +1528,9 @@ seta cl_weaponpriority8 "" "use impulse 208 for prev gun from this list, 218 for seta cl_weaponpriority9 "" "use impulse 209 for prev gun from this list, 219 for best gun, 229 for next gun" seta cl_weaponimpulsemode 0 "0: only cycle between currently usable weapons in weapon priority order; 1: cycle between all possible weapons on a key in weapon priority order" -seta sv_status_privacy 1 "hide IP addresses from \"status\" replies shown to clients" - set g_maplist_allow_hidden 0 "allow hidden maps to be, e.g., voted for and in the maplist" set g_maplist_allow_frustrating 0 "allow impossible maps to be, e.g., voted for and in the maplist (if set to 2, ONLY impossible maps are allowed)" -if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" -if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" - -alias radar "cl_cmd hud_panel_radar_maximized" -alias scoreboard_columns_set "" // aliased later -alias scoreboard_columns_help "cl_cmd scoreboard_columns_help $*" - alias _gl_flashblend_update_00 "gl_flashblend 1" alias _gl_flashblend_update_10 "gl_flashblend 0" alias _gl_flashblend_update_01 "gl_flashblend 0" @@ -1693,9 +1547,6 @@ seta cl_autoscreenshot 0 "client option to automatically take a screenshot once // must be at the bottom of this file: // alias for switching the teamselect menu -alias menu_showteamselect "menu_cmd directmenu TeamSelect" -alias menu_showhudexit "menu_cmd directmenu HUDExit" -alias menu_showhudoptions "menu_cmd directpanelhudmenu $*" bind f5 menu_showteamselect set g_bugrigs 0 @@ -1728,10 +1579,6 @@ set g_ban_sync_trusted_servers_verify 0 "when set to 1, additional bans sent by set g_showweaponspawns 1 "display sprites for weapon spawns found on the map when a weapon key is pressed and the weapon is not available" -alias records "cmd records" -alias rankings "cmd rankings" -alias ladder "cmd ladder" - // ballistics use physical units, but qu based // Quake-Newton: 1 qN = 1 qu * 1 g / 1 s^2 // Quake-Joule: 1 qJ = 1 qN * 1 qu @@ -1803,14 +1650,10 @@ set cl_effects_lightningarc_branchfactor_add 0.1 set g_hitplots 0 "when set to 1, hitplots are stored by the server to provide a means of proving that a triggerbot was used" seta g_hitplots_individuals "" "the individuals, by IP, that should have their hitplots recorded" -alias g_hitplots_add "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 union def" -alias g_hitplots_remove "qc_cmd rpn /g_hitplots_individuals g_hitplots_individuals $1 difference def" alias mute "prvm_edictset server $1 muted 1" // I am lazy and not making an actual command of this alias unmute "prvm_edictset server $1 muted 0" // dito -rcon_secure 1 - set menu_updatecheck 1 set bot_navigation_ignoreplayers 0 // FIXME remove this once the issue is solved @@ -2145,6 +1988,9 @@ exec physicsX.cfg exec turrets.cfg exec vehicles.cfg +// load console command aliases and settings +exec commands.cfg + // hud cvar descriptions and common settings exec _hud_common.cfg exec _hud_descriptions.cfg @@ -2152,6 +1998,12 @@ exec _hud_descriptions.cfg // please add any new cvars into the hud_save script in qcsrc/client/hud_config.qc for consistency exec hud_luminos.cfg + +// ... and now that everything is configured/aliased, we can do some things: + +// Change g_start_delay based upon if the server is local or not. +if_client set g_start_delay 0 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" +if_dedicated set g_start_delay 15 "delay before the game starts, so everyone can join; recommended to set this to like 15 on a public server" + // enable menu syncing alias menu_sync "menu_cmd sync" -alias scoreboard_columns_set "cl_cmd scoreboard_columns_set $*"