X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_triggers.qc;h=17ee369d849962486008c1fb62365d14ac13dd31;hp=44782894424346d5a5cfa4e2ff5f834dc15f87d0;hb=938a786f33de31829fc81002ad9a8abf56b548da;hpb=3e038ba4b415bb32cd6242b9cd31e05ca4e03031

diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc
index 447828944..17ee369d8 100644
--- a/qcsrc/server/g_triggers.qc
+++ b/qcsrc/server/g_triggers.qc
@@ -416,6 +416,10 @@ void trigger_hurt_touch()
 	if (self.active != ACTIVE_ACTIVE) 
 		return;
 
+	if(self.team)
+		if((self.spawnflags & 4 == 0) == (self.team != other.team))
+			return;
+
 	// only do the EXACTTRIGGER_TOUCH checks when really needed (saves some cpu)
 	if (other.iscreature)
 	{
@@ -512,7 +516,7 @@ void trigger_heal_touch()
 			if (other.health < self.max_health)
 			{
 				other.health = min(other.health + self.health, self.max_health);
-				other.pauserothealth_finished = max(other.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));
+				other.pauserothealth_finished = max(other.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot);
 				sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);
 			}
 		}
@@ -652,31 +656,111 @@ void spawnfunc_trigger_gravity()
 
 // TODO add a way to do looped sounds with sound(); then complete this entity
 .float volume, atten;
-void target_speaker_use() {sound(self, CHAN_TRIGGER, self.noise, VOL_BASE * self.volume, self.atten);}
+void target_speaker_use_off();
+void target_speaker_use_activator()
+{
+	if(clienttype(activator) != CLIENTTYPE_REAL)
+		return;
+	string snd;
+	if(substring(self.noise, 0, 1) == "*")
+	{
+		var .string sample;
+		sample = GetVoiceMessageSampleField(substring(self.noise, 1, -1));
+		if(GetPlayerSoundSampleField_notFound)
+			snd = "misc/null.wav";
+		else if(activator.sample == "")
+			snd = "misc/null.wav";
+		else
+		{
+			tokenize_console(activator.sample);
+			n = stof(argv(1));
+			if(n > 0)
+				snd = strcat(argv(0), ftos(floor(random() * n + 1)), ".wav"); // randomization
+			else
+				snd = strcat(argv(0), ".wav"); // randomization
+		}
+	}
+	else
+		snd = self.noise;
+	msg_entity = activator;
+	soundto(MSG_ONE, self, CHAN_TRIGGER, snd, VOL_BASE * self.volume, self.atten);
+}
+void target_speaker_use_on()
+{
+	string snd;
+	if(substring(self.noise, 0, 1) == "*")
+	{
+		var .string sample;
+		sample = GetVoiceMessageSampleField(substring(self.noise, 1, -1));
+		if(GetPlayerSoundSampleField_notFound)
+			snd = "misc/null.wav";
+		else if(activator.sample == "")
+			snd = "misc/null.wav";
+		else
+		{
+			tokenize_console(activator.sample);
+			n = stof(argv(1));
+			if(n > 0)
+				snd = strcat(argv(0), ftos(floor(random() * n + 1)), ".wav"); // randomization
+			else
+				snd = strcat(argv(0), ".wav"); // randomization
+		}
+	}
+	else
+		snd = self.noise;
+	sound(self, CHAN_TRIGGER, snd, VOL_BASE * self.volume, self.atten);
+	if(self.spawnflags & 3)
+		self.use = target_speaker_use_off;
+}
+void target_speaker_use_off()
+{
+	sound(self, CHAN_TRIGGER, "misc/null.wav", VOL_BASE * self.volume, self.atten);
+	self.use = target_speaker_use_on;
+}
 
 void spawnfunc_target_speaker()
 {
+	// TODO: "*" prefix to sound file name
+	// TODO: wait and random (just, HOW? random is not a field)
 	if(self.noise)
 		precache_sound (self.noise);
-	IFTARGETED
+
+	if(!self.atten && !(self.spawnflags & 4))
 	{
-		if(!self.atten)
+		IFTARGETED
 			self.atten = ATTN_NORM;
-		else if(self.atten < 0)
-			self.atten = 0;
-		if(!self.volume)
-			self.volume = 1;
-		self.use = target_speaker_use;
+		else
+			self.atten = ATTN_STATIC;
+	}
+	else if(self.atten < 0)
+		self.atten = 0;
+
+	if(!self.volume)
+		self.volume = 1;
+
+	IFTARGETED
+	{
+		if(self.spawnflags & 8) // ACTIVATOR
+			self.use = target_speaker_use_activator;
+		else if(self.spawnflags & 1) // LOOPED_ON
+			target_speaker_use_on();
+		else
+			self.use = target_speaker_use_on;
+	}
+	else if(self.spawnflags & 1) // LOOPED_ON
+	{
+		ambientsound (self.origin, self.noise, VOL_BASE * self.volume, self.atten);
+		remove(self);
+	}
+	else if(self.spawnflags & 2) // LOOPED_OFF
+	{
+		objerror("This sound entity can never be activated");
 	}
 	else
 	{
-		if(!self.atten)
-			self.atten = ATTN_STATIC;
-		else if(self.atten < 0)
-			self.atten = 0;
-		if(!self.volume)
-			self.volume = 1;
+		// Quake/Nexuiz fallback
 		ambientsound (self.origin, self.noise, VOL_BASE * self.volume, self.atten);
+		remove(self);
 	}
 };
 
@@ -1012,6 +1096,8 @@ void misc_laser_think()
 {
 	vector o;
 	entity oldself;
+	entity hitent;
+	vector hitloc;
 
 	self.nextthink = time;
 
@@ -1032,20 +1118,18 @@ void misc_laser_think()
 		o = self.origin + v_forward * 32768;
 	}
 
-	if(self.dmg)
+	if(self.dmg || self.enemy.target != "")
 	{
-		if(self.dmg < 0)
-			FireRailgunBullet(self.origin, o, 100000, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
-		else
-			FireRailgunBullet(self.origin, o, self.dmg * frametime, 0, 0, 0, 0, 0, DEATH_HURTTRIGGER);
+		traceline(self.origin, o, MOVE_NORMAL, self);
 	}
+	hitent = trace_ent;
+	hitloc = trace_endpos;
 
 	if(self.enemy.target != "") // DETECTOR laser
 	{
-		traceline(self.origin, o, MOVE_NORMAL, self);
 		if(trace_ent.iscreature)
 		{
-			self.pusher = trace_ent;
+			self.pusher = hitent;
 			if(!self.count)
 			{
 				self.count = 1;
@@ -1071,18 +1155,29 @@ void misc_laser_think()
 			}
 		}
 	}
+
+	if(self.dmg)
+	{
+		if(self.team)
+			if((self.spawnflags & 8 == 0) == (self.team != hitent.team))
+				return;
+		if(hitent.takedamage)
+			Damage(hitent, self, self, ((self.dmg < 0) ? 100000 : (self.dmg * frametime)), DEATH_HURTTRIGGER, hitloc, '0 0 0');
+	}
 }
 
 float laser_SendEntity(entity to, float fl)
 {
 	WriteByte(MSG_ENTITY, ENT_CLIENT_LASER);
-	fl = fl - (fl & 0xE0); // use that bit to indicate finite length laser
+	fl = fl - (fl & 0xF0); // use that bit to indicate finite length laser
 	if(self.spawnflags & 2)
 		fl |= 0x80;
 	if(self.alpha)
 		fl |= 0x40;
 	if(self.scale != 1 || self.modelscale != 1)
 		fl |= 0x20;
+	if(self.spawnflags & 4)
+		fl |= 0x10;
 	WriteByte(MSG_ENTITY, fl);
 	if(fl & 1)
 	{
@@ -1102,7 +1197,8 @@ float laser_SendEntity(entity to, float fl)
 			WriteByte(MSG_ENTITY, bound(0, self.scale * 16.0, 255));
 			WriteByte(MSG_ENTITY, bound(0, self.modelscale * 16.0, 255));
 		}
-		WriteShort(MSG_ENTITY, self.cnt + 1);
+		if((fl & 0x80) || !(fl & 0x10)) // effect doesn't need sending if the laser is infinite and has collision testing turned off
+			WriteShort(MSG_ENTITY, self.cnt + 1);
 	}
 	if(fl & 2)
 	{
@@ -1185,6 +1281,8 @@ void spawnfunc_misc_laser()
 		self.scale = 1;
 	if(!self.modelscale)
 		self.modelscale = 1;
+	else if(self.modelscale < 0)
+		self.modelscale = 0;
 	self.think = misc_laser_think;
 	self.nextthink = time;
 	InitializeEntity(self, misc_laser_init, INITPRIO_FINDTARGET);
@@ -1262,7 +1360,8 @@ void trigger_impulse_touch1()
     if(!pushdeltatime) return;
 
     other.velocity = other.velocity + normalize(targ.origin - self.origin) * str * pushdeltatime;
-	other.flags &~= FL_ONGROUND;
+    other.flags &~= FL_ONGROUND;
+    UpdateCSQCProjectile(other);
 }
 
 // Directionless (accelerator/decelerator) mode
@@ -1302,6 +1401,7 @@ void trigger_impulse_touch2()
 
     // div0: ticrate independent, 1 = identity (not 20)
     other.velocity = other.velocity * pow(self.strength, pushdeltatime);
+    UpdateCSQCProjectile(other);
 }
 
 // Spherical (gravity/repulsor) mode
@@ -1352,6 +1452,7 @@ void trigger_impulse_touch3()
         str = self.strength;
 
     other.velocity = other.velocity + normalize(other.origin - self.origin) * str * pushdeltatime;
+    UpdateCSQCProjectile(other);
 }
 
 /*QUAKED spawnfunc_trigger_impulse (.5 .5 .5) ?
@@ -1379,7 +1480,7 @@ void spawnfunc_trigger_impulse()
 	EXACTTRIGGER_INIT;
     if(self.radius)
     {
-        if(!self.strength) self.strength = 2000 * cvar("g_triggerimpulse_radial_multiplier");
+        if(!self.strength) self.strength = 2000 * autocvar_g_triggerimpulse_radial_multiplier;
         setorigin(self, self.origin);
         setsize(self, '-1 -1 -1' * self.radius,'1 1 1' * self.radius);
         self.touch = trigger_impulse_touch3;
@@ -1388,13 +1489,13 @@ void spawnfunc_trigger_impulse()
     {
         if(self.target)
         {
-            if(!self.strength) self.strength = 950 * cvar("g_triggerimpulse_directional_multiplier");
+            if(!self.strength) self.strength = 950 * autocvar_g_triggerimpulse_directional_multiplier;
             self.touch = trigger_impulse_touch1;
         }
         else
         {
             if(!self.strength) self.strength = 0.9;
-			self.strength = pow(self.strength, cvar("g_triggerimpulse_accel_power")) * cvar("g_triggerimpulse_accel_multiplier");
+			self.strength = pow(self.strength, autocvar_g_triggerimpulse_accel_power) * autocvar_g_triggerimpulse_accel_multiplier;
             self.touch = trigger_impulse_touch2;
         }
     }
@@ -1966,7 +2067,7 @@ void relay_activators_use()
 			trg.setactive(os.cnt);
 		else
 		{
-			bprint("Not using setactive\n");
+			//bprint("Not using setactive\n");
 			if(os.cnt == ACTIVE_TOGGLE)
 				if(trg.active == ACTIVE_ACTIVE)
 					trg.active = ACTIVE_NOT;
@@ -1996,3 +2097,20 @@ void spawnfunc_relay_activatetoggle()
 	self.cnt = ACTIVE_TOGGLE;
 	self.use = relay_activators_use;	
 }
+
+.string chmap, gametype;
+void spawnfunc_target_changelevel_use()
+{
+	if(self.gametype != "")
+		MapInfo_SwitchGameType(MapInfo_Type_FromString(self.gametype));
+
+	if (self.chmap == "")
+		localcmd("endmatch\n");
+	else
+		localcmd(strcat("changelevel ", self.chmap, "\n"));
+};
+
+void spawnfunc_target_changelevel()
+{
+	self.use = spawnfunc_target_changelevel_use;
+};