Merge branch 'TimePath/cleanup'

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

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index 38d74c7c990f1dd7ed047c427b108e4e7f83944c..be3fd4119b4ac9bfc25ed6d37ed25c5bfdf6d5c9 100644 (file)
--- a/defaultXPM.cfg
+++ b/defaultXPM.cfg
@@ -1,31 +1,21 @@
-// Xonotic ProMode
-exec defaultXonotic.cfg
+// ==================
+//  Xonotic Pro-Mode
+// ==================
 
-//==============
-// pure changes
-//==============
+exec defaultXonotic.cfg
+exec balance-xpm.cfg
 
-// players
-sv_fbskin_green // visible playermodel forced on everyone
+// general gameplay
+set g_norecoil 1
+set g_shootfromeye 1 // hit where you point at with the crosshair (promoders don't care about ugliness)
+set g_balance_kill_antispam 0
+set g_forced_respawn 1
 set teamplay_mode 2 // friendly fire and self damage
-
-//================
-// impure changes
-//================
-
-// players
-g_jump_grunt 1 // make enemies even easier to hear when they're jumping around
-
-// physics
-exec physicsXPM.cfg // XPM physics. Similar to vanilla Xonotic physics, with a different way to accelerate: through strafejumping
-
-// balance
-set g_balance_weaponswitchdelay 0 // no switch animation, this is standard in "pro modes" ;)
-set g_shootfromcenter 1 // hit where you point at with the crosshair (almost so, no shooteye because it's really ugly)
-
-// match rules
-set timelimit_overtimes 1 // overtimes on, draw matches are less interesting! :)
-set g_forced_respawn 1 // no delaying/cheating a match by not spawning
-
-// info
-set sv_fraginfo_stats 0 // don't reveal how much health/armor the attacker had
+set sv_vote_nospectators 1
+set g_chat_nospectators 2
+set g_warmup 1
+set g_balance_teams 0
+set g_spawnshieldtime 0
+set sv_autoscreenshot 1
+set sv_ready_restart 1
+set sv_ready_restart_after_countdown 1