From f53f86b403b905758f64063aee3d383ec054eb7d Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 30 Nov 2006 09:58:24 +0000 Subject: [PATCH] new settings: set g_balance_minstagib_nex_refire 1.0 set g_balance_minstagib_nex_animtime 0.3 to allow different settings for Minstagib and regular gameplay git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1953 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 2 ++ data/qcsrc/server/w_nex.qc | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index afa3e266e..b892ca855 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -494,6 +494,8 @@ set g_balance_crylink_secondary_ammo 3 set g_balance_nex_damage 140 set g_balance_nex_refire 1.5 set g_balance_nex_animtime 0.3 +set g_balance_minstagib_nex_refire 1.0 +set g_balance_minstagib_nex_animtime 0.3 set g_balance_nex_ammo 5 set g_balance_nex_respawntime_modifier 1 diff --git a/data/qcsrc/server/w_nex.qc b/data/qcsrc/server/w_nex.qc index 24b466297..e7cbef280 100644 --- a/data/qcsrc/server/w_nex.qc +++ b/data/qcsrc/server/w_nex.qc @@ -143,10 +143,23 @@ float(float req) w_nex = else if (req == WR_THINK) { if (self.button0) - if (weapon_prepareattack(0, cvar("g_balance_nex_refire"))) { - W_Nex_Attack(); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready); + if(cvar("g_minstagib")) + { + if (weapon_prepareattack(0, cvar("g_balance_minstagib_nex_refire"))) + { + W_Nex_Attack(); + weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_minstagib_nex_animtime"), w_ready); + } + } + else + { + if (weapon_prepareattack(0, cvar("g_balance_nex_refire"))) + { + W_Nex_Attack(); + weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready); + } + } } } else if (req == WR_SETUP) -- 2.39.2