X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fsv_turrets.qc;h=37fb5f0d524d78bc7b8180d049213ab407fd72da;hp=a02ce07aca2454367cacbc86cea4242fb6bf05b5;hb=62d736d8c3a51baf5fa3a4265e39a2b773704a91;hpb=ea08a566448645c9363cb429cd6b1bd9d95d470c

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index a02ce07ac..37fb5f0d5 100644
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -182,6 +182,7 @@ void turret_die(entity this)
 	this.tur_head.solid	 = this.solid;
 
 	this.event_damage		  = func_null;
+	this.event_heal = func_null;
 	this.takedamage			 = DAMAGE_NO;
 
 	SetResourceAmountExplicit(this, RESOURCE_HEALTH, 0);
@@ -248,6 +249,8 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage,
 	{
 		this.event_damage		  = func_null;
 		this.tur_head.event_damage = func_null;
+		this.event_heal = func_null;
+		this.tur_head.event_heal = func_null;
 		this.takedamage			 = DAMAGE_NO;
 		this.nextthink = time;
 		setthink(this, turret_die);
@@ -256,6 +259,17 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage,
 	this.SendFlags  |= TNSF_STATUS;
 }
 
+bool turret_heal(entity targ, entity inflictor, float amount, float limit)
+{
+	float true_limit = ((limit != RESOURCE_LIMIT_NONE) ? limit : targ.max_health);
+	if(GetResourceAmount(targ, RESOURCE_HEALTH) <= 0 || GetResourceAmount(targ, RESOURCE_HEALTH) >= true_limit)
+		return false;
+
+	GiveResourceWithLimit(targ, RESOURCE_HEALTH, amount, true_limit);
+	targ.SendFlags |= TNSF_STATUS;
+	return true;
+}
+
 void turret_think(entity this);
 void turret_respawn(entity this)
 {
@@ -268,6 +282,7 @@ void turret_respawn(entity this)
 	this.solid					= SOLID_BBOX;
 	this.takedamage 			= DAMAGE_AIM;
 	this.event_damage			= turret_damage;
+	this.event_heal 			= turret_heal;
 	this.avelocity				= '0 0 0';
 	this.tur_head.avelocity		= this.avelocity;
 	this.tur_head.angles		= this.idle_aim;
@@ -459,7 +474,7 @@ void turret_projectile_damage(entity this, entity inflictor, entity attacker, fl
 
 entity turret_projectile(entity actor, Sound _snd, float _size, float _health, float _death, float _proj_type, float _cull, float _cli_anim)
 {
-    TC(Sound, _snd);
+	TC(Sound, _snd);
 	entity proj;
 
 	sound (actor, CH_WEAPON_A, _snd, VOL_BASE, ATTEN_NORM);
@@ -673,6 +688,7 @@ void turret_track(entity this)
  + TFL_TARGETSELECT_LOS
  + TFL_TARGETSELECT_PLAYERS
  + TFL_TARGETSELECT_MISSILES
+ + TFL_TARGETSELECT_VEHICLES
  - TFL_TARGETSELECT_TRIGGERTARGET
  + TFL_TARGETSELECT_ANGLELIMITS
  + TFL_TARGETSELECT_RANGELIMITS
@@ -701,7 +717,7 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
 	if(!checkpvs(e_target.origin, e_turret))
 		return -1;
 
-	if(e_target.alpha <= 0.3)
+	if(e_target.alpha != 0 && e_target.alpha <= 0.3)
 		return -1;
 
 	if(MUTATOR_CALLHOOK(TurretValidateTarget, e_turret, e_target, validate_flags))
@@ -715,15 +731,17 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
 		return -5;
 
 	// Cant touch this
+	if (GetResourceAmount(e_target, RESOURCE_HEALTH) <= 0)
+		return -6;
+	else if (STAT(FROZEN, e_target))
+		return -6;
+
+	// vehicle
 	if(IS_VEHICLE(e_target))
 	{
-		if (e_target.vehicle_health <= 0)
-			return -6;
+		if ((validate_flags & TFL_TARGETSELECT_VEHICLES) && !e_target.owner)
+			return -7;
 	}
-	else if (GetResourceAmount(e_target, RESOURCE_HEALTH) <= 0)
-		return -6;
-	else if(STAT(FROZEN, e_target) > 0)
-		return -6;
 
 	// player
 	if (IS_CLIENT(e_target))
@@ -1360,6 +1378,7 @@ bool turret_initialize(entity this, Turret tur)
 	this.idle_aim 				= '0 0 0';
 	this.turret_firecheckfunc	= turret_firecheck;
 	this.event_damage			= turret_damage;
+	this.event_heal 			= turret_heal;
 	this.use					= turret_use;
 	this.bot_attack				= true;
 	this.nextthink				= time + 1;