From: Mario Date: Thu, 6 Nov 2014 11:16:37 +0000 (+1100) Subject: Some balance fixes for arc X-Git-Tag: xonotic-v0.8.0~152^2~18 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=485d669389047ff4f0f5b53f857d878dffec14ec;p=xonotic%2Fxonotic-data.pk3dir.git Some balance fixes for arc --- diff --git a/bal-wep-xonotic.cfg b/bal-wep-xonotic.cfg index 61e079346..3218141c8 100644 --- a/bal-wep-xonotic.cfg +++ b/bal-wep-xonotic.cfg @@ -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 diff --git a/qcsrc/common/weapons/w_arc.qc b/qcsrc/common/weapons/w_arc.qc index 6f0d42bf6..85296ad32 100644 --- a/qcsrc/common/weapons/w_arc.qc +++ b/qcsrc/common/weapons/w_arc.qc @@ -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;