X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fsv_turrets.qc;h=1a51bcc63f60eba414d296fad9752599be6077a0;hb=f70b6498d323bf8ee9bbdc9fe413ac1fbf94ccd8;hp=cb69bf0ff12ba7f2ec9c312e0af33002af6b9393;hpb=e87123e5fba23f7a8907e6fbab241c5eec5be168;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/sv_turrets.qc b/qcsrc/common/turrets/sv_turrets.qc
index cb69bf0ff..1a51bcc63 100644
--- a/qcsrc/common/turrets/sv_turrets.qc
+++ b/qcsrc/common/turrets/sv_turrets.qc
@@ -182,9 +182,10 @@ 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;
 
-	this.health			 = 0;
+	SetResourceExplicit(this, RES_HEALTH, 0);
 
 // Go boom
 	//RadiusDamage (this,this, min(this.ammo,50),min(this.ammo,50) * 0.25,250,NULL,min(this.ammo,50)*5,DEATH_TURRET,NULL);
@@ -212,7 +213,7 @@ void turret_die(entity this)
 	}
 }
 
-void turret_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
+void turret_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector vforce)
 {
 	// Enough already!
 	if(this.deadflag == DEAD_DEAD)
@@ -230,7 +231,7 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage,
 			return;
 	}
 
-	this.health -= damage;
+	TakeResource(this, RES_HEALTH, damage);
 
 	// thorw head slightly off aim when hit?
 	if (this.damage_flags & TFL_DMG_HEADSHAKE)
@@ -244,10 +245,12 @@ void turret_damage(entity this, entity inflictor, entity attacker, float damage,
 	if (this.turret_flags & TUR_FLAG_MOVE)
 		this.velocity = this.velocity + vforce;
 
-	if (this.health <= 0)
+	if (GetResource(this, RES_HEALTH) <= 0)
 	{
 		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 != RES_LIMIT_NONE) ? limit : targ.max_health);
+	if(GetResource(targ, RES_HEALTH) <= 0 || GetResource(targ, RES_HEALTH) >= true_limit)
+		return false;
+
+	GiveResourceWithLimit(targ, RES_HEALTH, amount, true_limit);
+	targ.SendFlags |= TNSF_STATUS;
+	return true;
+}
+
 void turret_think(entity this);
 void turret_respawn(entity this)
 {
@@ -268,10 +282,11 @@ 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;
-	this.health					= this.max_health;
+	SetResourceExplicit(this, RES_HEALTH, this.max_health);
 	this.enemy					= NULL;
 	this.volly_counter			= this.shot_volly;
 	this.ammo					= this.ammo_max;
@@ -313,9 +328,7 @@ bool turret_send(entity this, entity to, float sf)
 	{
 		WriteByte(MSG_ENTITY, this.m_id);
 
-		WriteCoord(MSG_ENTITY, this.origin_x);
-		WriteCoord(MSG_ENTITY, this.origin_y);
-		WriteCoord(MSG_ENTITY, this.origin_z);
+		WriteVector(MSG_ENTITY, this.origin);
 
 		WriteAngle(MSG_ENTITY, this.angles_x);
 		WriteAngle(MSG_ENTITY, this.angles_y);
@@ -335,13 +348,9 @@ bool turret_send(entity this, entity to, float sf)
 
 	if(sf & TNSF_MOVE)
 	{
-		WriteShort(MSG_ENTITY, rint(this.origin_x));
-		WriteShort(MSG_ENTITY, rint(this.origin_y));
-		WriteShort(MSG_ENTITY, rint(this.origin_z));
+		WriteVector(MSG_ENTITY, this.origin);
 
-		WriteShort(MSG_ENTITY, rint(this.velocity_x));
-		WriteShort(MSG_ENTITY, rint(this.velocity_y));
-		WriteShort(MSG_ENTITY, rint(this.velocity_z));
+		WriteVector(MSG_ENTITY, this.velocity);
 
 		WriteShort(MSG_ENTITY, rint(this.angles_y));
 	}
@@ -356,10 +365,10 @@ bool turret_send(entity this, entity to, float sf)
 	{
 		WriteByte(MSG_ENTITY, this.team);
 
-		if(this.health <= 0)
+		if(GetResource(this, RES_HEALTH) <= 0)
 			WriteByte(MSG_ENTITY, 0);
 		else
-			WriteByte(MSG_ENTITY, ceil((this.health / this.max_health) * 255));
+			WriteByte(MSG_ENTITY, ceil((GetResource(this, RES_HEALTH) / this.max_health) * 255));
 	}
 
 	return true;
@@ -390,7 +399,7 @@ void load_unit_settings(entity ent, bool is_reload)
 		ent.tur_head.angles = '0 0 0';
 	}
 
-	ent.health	 = cvar(strcat(sbase,"_health")) * ent.turret_scale_health;
+	SetResourceExplicit(ent, RES_HEALTH, cvar(strcat(sbase,"_health")) * ent.turret_scale_health);
 	ent.respawntime = cvar(strcat(sbase,"_respawntime")) * ent.turret_scale_respawn;
 
 	ent.shot_dmg		 = cvar(strcat(sbase,"_shot_dmg")) * ent.turret_scale_damage;
@@ -439,11 +448,11 @@ void turret_projectile_explode(entity this)
 	this.event_damage = func_null;
 #ifdef TURRET_DEBUG
 	float d;
-	d = RadiusDamage (this, this.owner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, NULL);
+	d = RadiusDamage (this, this.owner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL);
 	this.owner.tur_debug_dmg_t_h = this.owner.tur_debug_dmg_t_h + d;
 	this.owner.tur_debug_dmg_t_f = this.owner.tur_debug_dmg_t_f + this.owner.shot_dmg;
 #else
-	RadiusDamage (this, this.realowner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, NULL);
+	RadiusDamage (this, this.realowner, this.owner.shot_dmg, 0, this.owner.shot_radius, this, NULL, this.owner.shot_force, this.totalfrags, DMG_NOWEP, NULL);
 #endif
 	delete(this);
 }
@@ -454,18 +463,18 @@ void turret_projectile_touch(entity this, entity toucher)
 	turret_projectile_explode(this);
 }
 
-void turret_projectile_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector vforce)
+void turret_projectile_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, .entity weaponentity, vector hitloc, vector vforce)
 {
 	this.velocity  += vforce;
-	this.health	-= damage;
+	TakeResource(this, RES_HEALTH, damage);
 	//this.realowner = attacker; // Dont change realowner, it does not make much sense for turrets
-	if(this.health <= 0)
+	if(GetResource(this, RES_HEALTH) <= 0)
 		W_PrepareExplosionByDamage(this, this.owner, turret_projectile_explode);
 }
 
 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);
@@ -489,7 +498,7 @@ entity turret_projectile(entity actor, Sound _snd, float _size, float _health, f
 	PROJECTILE_MAKETRIGGER(proj);
 	if(_health)
 	{
-		proj.health		 = _health;
+		SetResourceExplicit(proj, RES_HEALTH, _health);
 		proj.takedamage	 = DAMAGE_YES;
 		proj.event_damage  = turret_projectile_damage;
 	}
@@ -679,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
@@ -707,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))
@@ -721,15 +731,17 @@ float turret_validate_target(entity e_turret, entity e_target, float validate_fl
 		return -5;
 
 	// Cant touch this
+	if (GetResource(e_target, RES_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 (e_target.health <= 0)
-		return -6;
-	else if(STAT(FROZEN, e_target) > 0)
-		return -6;
 
 	// player
 	if (IS_CLIENT(e_target))
@@ -949,10 +961,11 @@ bool turret_firecheck(entity this)
 	{
 		// To close?
 		if (this.tur_dist_aimpos < this.target_range_min)
+		{
 			if(turret_validate_target(this, this.tur_impactent, this.target_validate_flags) > 0)
 				return true; // Target of opertunity?
-			else
-				return false;
+			return false;
+		}
 	}
 
 	// Try to avoid FF?
@@ -1245,6 +1258,12 @@ void turret_initparams(entity tur)
 	#undef TRY
 }
 
+bool turret_closetotarget(entity this, vector targ, float range)
+{
+	vector path_extra_size = '1 1 1' * range;
+	return boxesoverlap(targ - path_extra_size, targ + path_extra_size, this.absmin - path_extra_size, this.absmax + path_extra_size);
+}
+
 void turret_findtarget(entity this)
 {
 	entity e = find(NULL, classname, "turret_manager");
@@ -1292,7 +1311,7 @@ bool turret_initialize(entity this, Turret tur)
 
 	if(!this.team || !teamplay)		{ this.team = FLOAT_MAX; }
 	if(!this.ticrate)				{ this.ticrate = ((this.turret_flags & TUR_FLAG_SUPPORT) ? 0.2 : 0.1); }
-	if(!this.health)				{ this.health = 1000; }
+	if(!GetResource(this, RES_HEALTH)) { SetResourceExplicit(this, RES_HEALTH, 1000); }
 	if(!this.shot_refire)			{ this.shot_refire = 1; }
 	if(!this.tur_shotorg)			{ this.tur_shotorg = '50 0 50'; }
 	if(!this.turret_flags)			{ this.turret_flags = TUR_FLAG_SPLASH | TUR_FLAG_MEDPROJ | TUR_FLAG_PLAYER; }
@@ -1349,7 +1368,7 @@ bool turret_initialize(entity this, Turret tur)
 	this.effects				= EF_NODRAW;
 	this.netname				= tur.turret_name;
 	this.ticrate				= bound(sys_frametime, this.ticrate, 60);
-	this.max_health				= this.health;
+	this.max_health				= GetResource(this, RES_HEALTH);
 	this.target_validate_flags	= this.target_select_flags;
 	this.ammo					= this.ammo_max;
 	this.ammo_recharge		   *= this.ticrate;
@@ -1360,6 +1379,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;