X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_jumppads.qc;h=64dc74b9840b52524495488dd4a31685878ad7d3;hp=36048e860129a1d79030939b3d8c2238828a8062;hb=8ba8bed747f6303d3724c1aedb4be994b1e87455;hpb=57c5dfd12fc3f7ce7b2bc844325a2c85929f10de

diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 36048e8601..64dc74b984 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -10,7 +10,7 @@ float trigger_push_calculatevelocity_flighttime;
 
 void trigger_push_use()
 {
-	if(teams_matter)
+	if(teamplay)
 		self.team = activator.team;
 }
 
@@ -127,21 +127,12 @@ vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
 
 void trigger_push_touch()
 {
-	if (self.active == ACTIVE_NOT) 
-		return;		
-		
-	// FIXME: add a .float for whether an entity should be tossed by jumppads
-	if (!other.iscreature)
-	if (other.classname != "corpse")
-	if (other.classname != "body")
-	if (other.classname != "gib")
-	if (other.classname != "casing")
-	if (other.classname != "droppedweapon")
-	if (other.classname != "keepawayball")
-	if (!other.projectiledeathtype || other.classname == "bullet")
+	vector move;
+
+	if (self.active == ACTIVE_NOT)
 		return;
 
-	if (other.deadflag && other.iscreature)
+	if (!isPushable(other))
 		return;
 
 	if(self.team)
@@ -150,13 +141,30 @@ void trigger_push_touch()
 
 	EXACTTRIGGER_TOUCH;
 
-	if(self.target)
-		self.movedir = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+	if(self.enemy)
+	{
+		other.velocity = trigger_push_calculatevelocity(other.origin, self.enemy, self.height);
+	}
+	else if(self.target)
+	{
+		entity e;
+		RandomSelection_Init();
+		for(e = world; (e = find(e, targetname, self.target)); )
+		{
+			if(e.cnt)
+				RandomSelection_Add(e, 0, string_null, e.cnt, 1);
+			else
+				RandomSelection_Add(e, 0, string_null, 1, 1);
+		}
+		other.velocity = trigger_push_calculatevelocity(other.origin, RandomSelection_chosen_ent, self.height);
+	}
+	else
+	{
+		other.velocity = self.movedir;
+	}
 
 	other.flags &~= FL_ONGROUND;
 
-	other.velocity = self.movedir;
-
 	if (other.classname == "player")
 	{
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
@@ -166,12 +174,12 @@ void trigger_push_touch()
 		{
 			// flash when activated
 			pointparticles(particleeffectnum("jumppad_activate"), other.origin, other.velocity, 1);
-			sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);
+			sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
 			self.pushltime = time + 0.2;
 		}
 		local float ct;
 		ct = clienttype(other);
-		if( ct == CLIENTTYPE_REAL)
+		if( ct == CLIENTTYPE_REAL || ct == CLIENTTYPE_BOT)
 		{
 			local float i;
 			local float found;
@@ -185,11 +193,22 @@ void trigger_push_touch()
 				other.jumppadcount = other.jumppadcount + 1;
 			}
 
-			if(self.message)
-				centerprint(other, self.message);
+			if(ct == CLIENTTYPE_REAL)
+			{
+				if(self.message)
+					centerprint(other, self.message);
+			}
+			else
+				other.lastteleporttime = time;
+
+			if (!other.animstate_override)
+			{
+				if (other.crouch)
+					setanim(other, other.anim_duckjump, FALSE, TRUE, TRUE);
+				else
+					setanim(other, other.anim_jump, FALSE, TRUE, TRUE);
+			}
 		}
-		else if(ct == CLIENTTYPE_BOT)
-			other.lastteleporttime = time;
 		else
 			other.jumppadcount = TRUE;
 
@@ -235,7 +254,7 @@ void trigger_push_touch()
 .vector dest;
 void trigger_push_findtarget()
 {
-	local entity e;
+	local entity e, t;
 	local vector org;
 	local float flighttime;
 
@@ -245,31 +264,48 @@ void trigger_push_findtarget()
 
 	if (self.target)
 	{
-		// find the target
-		self.enemy = find(world, targetname, self.target);
-		if (!self.enemy)
+		float n;
+		n = 0;
+		for(t = world; (t = find(t, targetname, self.target)); )
 		{
-			objerror("trigger_push: target not found\n");
-			remove(self);
-			return;
+			++n;
+			e = spawn();
+			setorigin(e, org);
+			setsize(e, PL_MIN, PL_MAX);
+			e.velocity = trigger_push_calculatevelocity(org, t, self.height);
+			tracetoss(e, e);
+			if(e.movetype == MOVETYPE_NONE)
+				waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity));
+			remove(e);
 		}
 
-		self.movedir = trigger_push_calculatevelocity(org, self.enemy, self.height);
-		flighttime = trigger_push_calculatevelocity_flighttime;
+		if(n == 0)
+		{
+			// no dest!
+			objerror ("Jumppad with nonexistant target");
+			return;
+		}
+		else if(n == 1)
+		{
+			// exactly one dest - bots love that
+			self.enemy = find(e, targetname, self.target);
+		}
+		else
+		{
+			// have to use random selection every single time
+			self.enemy = world;
+		}
 	}
 	else
-		flighttime = 0;
-
-	// calculate the destination and spawn a teleporter spawnfunc_waypoint
-	e = spawn();
-	setorigin(e, org);
-	setsize(e, PL_MIN, PL_MAX);
-	e.velocity = self.movedir;
-	tracetoss(e, e);
-	self.dest = trace_endpos;
-	remove(e);
-
-	waypoint_spawnforteleporter(self, self.dest, flighttime);
+	{
+		e = spawn();
+		setorigin(e, org);
+		setsize(e, PL_MIN, PL_MAX);
+		e.velocity = self.movedir;
+		tracetoss(e, e);
+		waypoint_spawnforteleporter(self, trace_endpos, vlen(trace_endpos - org) / vlen(e.velocity));
+		remove(e);
+	}
 };
 
 /*
@@ -289,8 +325,8 @@ void spawnfunc_trigger_push()
 	SetMovedir ();
 
 	EXACTTRIGGER_INIT;
-	
-	self.active = ACTIVE_ACTIVE;	
+
+	self.active = ACTIVE_ACTIVE;
 	self.use = trigger_push_use;
 	self.touch = trigger_push_touch;