From 2723c198edcbe2200be63a7b40df8be555fb2497 Mon Sep 17 00:00:00 2001 From: Martin Taibr Date: Tue, 3 Jul 2018 12:03:39 +0200 Subject: [PATCH] wip bullet weak --- effectinfo.txt | 19 +++++++++++++++++++ qcsrc/common/effects/all.inc | 1 + qcsrc/common/weapons/weapon/shotgun.qc | 8 ++++---- qcsrc/server/weapons/tracing.qc | 12 ++++++++++++ 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/effectinfo.txt b/effectinfo.txt index 953526145..085f729ab 100644 --- a/effectinfo.txt +++ b/effectinfo.txt @@ -8272,3 +8272,22 @@ effect arc_bolt_explode tex 40 40 velocityjitter 224 224 224 velocityoffset 0 0 80 +//effect tr_bullet_weak +// type beam +// alpha 150 200 1000 +// color 0xf03000 0xff6010 +// countabsolute 1 +// sizeincrease -3 +// size 0.6 0.8 +// tex 200 200 +effect tr_bullet_weak + type smoke + airfriction -4 + alpha 256 256 350 + color 0x202020 0x404040 + notunderwater + sizeincrease 0.400000 + size 1 2 + tex 0 8 + trailspacing 16 + velocityjitter 4 4 4 diff --git a/qcsrc/common/effects/all.inc b/qcsrc/common/effects/all.inc index 6439a49bb..7a58757ae 100644 --- a/qcsrc/common/effects/all.inc +++ b/qcsrc/common/effects/all.inc @@ -229,6 +229,7 @@ EFFECT(0, SMOKING, "smoking") EFFECT(0, SMOKE_RING, "smoke_ring") EFFECT(0, JUMPPAD, "jumppad_activate") EFFECT(1, BULLET, "tr_bullet") +EFFECT(1, BULLET_WEAK, "tr_bullet_weak") EFFECT(0, EF_FLAME, "EF_FLAME") EFFECT(0, EF_STARDUST, "EF_STARDUST") EFFECT(0, TE_EXPLOSION, "TE_EXPLOSION") diff --git a/qcsrc/common/weapons/weapon/shotgun.qc b/qcsrc/common/weapons/weapon/shotgun.qc index 8c37e7c60..1ee969bb8 100644 --- a/qcsrc/common/weapons/weapon/shotgun.qc +++ b/qcsrc/common/weapons/weapon/shotgun.qc @@ -160,7 +160,7 @@ void W_Shotgun_Attack3_Frame2(Weapon thiswep, entity actor, .entity weaponentity WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, force), - EFFECT_BULLET); // actually is secondary, but we trick the last shot into playing full reload sound + EFFECT_BULLET_WEAK); // actually is secondary, but we trick the last shot into playing full reload sound weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_SEC(shotgun, alt_animtime), w_ready); } void W_Shotgun_Attack3_Frame1(Weapon thiswep, entity actor, .entity weaponentity, int fire) @@ -180,7 +180,7 @@ void W_Shotgun_Attack3_Frame1(Weapon thiswep, entity actor, .entity weaponentity WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, force), - EFFECT_BULLET); + EFFECT_BULLET_WEAK); weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_SEC(shotgun, alt_animtime), W_Shotgun_Attack3_Frame2); } @@ -218,7 +218,7 @@ METHOD(Shotgun, wr_think, void(entity thiswep, entity actor, .entity weaponentit WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, force), - EFFECT_BULLET); + EFFECT_BULLET_WEAK); actor.(weaponentity).shotgun_primarytime = time + WEP_CVAR_PRI(shotgun, refire) * W_WeaponRateFactor(actor); weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_PRI(shotgun, animtime), w_ready); } @@ -237,7 +237,7 @@ METHOD(Shotgun, wr_think, void(entity thiswep, entity actor, .entity weaponentit WEP_CVAR_PRI(shotgun, spread), WEP_CVAR_PRI(shotgun, solidpenetration), WEP_CVAR_PRI(shotgun, force), - EFFECT_BULLET); + EFFECT_BULLET_WEAK); actor.(weaponentity).shotgun_primarytime = time + WEP_CVAR_SEC(shotgun, alt_refire) * W_WeaponRateFactor(actor); weapon_thinkf(actor, weaponentity, WFRAME_FIRE1, WEP_CVAR_SEC(shotgun, alt_animtime), W_Shotgun_Attack3_Frame1); } diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 5d35166aa..0216a7623 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -336,6 +336,7 @@ void fireBullet_trace_callback(vector start, vector hit, vector end) fireBullet_last_hit = NULL; } +int autocvar_eff; void fireBullet(entity this, .entity weaponentity, vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, entity tracer_effects) { vector end; @@ -344,6 +345,17 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo end = start + dir * max_shot_distance; fireBullet_last_hit = NULL; + + if (autocvar_eff == 1) { + tracer_effects = EFFECT_RIFLE; + } else if (autocvar_eff == 2) { + tracer_effects = EFFECT_RIFLE_WEAK; + } else if (autocvar_eff == 3) { + tracer_effects = EFFECT_BULLET; + } else if (autocvar_eff == 4) { + tracer_effects = EFFECT_BULLET_WEAK; + } + fireBullet_trace_callback_eff = tracer_effects; float solid_penetration_left = 1; -- 2.39.2