X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=defaultXonotic.cfg;h=493f747d0d964b928fcbefdd03de638a72c81e8f;hb=aadf311efcedae28f1fb3b24a362ec72fcc1d875;hp=baa3e6f2ee60009e87f6ec7e9b2d8a10c96d79ce;hpb=9fd3e715c41327d67779a2049e25a0c883abb4bd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index baa3e6f2e..493f747d0 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -862,53 +862,9 @@ alias "g_waypointsprite_toggle"	"toggle cl_hidewaypoints"
 // key for that?
 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"
-
-// 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
-set g_balance_keyhunt_delay_round 5
-set g_balance_keyhunt_delay_tracking 10
-set g_balance_keyhunt_delay_fadeout 2
-set g_balance_keyhunt_delay_collect 1.5
-set g_balance_keyhunt_maxdist 150
-set g_balance_keyhunt_score_collect 3
-set g_balance_keyhunt_score_carrierfrag 2
-set g_balance_keyhunt_score_capture 100
-set g_balance_keyhunt_score_push 60
-set g_balance_keyhunt_score_destroyed 50
-set g_balance_keyhunt_score_destroyed_ownfactor 1
-set g_balance_keyhunt_dropvelocity 300
-set g_balance_keyhunt_throwvelocity 400
-set g_balance_keyhunt_protecttime 0.8
-set g_balance_keyhunt_damageforcescale 1
-seta g_keyhunt_teams_override 0
-set g_keyhunt_teams 0
-
-// keepaway
-set g_keepaway 0 "game mode which focuses around a ball, look at g_keepaway_win_mode for further details"
-set g_keepaway_score_bckill 1 "enable scoring points (y/n) for ball carrier kills (value is how many points to award)"
-set g_keepaway_score_killac 1 "amount of points to give when you kill someone while you have the ball"
-set g_keepaway_score_timeinterval 1 "amount of time it takes between intervals for timepoints to be added to the score"
-set g_keepaway_score_timepoints 0 "points to add to score per timeinterval, 0 for no points"
-set g_keepaway_ballcarrier_effects 8 "Add together the numbers you want: EF_ADDITIVE (32) / EF_NODEPTHTEST (8192) / EF_DIMLIGHT (8)"
-set g_keepaway_ballcarrier_highspeed 1 "speed multiplier done to the person holding the ball (recommended when used with some mutators)"
-set g_keepaway_ballcarrier_damage	1	"damage multiplier while holding the ball"
-set g_keepaway_ballcarrier_force	1	"force multiplier while holding the ball"
-set g_keepaway_ballcarrier_selfdamage	1	"self damage multiplier while holding the ball"
-set g_keepaway_ballcarrier_selfforce	1	"self force multiplier while holding the ball"
-set g_keepaway_noncarrier_warn	1	"warn players when they kill without holding the ball"
-set g_keepaway_noncarrier_damage	1	"damage done to other players if both you and they don't have the ball"
-set g_keepaway_noncarrier_force	1	"force done to other players if both you and they don't have the ball"
-set g_keepaway_noncarrier_selfdamage	1	"self damage if you don't have the ball"
-set g_keepaway_noncarrier_selfforce	1	"self force if you don't have the ball"
-set g_keepawayball_effects 0 "Add together the numbers you want: EF_ADDITIVE (32) / EF_NODEPTHTEST (8192) / EF_DIMLIGHT (8)"
-set g_keepawayball_trail_color	254	"particle trail color from player/ball"
-set g_keepawayball_damageforcescale	3 "Scale of force which is applied to the ball by weapons/explosions/etc"
-set g_keepawayball_respawntime	10	"if no one picks up the ball, how long to wait until the ball respawns"
-seta g_keepaway_teams_override 0
-set g_keepaway_teams 0
+seta g_waypointsprite_turrets 1 "disable turret waypoints"
+seta g_waypointsprite_turrets_maxdist 5000 "max distace for turret sprites"
+seta g_waypointsprite_tactical 1 "tactical overlay on turrets when in a vehicle"
 
 // so it can be stuffcmd-ed still
 set cl_gravity 800	"but ignored anyway"