Whitelist overkill's health/armor items again

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

diff --git a/defaultOverkill.cfg b/defaultOverkill.cfg
index 3f71921179290c77d543b1627b9155535f511065..f63f689f34bda0b1cd03bcb62a1f944cbac88a92 100644 (file)
--- a/defaultOverkill.cfg
+++ b/defaultOverkill.cfg
@@ -2,13 +2,21 @@
 //  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 sv_defaultplayermodel_yellow "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm"
+set sv_defaultplayermodel_pink "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
@@ -20,12 +28,9 @@ set g_nades_nade_newton_style 2
 set g_dodging 1
 set sv_dodging_wall_dodging 1
 
-set g_spawn_near_teammate 1
+set g_spawn_near_teammate "!g_assault !g_freezetag"
 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