Merged master into Lyberta/TeamplayFixes_.

[xonotic/xonotic-data.pk3dir.git] / defaultOverkill.cfg

diff --git a/defaultOverkill.cfg b/defaultOverkill.cfg
index cbeaa0a0be3d03a2485527e6235fb3c0401dcf44..1dc68c70de1a085b438bc79d4cf7a947ae5e4d1c 100644 (file)
--- a/defaultOverkill.cfg
+++ b/defaultOverkill.cfg
@@ -2,13 +2,19 @@
 //  Overkill Mod
 // ==============
 
-exec defaultXonotic.cfg
+exec defaultServer.cfg
 exec balance-overkill.cfg
 exec physicsOverkill.cfg
 
 // general gameplay
 set g_overkill 1
-set g_fullbrightplayers 1
+
+// hack - eventually, we should be able to choose overkill models in menu like for vanilla
+set sv_defaultcharacter 1
+set sv_defaultplayermodel "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"
+set sv_defaultplayermodel_red "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm"
+set sv_defaultplayermodel_blue "models/ok_player/okmale1.dpm models/ok_player/okmale2.dpm models/ok_player/okmale3.dpm models/ok_player/okmale4.dpm"
+
 set g_respawn_ghosts 0
 
 set g_nades 1
@@ -23,9 +29,6 @@ set sv_dodging_wall_dodging 1
 set g_spawn_near_teammate 1
 set g_spawn_near_teammate_ignore_spawnpoint 1
 set g_spawnshieldtime 0.5
-set g_ctf_respawn_delay_small 2
-set g_ctf_respawn_delay_large 2
+set g_respawn_delay_forced 2
 
 set g_lms_start_armor 100
-
-//set sv_itemstime 2 // TODO enable this after there's an option to disable the panel to keep only waypoints