From: terencehill <piuntn@gmail.com>
Date: Sun, 24 Jul 2016 08:45:41 +0000 (+0200)
Subject: Cleanup / fix some cvar definitions
X-Git-Tag: xonotic-v0.8.2~700^2~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7eeb77d93fcc283dd103a62685a02aa47a104077;p=xonotic%2Fxonotic-data.pk3dir.git

Cleanup / fix some cvar definitions
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 30ed7c988..d9b209b64 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -487,15 +487,15 @@ seta timelimit_suddendeath 5 "number of minutes suddendeath mode lasts after all
 set g_tdm 0 "Team Deathmatch: the team who kills their opponents most often wins"
 set g_tdm_on_dm_maps 0 "when this is set, all DM maps automatically support TDM"
 
-seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage_threshold*"
-seta g_mirrordamage 0.700000	"for teamplay 4: mirror damage factor"
-seta g_mirrordamage_virtual 1	"for teamplay 4: do not actually apply mirror damage, just show graphics effect for it"
-seta g_mirrordamage_onlyweapons 0 "for teamplay 4: only apply mirror damage if the attack was from a weapon"
-seta g_friendlyfire 0.500000	"for teamplay 4: fiendly fire factor"
-seta g_friendlyfire_virtual 1	"for teamplay 4: do not actually apply friendly fire, just show graphics effect for it"
-seta g_friendlyfire_virtual_force 1	"for teamplay 4: apply force even though damage was made virtual only"
-seta g_teamdamage_threshold 40	"for teamplay 4: threshold over which to apply mirror damage"
-seta g_teamdamage_resetspeed 20	"for teamplay 4: how fast player's teamdamage count decreases"
+seta teamplay_mode 4 "default teamplay setting in team games. 1 = no friendly fire, self damage. 2 = friendly fire and self damage enabled. 3 = no friendly fire, but self damage enabled. 4 = obey the cvars g_mirrordamage*, g_friendlyfire* and g_teamdamage*"
+seta g_mirrordamage 0.7              "for teamplay_mode 4: mirror damage factor"
+seta g_mirrordamage_virtual 1        "for teamplay_mode 4: do not actually apply mirror damage, just show graphics effect for it"
+seta g_mirrordamage_onlyweapons 0    "for teamplay_mode 4: only apply mirror damage if the attack was from a weapon"
+seta g_friendlyfire 0.5              "for teamplay_mode 4: friendly fire factor"
+seta g_friendlyfire_virtual 1        "for teamplay_mode 4: do not actually apply friendly fire, just show graphics effect for it"
+seta g_friendlyfire_virtual_force 1  "for teamplay_mode 4: apply force even though damage was made virtual only"
+seta g_teamdamage_threshold 40       "for teamplay_mode 4: threshold over which to apply mirror damage"
+seta g_teamdamage_resetspeed 20      "for teamplay_mode 4: how fast player's teamdamage count decreases"
 
 seta g_balance_teams 1	"automatically balance out players entering instead of asking them for their preferred team"
 seta g_balance_teams_prevent_imbalance	1	"prevent players from changing to larger teams"