From 1c14bb2958446dcec3247e14f31a3561135a9a97 Mon Sep 17 00:00:00 2001 From: FruitieX Date: Wed, 13 Oct 2010 11:47:41 +0300 Subject: [PATCH] campingrifle secondary now a "stealth" version of the primary: less damage, no tracer --- balance25.cfg | 3 ++- balanceLeeStricklin.cfg | 3 ++- balanceNexSVN.cfg | 3 ++- balanceSamual.cfg | 3 ++- balanceXonotic.cfg | 17 +++++++++-------- qcsrc/server/w_campingrifle.qc | 5 ++++- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/balance25.cfg b/balance25.cfg index a1c7f05b8..8e387d32d 100644 --- a/balance25.cfg +++ b/balance25.cfg @@ -562,7 +562,7 @@ set g_balance_campingrifle_magazinecapacity 8 set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0 -set g_balance_campingrifle_tracer 0 +set g_balance_campingrifle_primary_tracer 0 set g_balance_campingrifle_primary_damage 60 set g_balance_campingrifle_primary_headshotaddeddamage 100 set g_balance_campingrifle_primary_spread 0 @@ -576,6 +576,7 @@ set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu set g_balance_campingrifle_primary_burstcost 0 set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot set g_balance_campingrifle_secondary 1 +set g_balance_campingrifle_secondary_tracer 0 set g_balance_campingrifle_secondary_damage 35 set g_balance_campingrifle_secondary_headshotaddeddamage 15 // 50 damage only on head set g_balance_campingrifle_secondary_spread 0.008 diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg index 3abe913a3..15210b6c1 100644 --- a/balanceLeeStricklin.cfg +++ b/balanceLeeStricklin.cfg @@ -573,7 +573,7 @@ set g_balance_campingrifle_magazinecapacity 8 set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries -set g_balance_campingrifle_tracer 1 +set g_balance_campingrifle_primary_tracer 0 set g_balance_campingrifle_primary_damage 75 set g_balance_campingrifle_primary_headshotaddeddamage 90 set g_balance_campingrifle_primary_spread 0 @@ -587,6 +587,7 @@ set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu set g_balance_campingrifle_primary_burstcost 0 // require same cooldown as secondary, note it's smaller than primary refire time set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot set g_balance_campingrifle_secondary 1 +set g_balance_campingrifle_secondary_tracer 0 set g_balance_campingrifle_secondary_damage 40 set g_balance_campingrifle_secondary_headshotaddeddamage 20 set g_balance_campingrifle_secondary_spread 0.008 diff --git a/balanceNexSVN.cfg b/balanceNexSVN.cfg index 0afc3f412..729a07a78 100644 --- a/balanceNexSVN.cfg +++ b/balanceNexSVN.cfg @@ -561,7 +561,7 @@ set g_balance_campingrifle_magazinecapacity 0 set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries -set g_balance_campingrifle_tracer 1 +set g_balance_campingrifle_primary_tracer 0 set g_balance_campingrifle_primary_damage 50 set g_balance_campingrifle_primary_headshotaddeddamage 50 set g_balance_campingrifle_primary_spread 0 @@ -575,6 +575,7 @@ set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time set g_balance_campingrifle_primary_bullethail 0 set g_balance_campingrifle_secondary 1 +set g_balance_campingrifle_secondary_tracer 0 set g_balance_campingrifle_secondary_damage 15 set g_balance_campingrifle_secondary_headshotaddeddamage 25 set g_balance_campingrifle_secondary_spread 0.02 diff --git a/balanceSamual.cfg b/balanceSamual.cfg index d055761d1..db66acf61 100644 --- a/balanceSamual.cfg +++ b/balanceSamual.cfg @@ -562,7 +562,7 @@ set g_balance_campingrifle_magazinecapacity 0 set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0.85 // 0.35 - 0.1 + 0.35 - 0.1 + 0.35 = three secondaries -set g_balance_campingrifle_tracer 1 +set g_balance_campingrifle_primary_tracer 0 set g_balance_campingrifle_primary_damage 50 set g_balance_campingrifle_primary_headshotaddeddamage 50 set g_balance_campingrifle_primary_spread 0 @@ -576,6 +576,7 @@ set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu set g_balance_campingrifle_primary_burstcost 0.35 // require same cooldown as secondary, note it's smaller than primary refire time set g_balance_campingrifle_primary_bullethail 0 set g_balance_campingrifle_secondary 1 +set g_balance_campingrifle_secondary_tracer 0 set g_balance_campingrifle_secondary_damage 15 set g_balance_campingrifle_secondary_headshotaddeddamage 25 set g_balance_campingrifle_secondary_spread 0.02 diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg index 8abc58a01..0dfe80d55 100644 --- a/balanceXonotic.cfg +++ b/balanceXonotic.cfg @@ -562,7 +562,7 @@ set g_balance_campingrifle_magazinecapacity 8 // make it pretty much useless in set g_balance_campingrifle_reloadtime 2 // matches reload anim set g_balance_campingrifle_auto_reload_after_changing_weapons 0 set g_balance_campingrifle_bursttime 0 -set g_balance_campingrifle_tracer 1 +set g_balance_campingrifle_primary_tracer 1 set g_balance_campingrifle_primary_damage 75 set g_balance_campingrifle_primary_headshotaddeddamage 75 set g_balance_campingrifle_primary_spread 0 @@ -576,14 +576,15 @@ set g_balance_campingrifle_primary_bulletconstant 130 // 56.3qu set g_balance_campingrifle_primary_burstcost 0 set g_balance_campingrifle_primary_bullethail 0 // empty magazine on shot set g_balance_campingrifle_secondary 1 -set g_balance_campingrifle_secondary_damage 25 -set g_balance_campingrifle_secondary_headshotaddeddamage 25 // 50 damage only on head -set g_balance_campingrifle_secondary_spread 0.008 -set g_balance_campingrifle_secondary_force 1 -set g_balance_campingrifle_secondary_speed 20000 +set g_balance_campingrifle_secondary_tracer 0 +set g_balance_campingrifle_secondary_damage 50 +set g_balance_campingrifle_secondary_headshotaddeddamage 50 // 50 damage only on head +set g_balance_campingrifle_secondary_spread 0 +set g_balance_campingrifle_secondary_force 2 +set g_balance_campingrifle_secondary_speed 30000 set g_balance_campingrifle_secondary_lifetime 5 -set g_balance_campingrifle_secondary_refire 0.15 -set g_balance_campingrifle_secondary_animtime 0.1 +set g_balance_campingrifle_secondary_refire 1.5 +set g_balance_campingrifle_secondary_animtime 1.4 set g_balance_campingrifle_secondary_ammo 10 set g_balance_campingrifle_secondary_bulletconstant 130 // 18.3qu set g_balance_campingrifle_secondary_burstcost 0 diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc index 1cd280e00..4e2e51816 100644 --- a/qcsrc/server/w_campingrifle.qc +++ b/qcsrc/server/w_campingrifle.qc @@ -96,7 +96,10 @@ void W_CampingRifle_FireBullet(float pSpread, float pDamage, float pHeadshotAdde w_shotorg = self.origin + self.view_ofs + ((w_shotorg - self.origin - self.view_ofs) * v_forward) * v_forward; } - fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant); + if(deathtype & HITTYPE_SECONDARY) + fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_primary_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant); + else + fireBallisticBullet(w_shotorg, w_shotdir, pSpread, pSpeed, pLifetime, pDamage, pHeadshotAddedDamage / pDamage, pForce, deathtype, (cvar("g_balance_campingrifle_secondary_tracer") ? EF_RED : EF_BLUE), 1, pBulletConstant); endFireBallisticBullet(); if (cvar("g_casings") >= 2) -- 2.39.2