]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Update config, plus better debug info
authorSamual Lenks <samual@xonotic.org>
Mon, 17 Feb 2014 05:46:56 +0000 (00:46 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 17 Feb 2014 05:46:56 +0000 (00:46 -0500)
bal-wep-xonotic.cfg
qcsrc/common/weapons/w_arc.qc

index e70f3cd06bbc6dbbd36ecf12b197727dba6cf00b..3b7b85c9aa2c691245c178ef6e20d7b86b4f00fd 100644 (file)
@@ -245,13 +245,17 @@ set g_balance_electro_weaponthrowable 1
 // {{{ #7: Arc
 set g_balance_arc_primary_ammo 0
 set g_balance_arc_primary_animtime 0
-set g_balance_arc_primary_damage 0
+set g_balance_arc_primary_damage 100
+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 0
-set g_balance_arc_primary_range 0
+set g_balance_arc_primary_maxangle 10
+set g_balance_arc_primary_range 700
 set g_balance_arc_primary_refire 0
+set g_balance_arc_primary_returnspeed 8
 set g_balance_arc_secondary_ammo 0
 set g_balance_arc_switchdelay_drop 0.3
 set g_balance_arc_switchdelay_raise 0.3
index c653203d2f7e28c8419570bd0c99cd20b4f35273..941082bbb1f4102b8796107e48966d7939170e33 100644 (file)
@@ -197,8 +197,8 @@ void W_Arc_Beam_Think(void)
 
        #ifdef ARC_DEBUG
        printf("segment count: %d\n", segments);
-       #endif
        float hit_something = FALSE;
+       #endif
        float segmentdist; // = WEP_CVAR_PRI(arc, range) / segments; // = vlen(self.beam_endpos - last_origin) * (1/segments);
        float segmentblend;// = (1/segments);
        vector last_origin = w_shotorg;
@@ -237,15 +237,18 @@ void W_Arc_Beam_Think(void)
 
                        #ifdef ARC_DEBUG
                        te_lightning1(self.lg_ents[i - 1], last_origin, trace_endpos);
-                       #endif
-
+                       te_customflash(trace_endpos, 80, 5, '1 0 0');
                        hit_something = TRUE;
+                       #endif
                        break; 
                }
                else if(trace_fraction != 1)
                {
                        // we collided with geometry
+                       #ifdef ARC_DEBUG
                        te_lightning1(self.lg_ents[i - 1], last_origin, trace_endpos);
+                       te_customflash(trace_endpos, 40, 2, '0 0 1');
+                       #endif
                        break;
                }
                else
@@ -257,14 +260,12 @@ void W_Arc_Beam_Think(void)
                }
        }
 
-       if(hit_something)
-       {
-               te_customflash(trace_endpos, 80, 5, '1 0 0');
-       }
-       else
+       #ifdef ARC_DEBUG
+       if(!hit_something)
        {
                te_customflash(trace_endpos, 40, 2, '1 1 1');
        }
+       #endif
 
        // draw effect
        /*if(w_shotorg != self.hook_start)