Merge branch 'master' into martin-t/okc

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

diff --git a/defaultOverkill.cfg b/defaultOverkill.cfg
index d631967308df7360bd9928ab69e09f6aca7f9b9a..d4936b0338792c28b4ff95886db652c17c3d835e 100644 (file)
--- a/defaultOverkill.cfg
+++ b/defaultOverkill.cfg
@@ -1,15 +1,34 @@
-// ================
-//  Overkill Mode
-// ================
+// ==============
+//  Overkill Mod
+// ==============
 
-exec defaultXonotic.cfg
+exec defaultServer.cfg
 exec balance-overkill.cfg
+exec physicsOverkill.cfg
 
 // general gameplay
 set g_overkill 1
+
+// hack - eventually, we should be able to choose overkill models in menu like for vanilla
+sv_defaultcharacter 1
+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"
+sv_defaultplayermodel_red "models/ok_player/okrobot1.dpm models/ok_player/okrobot2.dpm models/ok_player/okrobot3.dpm models/ok_player/okrobot4.dpm"
+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
+set g_nades_nade_small 1
+set g_nades_spread 0
+set g_nades_nade_refire 10
+set g_nades_nade_newton_style 2
+
 set g_dodging 1
-set sv_dodging_delay 0.5
 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_respawn_delay_forced 2
+
+set g_lms_start_armor 100