From 485b840d90ea8c995564646a0abf08afe31324ed Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 28 Feb 2013 00:06:56 +1100 Subject: [PATCH] Add seeker_mode to ammo checks. Increase seeker flac ammo to 1. Fixes bug 1398 --- mutator_new_toys.cfg | 2 +- qcsrc/server/w_seeker.qc | 26 ++++++++++++++++++++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/mutator_new_toys.cfg b/mutator_new_toys.cfg index 7b4a9ab9f..07d349324 100644 --- a/mutator_new_toys.cfg +++ b/mutator_new_toys.cfg @@ -107,7 +107,7 @@ set g_balance_rifle_reload_time 2 // }}} // {{{ seeker set g_balance_seeker_type 0 // 0 = old seeker, 1 = new seeker -set g_balance_seeker_flac_ammo 0.5 +set g_balance_seeker_flac_ammo 1 set g_balance_seeker_flac_animtime 0.1 set g_balance_seeker_flac_damage 15 set g_balance_seeker_flac_edgedamage 10 diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc index cd9088e03..a9d8e3a65 100644 --- a/qcsrc/server/w_seeker.qc +++ b/qcsrc/server/w_seeker.qc @@ -598,14 +598,32 @@ float w_seeker(float req) } else if (req == WR_CHECKAMMO1) { - ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_missile_ammo; - ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_missile_ammo; + if (autocvar_g_balance_seeker_type == 1) + { + ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_missile_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_missile_ammo; + } + else + { + ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo; + } + return ammo_amount; } else if (req == WR_CHECKAMMO2) { - ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo; - ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo; + if (autocvar_g_balance_seeker_type == 1) + { + ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_tag_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_tag_ammo; + } + else + { + ammo_amount = self.ammo_rockets >= autocvar_g_balance_seeker_flac_ammo; + ammo_amount += self.(weapon_load[WEP_SEEKER]) >= autocvar_g_balance_seeker_flac_ammo; + } + return ammo_amount; } else if (req == WR_RELOAD) -- 2.39.2