From 3a234f16cd5087efe530c593dcc19b7c8c4d4647 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Mon, 4 Oct 2010 19:24:57 +0300 Subject: [PATCH] rifle ring with the new function --- defaultXonotic.cfg | 8 +++---- gfx/crosshair_ring.tga | Bin 0 -> 58171 bytes gfx/nex_ring.tga | Bin 57475 -> 0 bytes qcsrc/client/Defs.qc | 2 ++ qcsrc/client/Main.qc | 4 ++++ qcsrc/client/View.qc | 47 +++++++++++++++----------------------- qcsrc/common/constants.qh | 1 + qcsrc/server/cl_client.qc | 8 +++++++ 8 files changed, 36 insertions(+), 34 deletions(-) create mode 100644 gfx/crosshair_ring.tga delete mode 100644 gfx/nex_ring.tga diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 8a23a83e6..946d0a440 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -185,7 +185,6 @@ seta crosshair_campingrifle_color_green 0.5 "crosshair color green component to seta crosshair_campingrifle_color_blue 0.25 "crosshair color blue component to display when wielding the campingrifle" seta crosshair_campingrifle_color_alpha 1 "crosshair alpha value to display when wielding the campingrifle" seta crosshair_campingrifle_size 0.65 "crosshair size when wielding the campingrifle" -seta crosshair_campingrifle_ring_size 1.5 "bullet counter ring size around campingrifle crosshair, multiple of crosshair_campingrifle_size" seta crosshair_tuba "" "crosshair to display when wielding the tuba" seta crosshair_tuba_color_red 0.85 "crosshair color red component to display when wielding the tuba" seta crosshair_tuba_color_green 0.5 "crosshair color green component to display when wielding the tuba" @@ -198,10 +197,9 @@ seta crosshair_fireball_color_green 1.0 "crosshair color green component to disp seta crosshair_fireball_color_blue 0.2 "crosshair color blue component to display when wielding the fireball" seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball" seta crosshair_fireball_size 1 "crosshair size when wielding the fireball" -seta crosshair_nexvelocity_color_red 0.8 -seta crosshair_nexvelocity_color_green 0 -seta crosshair_nexvelocity_color_blue 0 -seta crosshair_nexvelocity_alpha 0.25 +seta crosshair_ring_size 3 "bullet counter ring size for Rifle, velocity ring for Nex" +seta crosshair_campingrifle_bulletcounter_alpha 0.15 +seta crosshair_nexvelocity_alpha 0.15 seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)" seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha" seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha" diff --git a/gfx/crosshair_ring.tga b/gfx/crosshair_ring.tga new file mode 100644 index 0000000000000000000000000000000000000000..970ba1562c179bbf58dc4d6fd853505dea5aaae6 GIT binary patch literal 58171 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 ZKmR}f{D1#nU;BT*|Ih#DfBSmz{{wWH+baM7 diff --git a/qcsrc/client/Defs.qc b/qcsrc/client/Defs.qc index 1bd911aaf..4e5380f33 100644 --- a/qcsrc/client/Defs.qc +++ b/qcsrc/client/Defs.qc @@ -263,3 +263,5 @@ float nex_scope; float nex_minvelocity; float nex_maxvelocity; + +float cr_maxbullets; diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc index 27b9284cd..9feef58cc 100644 --- a/qcsrc/client/Main.qc +++ b/qcsrc/client/Main.qc @@ -1356,6 +1356,10 @@ float CSQC_Parse_TempEntity() nex_maxvelocity = ReadShort(); bHandled = true; break; + case TE_CSQC_CR_MAXBULLETS: + cr_maxbullets = ReadByte(); + bHandled = true; + break; default: // No special logic for this temporary entity; return 0 so the engine can handle it bHandled = false; diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 6fc94ca43..89681c32a 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -697,24 +697,6 @@ void CSQC_UpdateView(float w, float h) if(cvar("viewsize") < 120) CSQC_common_hud(); - - // ring around crosshair representing velocity-dependent damage for the nex - if (activeweapon == WEP_NEX) - { - float f, a, curvel; - vector rgb; - - rgb_x = cvar("crosshair_nexvelocity_color_red"); - rgb_y = cvar("crosshair_nexvelocity_color_green"); - rgb_z = cvar("crosshair_nexvelocity_color_blue"); - a = cvar("crosshair_nexvelocity_alpha"); - - curvel = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y); - f = bound(0, (curvel - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1); - - DrawCircleClippedPic('0.5 0 0' * vid_conwidth + '0 0.5 0' * vid_conheight, 0.1 * vid_conheight, "gfx/nex_ring.tga", f, rgb, a, DRAWFLAG_ADDITIVE); - } - // crosshair goes VERY LAST if(!scoreboard_active && !camera_active && intermission != 2) { // TrueAim check @@ -842,17 +824,28 @@ void CSQC_UpdateView(float w, float h) wcross_scale *= 1 - cvar("_menu_alpha"); wcross_alpha *= 1 - cvar("_menu_alpha"); + ring_scale = cvar("crosshair_ring_size"); + + float f, a; + wcross_size = drawgetimagesize(wcross_name) * wcross_scale; // ring around crosshair representing bullets left in camping rifle clip - if (activeweapon == WEP_CAMPINGRIFLE) + if (activeweapon == WEP_CAMPINGRIFLE && cr_maxbullets) { - ring_scale = cvar("crosshair_campingrifle_ring_size"); - bullets = bound(0, getstati(STAT_BULLETS_LOADED), 4); + bullets = getstati(STAT_BULLETS_LOADED); + a = cvar("crosshair_campingrifle_bulletcounter_alpha"); + f = bound(0, bullets / cr_maxbullets, 1); + + DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE); } - else - bullets = 0; + else if (activeweapon == WEP_NEX) // ring around crosshair representing velocity-dependent damage for the nex + { + float curvel; + a = cvar("crosshair_nexvelocity_alpha"); + curvel = vlen('1 0 0' * pmove_vel_x + '0 1 0' * pmove_vel_y); + f = bound(0, (curvel - nex_minvelocity) / (nex_maxvelocity - nex_minvelocity), 1); -#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \ - drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL) + DrawCircleClippedPic(wcross_origin, wcross_size_x * ring_scale, "gfx/crosshair_ring.tga", f, wcross_color, wcross_alpha * a, DRAWFLAG_ADDITIVE); + } #define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \ do \ @@ -889,10 +882,6 @@ void CSQC_UpdateView(float w, float h) } wcross_size = drawgetimagesize(wcross_name) * wcross_scale; - if(bullets) - { - CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha); - } CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f); wcross_name_alpha_goal_prev = f; } diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index ddd24ed6b..6c16097fc 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -62,6 +62,7 @@ const float TE_CSQC_WEAPONCOMPLAIN = 113; const float TE_CSQC_CAMPINGRIFLE_SCOPE = 115; const float TE_CSQC_NEX_SCOPE = 116; const float TE_CSQC_NEX_VELOCITY = 117; +const float TE_CSQC_CR_MAXBULLETS = 118; const float RACE_NET_CHECKPOINT_HIT_QUALIFYING = 0; // byte checkpoint, short time, short recordtime, string recordholder const float RACE_NET_CHECKPOINT_CLEAR = 1; diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc index d5ffae1e5..c601d92cd 100644 --- a/qcsrc/server/cl_client.qc +++ b/qcsrc/server/cl_client.qc @@ -14,6 +14,13 @@ void send_CSQC_nexvelocity(entity e) { WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_maxspeed")); } +void send_CSQC_cr_maxbullets(entity e) { + msg_entity = e; + WriteByte(MSG_ONE, SVC_TEMPENTITY); + WriteByte(MSG_ONE, TE_CSQC_CR_MAXBULLETS); + WriteByte(MSG_ONE, cvar("g_balance_campingrifle_magazinecapacity")); +} + void Announce(string snd) { WriteByte(MSG_ALL, SVC_TEMPENTITY); WriteByte(MSG_ALL, TE_CSQC_ANNOUNCE); @@ -1607,6 +1614,7 @@ void ClientConnect (void) send_CSQC_teamnagger(); send_CSQC_nexvelocity(self); + send_CSQC_cr_maxbullets(self); CheatInitClient(); } -- 2.39.2