X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Fbuffs%2Fsv_buffs.qc;h=6994c81761ad8ac68f289516ea405eda1a75f7c4;hb=9e113dae328809b5e7432f434649a35ebb185a52;hp=925525f395a80e672113ff19e6f5768e81ac1d17;hpb=fb5876e8defeb6af31e62002be26bdfa2beb56a7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
index 925525f39..6994c8176 100644
--- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
+++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
@@ -424,12 +424,17 @@ void buff_Medic_Heal(entity this)
 {
 	FOREACH_CLIENT(IS_PLAYER(it) && it != this && vdist(it.origin - this.origin, <=, autocvar_g_buffs_medic_heal_range),
 	{
-		if(SAME_TEAM(it, this))
-		if(it.health < autocvar_g_balance_health_regenstable)
+		if (!SAME_TEAM(it, this))
 		{
-			Send_Effect(EFFECT_HEALING, it.origin, '0 0 0', 1);
-			it.health = bound(0, it.health + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable);
+			continue;
 		}
+		float hp = GetResourceAmount(it, RESOURCE_HEALTH);
+		if(hp >= autocvar_g_balance_health_regenstable)
+		{
+			continue;
+		}
+		Send_Effect(EFFECT_HEALING, it.origin, '0 0 0', 1);
+		SetResourceAmount(it, RESOURCE_HEALTH, bound(0, hp + autocvar_g_buffs_medic_heal_amount, autocvar_g_balance_health_regenstable));
 	});
 }
 
@@ -460,11 +465,11 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
 		frag_damage *= autocvar_g_buffs_speed_damage_take;
 
 	if(frag_target.buffs & BUFF_MEDIC.m_itemid)
-	if((frag_target.health - frag_damage) <= 0)
+	if((GetResourceAmount(frag_target, RESOURCE_HEALTH) - frag_damage) <= 0)
 	if(!ITEM_DAMAGE_NEEDKILL(frag_deathtype))
 	if(frag_attacker)
 	if(random() <= autocvar_g_buffs_medic_survive_chance)
-		frag_damage = max(5, frag_target.health - autocvar_g_buffs_medic_survive_health);
+		frag_damage = max(5, GetResourceAmount(frag_target, RESOURCE_HEALTH) - autocvar_g_buffs_medic_survive_health);
 
 	if(frag_target.buffs & BUFF_JUMP.m_itemid)
 	if(frag_deathtype == DEATH_FALL.m_id)
@@ -537,9 +542,15 @@ MUTATOR_HOOKFUNCTION(buffs, Damage_Calculate)
 	if(frag_target.takedamage)
 	if(DIFF_TEAM(frag_attacker, frag_target))
 	{
-		frag_attacker.health = bound(0, frag_attacker.health + bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal, frag_target.health), g_pickup_healthsmall_max);
-		if(frag_target.armorvalue)
-			frag_attacker.armorvalue = bound(0, frag_attacker.armorvalue + bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal, frag_target.armorvalue), g_pickup_armorsmall_max);
+		float amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
+			GetResourceAmount(frag_target, RESOURCE_HEALTH));
+		GiveResourceWithLimit(frag_attacker, RESOURCE_HEALTH, amount, g_pickup_healthsmall_max);
+		if (frag_target.armorvalue)
+		{
+			amount = bound(0, frag_damage * autocvar_g_buffs_vampire_damage_steal,
+				GetResourceAmount(frag_target, RESOURCE_ARMOR));
+			GiveResourceWithLimit(frag_attacker, RESOURCE_ARMOR, amount, g_pickup_armorsmall_max);
+		}
 	}
 
 	M_ARGV(4, float) = frag_damage;
@@ -739,7 +750,7 @@ MUTATOR_HOOKFUNCTION(buffs, OnEntityPreSpawn, CBC_ORDER_LAST)
 	switch(ent.classname)
 	{
 		case "item_strength":
-		case "item_invincible":
+		case "item_shield":
 		{
 			entity e = spawn();
 			buff_SpawnReplacement(e, ent);