Decrease brute grenade projectile speed

diff --git a/monsters.cfg b/monsters.cfg
index fdc9b54a627f4a2d4fe34b1ef71b545b02d336b6..5d75fdcf735d0ec15d0a0f8db4cc6c4af61c8cf3 100644 (file)
--- 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 817cea7c764242afadec30cb0f155ee8893440ca..e36cbf9bf2111c6e28025b75bff001245d72cd7a 100644 (file)
--- 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;