From 3c74ab1b6abb43bea30b50d13388837c89132502 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 30 Aug 2013 04:52:58 +1000 Subject: [PATCH] Decrease brute grenade projectile speed --- monsters.cfg | 4 ++-- qcsrc/common/monsters/monster/mage.qc | 28 ++++----------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/monsters.cfg b/monsters.cfg index fdc9b54a6..5d75fdcf7 100644 --- a/monsters.cfg +++ b/monsters.cfg @@ -4,8 +4,8 @@ set g_monster_brute_attack_grenade_damage 40 set g_monster_brute_attack_grenade_edgedamage 20 set g_monster_brute_attack_grenade_force 15 set g_monster_brute_attack_grenade_radius 200 -set g_monster_brute_attack_grenade_speed 1900 -set g_monster_brute_attack_grenade_speed_up 225 +set g_monster_brute_attack_grenade_speed 1400 +set g_monster_brute_attack_grenade_speed_up 150 set g_monster_brute_attack_uzi_bullets 3 set g_monster_brute_attack_uzi_chance 0.1 set g_monster_brute_attack_uzi_damage 10 diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc index 817cea7c7..e36cbf9bf 100644 --- a/qcsrc/common/monsters/monster/mage.qc +++ b/qcsrc/common/monsters/monster/mage.qc @@ -79,30 +79,10 @@ float friend_needshelp(entity e) switch(self.skin) { - case 0: - { - if(e.health < autocvar_g_balance_health_regenstable) - return TRUE; - break; - } - case 1: - { - if((e.ammo_cells && e.ammo_cells < g_pickup_cells_max) || (e.ammo_rockets && e.ammo_rockets < g_pickup_rockets_max) || (e.ammo_nails && e.ammo_nails < g_pickup_nails_max) || (e.ammo_shells && e.ammo_shells < g_pickup_shells_max)) - return TRUE; - break; - } - case 2: - { - if(e.armorvalue < autocvar_g_balance_armor_regenstable) - return TRUE; - break; - } - case 3: - { - if(e.health > 0) - return TRUE; - break; - } + case 0: return (e.health < autocvar_g_balance_health_regenstable); + case 1: return ((e.ammo_cells && e.ammo_cells < g_pickup_cells_max) || (e.ammo_rockets && e.ammo_rockets < g_pickup_rockets_max) || (e.ammo_nails && e.ammo_nails < g_pickup_nails_max) || (e.ammo_shells && e.ammo_shells < g_pickup_shells_max)); + case 2: return (e.armorvalue < autocvar_g_balance_armor_regenstable); + case 3: return (e.health > 0); } return FALSE; -- 2.39.2