Merge branch 'master' into pending-release

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / mage.qc

diff --git a/qcsrc/common/monsters/monster/mage.qc b/qcsrc/common/monsters/monster/mage.qc
index 8cfa77e6535aa7dfe70925d12a58cb02b9bb4537..f3da794ba517834f3f42e1e66b0ffdabeacd5743 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qc
+++ b/qcsrc/common/monsters/monster/mage.qc
@@ -24,7 +24,6 @@ float autocvar_g_monster_mage_attack_teleport_chance = 0.2;
 float autocvar_g_monster_mage_attack_teleport_delay = 2;
 float autocvar_g_monster_mage_attack_teleport_random = 0.4;
 float autocvar_g_monster_mage_attack_teleport_random_range = 1200;
-float autocvar_g_monster_mage_heal_self;
 float autocvar_g_monster_mage_heal_allies;
 float autocvar_g_monster_mage_heal_minhealth;
 float autocvar_g_monster_mage_heal_range;
@@ -108,7 +107,6 @@ bool M_Mage_Defend_Heal_Check(entity this, entity targ)
                                        );
                }
                case 2: return (GetResource(targ, RES_ARMOR) < autocvar_g_balance_armor_regenstable);
-               case 3: return (GetResource(targ, RES_HEALTH) > 0);
        }
 
        return false;
@@ -254,11 +252,6 @@ void M_Mage_Defend_Heal(entity this)
                                                fx = EFFECT_ARMOR_REPAIR;
                                        }
                                        break;
-                               case 3:
-                                       float hp = ((it == this) ? autocvar_g_monster_mage_heal_self : autocvar_g_monster_mage_heal_allies);
-                                       TakeResource(it, RES_HEALTH, hp); // TODO: use regular damage functions? needs a way to bypass friendly fire checks
-                                       fx = EFFECT_RAGE;
-                                       break;
                        }
 
                        Send_Effect(fx, it.origin, '0 0 0', 1);