From: Mario <mario@smbclan.net>
Date: Sat, 8 Oct 2016 11:13:51 +0000 (+1000)
Subject: Tweak arc as well (bolt attack remains disabled by default), also whitelist another... 
X-Git-Tag: xonotic-v0.8.2~546
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f34e9d104f7c1fa5ab13a65a7c3e5b8c6db64fe;p=xonotic%2Fxonotic-data.pk3dir.git

Tweak arc as well (bolt attack remains disabled by default), also whitelist another gameplay-irrelevant cvar
---

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 68a3256fd..481080ecf 100644
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -728,16 +728,16 @@ set g_balance_shockwave_weaponthrowable 0
 // }}}
 // {{{ #20: Arc
 set g_balance_arc_beam_ammo 6
-set g_balance_arc_beam_animtime 0.2
+set g_balance_arc_beam_animtime 0.1
 set g_balance_arc_beam_botaimlifetime 0
 set g_balance_arc_beam_botaimspeed 0
-set g_balance_arc_beam_damage 115
+set g_balance_arc_beam_damage 100
 set g_balance_arc_beam_degreespersegment 1
 set g_balance_arc_beam_distancepersegment 0
 set g_balance_arc_beam_falloff_halflifedist 0
 set g_balance_arc_beam_falloff_maxdist 0
 set g_balance_arc_beam_falloff_mindist 0
-set g_balance_arc_beam_force 900
+set g_balance_arc_beam_force 600
 set g_balance_arc_beam_healing_amax 0
 set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
@@ -746,8 +746,8 @@ set g_balance_arc_cooldown 2.5
 set g_balance_arc_cooldown_release 0
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
-set g_balance_arc_beam_heat 0.75
-set g_balance_arc_burst_heat 4
+set g_balance_arc_beam_heat 0
+set g_balance_arc_burst_heat 5
 set g_balance_arc_beam_maxangle 10
 set g_balance_arc_beam_nonplayerdamage 80
 set g_balance_arc_beam_range 1000
diff --git a/bal-wep-xpm.cfg b/bal-wep-xpm.cfg
index 68a3256fd..481080ecf 100644
--- a/bal-wep-xpm.cfg
+++ b/bal-wep-xpm.cfg
@@ -728,16 +728,16 @@ set g_balance_shockwave_weaponthrowable 0
 // }}}
 // {{{ #20: Arc
 set g_balance_arc_beam_ammo 6
-set g_balance_arc_beam_animtime 0.2
+set g_balance_arc_beam_animtime 0.1
 set g_balance_arc_beam_botaimlifetime 0
 set g_balance_arc_beam_botaimspeed 0
-set g_balance_arc_beam_damage 115
+set g_balance_arc_beam_damage 100
 set g_balance_arc_beam_degreespersegment 1
 set g_balance_arc_beam_distancepersegment 0
 set g_balance_arc_beam_falloff_halflifedist 0
 set g_balance_arc_beam_falloff_maxdist 0
 set g_balance_arc_beam_falloff_mindist 0
-set g_balance_arc_beam_force 900
+set g_balance_arc_beam_force 600
 set g_balance_arc_beam_healing_amax 0
 set g_balance_arc_beam_healing_aps 50
 set g_balance_arc_beam_healing_hmax 150
@@ -746,8 +746,8 @@ set g_balance_arc_cooldown 2.5
 set g_balance_arc_cooldown_release 0
 set g_balance_arc_overheat_max 5
 set g_balance_arc_overheat_min 3
-set g_balance_arc_beam_heat 0.75
-set g_balance_arc_burst_heat 4
+set g_balance_arc_beam_heat 0
+set g_balance_arc_burst_heat 5
 set g_balance_arc_beam_maxangle 10
 set g_balance_arc_beam_nonplayerdamage 80
 set g_balance_arc_beam_range 1000
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 24573c1c2..85a04d8ec 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -321,6 +321,7 @@ void cvar_changes_init()
 		BADCVAR("g_keyhunt_point_leadlimit");
 		BADCVAR("g_nexball_goalleadlimit");
 		BADCVAR("g_new_toys_use_pickupsound");
+		BADCVAR("g_physics_predictall");
 		BADCVAR("g_tdm_point_leadlimit");
 		BADCVAR("g_tdm_point_limit");
 		BADCVAR("leadlimit_and_fraglimit");