]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Some balance fixes for arc
authorMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 11:16:37 +0000 (22:16 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 6 Nov 2014 11:16:37 +0000 (22:16 +1100)
bal-wep-xonotic.cfg
qcsrc/common/weapons/w_arc.qc

index 61e079346ac9da0c88e09773b0532c2d735b6fc3..3218141c8ed85a59c750f73f494f2ea2497bfdca 100644 (file)
@@ -723,7 +723,7 @@ set g_balance_arc_beam_ammo 10
 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_damage 90
 set g_balance_arc_beam_degreespersegment 1
 set g_balance_arc_beam_distancepersegment 0
 set g_balance_arc_beam_falloff_halflifedist 0
index 6f0d42bf6b2f32986b09ce3ff722b7d293b8a88c..85296ad3287d3367060d890612557f53852e7f77 100644 (file)
@@ -208,7 +208,7 @@ void W_Arc_Beam_Think(void)
        }
 
        float burst = 0;
-       if(self.owner.BUTTON_ATCK2 || self.beam_bursting)
+       if(/*self.owner.BUTTON_ATCK2 || */self.beam_bursting)
        {
                if(!self.beam_bursting)
                        self.beam_bursting = TRUE;
@@ -1235,7 +1235,7 @@ void Ent_ReadArcBeam(float isnew)
                                self.beam_color = '1 0 1';
                                self.beam_alpha = 0.5;
                                self.beam_thickness = 8;
-                               self.beam_traileffect = particleeffectnum("nex_beam");
+                               self.beam_traileffect = FALSE;
                                self.beam_hiteffect = particleeffectnum("electro_lightning"); 
                                self.beam_hitlight[0] = 20;
                                self.beam_hitlight[1] = 1;