consume more ammo for charging, hide the red circle completely if we dont use the...
authorFruitieX <fruitiex@gmail.com>
Tue, 4 Jan 2011 00:58:09 +0000 (02:58 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 4 Jan 2011 00:58:09 +0000 (02:58 +0200)
balanceXonotic.cfg
qcsrc/client/View.qc

index 9ec88a8..f306028 100644 (file)
@@ -475,7 +475,7 @@ set g_balance_nex_secondary_damage 0
 set g_balance_nex_secondary_force 0
 set g_balance_nex_secondary_refire 0
 set g_balance_nex_secondary_animtime 0
-set g_balance_nex_secondary_ammo 1
+set g_balance_nex_secondary_ammo 1.6
 set g_balance_nex_secondary_damagefalloff_mindist 0
 set g_balance_nex_secondary_damagefalloff_maxdist 0
 set g_balance_nex_secondary_damagefalloff_halflife 0
index 704e581..3a929f9 100644 (file)
@@ -959,15 +959,6 @@ void CSQC_UpdateView(float w, float h)
                                        rgb = eX * autocvar_crosshair_ring_nex_inner_color_red + eY * autocvar_crosshair_ring_nex_inner_color_green + eZ * autocvar_crosshair_ring_nex_inner_color_blue;
                                        DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", nex_chargepool, rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);
                                }
-                               else
-                               {
-                                       // indicate how much we're charging right now with an inner circle
-                                       a = autocvar_crosshair_ring_nex_inner_alpha;
-                                       nex_charge_movingavg = (1 - autocvar_crosshair_ring_nex_currentcharge_movingavg_rate) * nex_charge_movingavg + autocvar_crosshair_ring_nex_currentcharge_movingavg_rate * nex_charge;
-
-                                       rgb = eX * autocvar_crosshair_ring_nex_inner_color_red + eY * autocvar_crosshair_ring_nex_inner_color_green + eZ * autocvar_crosshair_ring_nex_inner_color_blue;
-                                       DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring_inner.tga", bound(0, autocvar_crosshair_ring_nex_currentcharge_scale * (nex_charge - nex_charge_movingavg), 1), rgb, wcross_alpha * a, DRAWFLAG_ADDITIVE);
-                               }
 
                                // draw the charge
                                a = autocvar_crosshair_ring_nex_outer_alpha;