Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/defaultXPM.cfg b/defaultXPM.cfg
index bca8798e470e480cb5556c851a04f6df25bff923..b8a5ce7a17658bd11f6a50107cde738c5d8aaaf7 100644 (file)
--- a/defaultXPM.cfg
+++ b/defaultXPM.cfg
@@ -1,44 +1,31 @@
+// Xonotic ProMode
 exec defaultXonotic.cfg
 
-set g_weaponreplace_laser ""
-set g_weaponreplace_shotgun ""
-set g_weaponreplace_uzi ""
-set g_weaponreplace_grenadelauncher ""
-set g_weaponreplace_electro ""
-set g_weaponreplace_crylink ""
-set g_weaponreplace_nex ""
-set g_weaponreplace_hagar ""
-set g_weaponreplace_rocketlauncher ""
-set g_weaponreplace_porto ""
-set g_weaponreplace_minstanex ""
-set g_weaponreplace_hook ""
-set g_weaponreplace_hlac ""
-set g_weaponreplace_campingrifle ""
-set g_weaponreplace_tuba ""
-set g_weaponreplace_fireball ""
-set g_weaponreplace_seeker ""
-set sv_q3acompat_machineshotgunswap 0
-
-// other options
-set sv_fragmessage_information_ping 1
-set sv_fragmessage_information_handicap 1
-set sv_fragmessage_information_stats 0
-set sv_fragmessage_information_typefrag 1
-
-set sv_defaultcharacter 1
-set sv_defaultplayermodel "models/player/nyx.iqm"
-set sv_defaultplayercolors 60 // force some visible color for now
-
-set g_jump_grunt 1
-set g_footsteps 1
-set g_shootfromcenter 1
-set g_fullbrightplayers 1 // until all models are visible with this set to 0
-set g_forced_respawn 1
-set g_mirrordamage 0
-set g_friendlyfire 1
-
-set timelimit_overtimes 1
-set timelimit_override 15 // for now, maybe not in future
-
-exec physicsXPM.cfg
-exec balanceFruit.cfg
+//==============
+// pure changes
+//==============
+
+// players
+sv_fbskin_green // visible playermodel forced on everyone
+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_fragmessage_information_stats 0 // don't reveal how much health/armor the attacker had