Merge remote-tracking branch 'origin/master' into samual/weapons

[xonotic/xonotic-data.pk3dir.git] / bal-wep-xonotic.cfg

diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg
index 94f7529ed1d7394f9c20728a84bf97609b926613..65783f4a091a92fa88604310f44e94cd55bfe342 100644 (file)
--- a/bal-wep-xonotic.cfg
+++ b/bal-wep-xonotic.cfg
@@ -243,23 +243,30 @@ set g_balance_electro_weaponstartoverride -1
 set g_balance_electro_weaponthrowable 1
 // }}}
 // {{{ #7: Arc
-set g_balance_arc_primary_ammo 0
-set g_balance_arc_primary_animtime 0.2
-set g_balance_arc_primary_botaimlifetime 0
-set g_balance_arc_primary_botaimspeed 0
-set g_balance_arc_primary_damage 150
-set g_balance_arc_primary_degreespersegment 1
-set g_balance_arc_primary_distancepersegment 0
-set g_balance_arc_primary_falloff_halflifedist 0
-set g_balance_arc_primary_falloff_maxdist 0
-set g_balance_arc_primary_falloff_mindist 0
-set g_balance_arc_primary_force 2000
-set g_balance_arc_primary_maxangle 10
-set g_balance_arc_primary_nonplayerdamage 80
-set g_balance_arc_primary_range 1000
-set g_balance_arc_primary_refire 0.5
-set g_balance_arc_primary_returnspeed 8
-set g_balance_arc_secondary_ammo 0
+set g_balance_arc_beam_ammo 0
+set g_balance_arc_beam_animtime 0.2
+set g_balance_arc_beam_botaimlifetime 0
+set g_balance_arc_beam_botaimspeed 0
+set g_balance_arc_beam_damage 150
+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 2000
+set g_balance_arc_beam_healing_amax 200
+set g_balance_arc_beam_healing_aps 50
+set g_balance_arc_beam_healing_hmax 200
+set g_balance_arc_beam_healing_hps 50
+set g_balance_arc_beam_maxangle 10
+set g_balance_arc_beam_nonplayerdamage 80
+set g_balance_arc_beam_range 1000
+set g_balance_arc_beam_refire 0.5
+set g_balance_arc_beam_returnspeed 8
+set g_balance_arc_beam_tightness 0.5
+set g_balance_arc_burst_damage 500
+set g_balance_arc_burst_healing_aps 100
+set g_balance_arc_burst_healing_hps 100
 set g_balance_arc_switchdelay_drop 0.3
 set g_balance_arc_switchdelay_raise 0.3
 set g_balance_arc_weaponreplace ""
@@ -443,7 +450,7 @@ set g_balance_devastator_speedaccel 1300
 set g_balance_devastator_speedstart 1000
 set g_balance_devastator_switchdelay_drop 0.3
 set g_balance_devastator_switchdelay_raise 0.2
-set g_balance_devastator_weaponreplace ""
+set g_balance_devastator_weaponreplace "arc"
 set g_balance_devastator_weaponstart 0
 set g_balance_devastator_weaponstartoverride -1
 set g_balance_devastator_weaponthrowable 1