X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=inline;f=qcsrc%2Fserver%2Fw_laser.qc;h=18715a9b4ba51ff79c7f995cd665d5a0bb1e88b5;hb=f0f0ae7b7452081839eda516335b05603746b4cb;hp=8633297a12d2c31bbbfe16d77b3b5d79a571322d;hpb=4cf67f3644408e5ac791692650b6b9b0660884cf;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 8633297a1..18715a9b4 100644
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -40,10 +40,7 @@ void W_Laser_Attack (float issecondary)
 	else
 		nodamage = FALSE;
 
-	if (issecondary == 1)
-		a = cvar("g_balance_laser_secondary_shotangle");
-	else
-		a = cvar("g_balance_laser_primary_shotangle");
+	a = cvar("g_balance_laser_primary_shotangle");
 	s_forward = v_forward * cos(a * DEG2RAD) + v_up * sin(a * DEG2RAD);
 
 	if(nodamage)
@@ -57,28 +54,20 @@ void W_Laser_Attack (float issecondary)
 	missile = spawn ();
 	missile.owner = self;
 	missile.classname = "laserbolt";
-	missile.dmg = (issecondary == 1);
+	missile.dmg = 0;
 	if(!nodamage)
 	{
 		missile.bot_dodge = TRUE;
-		if (issecondary == 1)
-			missile.bot_dodgerating = cvar("g_balance_laser_secondary_damage");
-		else
-			missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
+		missile.bot_dodgerating = cvar("g_balance_laser_primary_damage");
 	}
 
 	PROJECTILE_MAKETRIGGER(missile);
 	missile.projectiledeathtype = WEP_LASER;
-	if(issecondary == 1)
-		missile.projectiledeathtype |= HITTYPE_SECONDARY;
 
 	setorigin (missile, w_shotorg);
 	setsize(missile, '0 0 0', '0 0 0');
 
-	if (issecondary == 1)
-		W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_secondary);
-	else
-		W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_primary);
+	W_SETUPPROJECTILEVELOCITY(missile, g_balance_laser_primary);
 	missile.angles = vectoangles (missile.velocity);
 	//missile.glow_color = 250; // 244, 250
 	//missile.glow_size = 120;
@@ -87,10 +76,7 @@ void W_Laser_Attack (float issecondary)
 	missile.flags = FL_PROJECTILE;
 
 	missile.think = W_Laser_Think;
-	if (issecondary == 1)
-		missile.nextthink = time + cvar("g_balance_laser_secondary_delay");
-	else
-		missile.nextthink = time + cvar("g_balance_laser_primary_delay");
+	missile.nextthink = time + cvar("g_balance_laser_primary_delay");
 	if(time >= missile.nextthink)
 	{
 		entity oldself;
@@ -101,26 +87,43 @@ void W_Laser_Attack (float issecondary)
 	}
 }
 
-.entity gauntletbeam;
-.float prevgauntletfire;
-void gauntletbeam_think()
+.vector hook_start, hook_end;
+float gauntletbeam_send(entity to, float sf)
 {
-	float damage, myforce, myradius;
-	if(self.cnt)
+	WriteByte(MSG_ENTITY, ENT_CLIENT_GAUNTLET);
+	sf = sf & 0x7F;
+	if(sound_allowed(MSG_BROADCAST, self.owner))
+		sf |= 0x80;
+	WriteByte(MSG_ENTITY, sf);
+	if(sf & 1)
 	{
-		damage = cvar("g_balance_laser_secondary_damage");
-		myforce = cvar("g_balance_laser_secondary_force");
-		myradius = cvar("g_balance_laser_secondary_radius");
+		WriteByte(MSG_ENTITY, num_for_edict(self.owner));
 	}
-	else
+	if(sf & 2)
 	{
-		damage = cvar("g_balance_laser_primary_damage");
-		myforce = cvar("g_balance_laser_primary_force");
-		myradius = cvar("g_balance_laser_primary_radius");
+		WriteCoord(MSG_ENTITY, self.hook_start_x);
+		WriteCoord(MSG_ENTITY, self.hook_start_y);
+		WriteCoord(MSG_ENTITY, self.hook_start_z);
 	}
+	if(sf & 4)
+	{
+		WriteCoord(MSG_ENTITY, self.hook_end_x);
+		WriteCoord(MSG_ENTITY, self.hook_end_y);
+		WriteCoord(MSG_ENTITY, self.hook_end_z);
+	}
+	return TRUE;
+}
+.entity gauntletbeam;
+.float prevgauntletfire;
+void gauntletbeam_think()
+{
+	float damage, myforce, myradius;
+	damage = cvar("g_balance_laser_secondary_damage");
+	myforce = cvar("g_balance_laser_secondary_force");
+	myradius = cvar("g_balance_laser_secondary_radius");
 
 	self.owner.prevgauntletfire = time;
-	if (self.owner.weaponentity.state != WS_INUSE || self != self.owner.gauntletbeam || self.owner.deadflag != DEAD_NO || (!self.owner.BUTTON_ATCK2 && self.cnt) || (!self.owner.BUTTON_ATCK && !self.cnt))
+	if (self.owner.weaponentity.state != WS_INUSE || self != self.owner.gauntletbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK2)
 	{
 		remove(self);
 		return;
@@ -129,45 +132,37 @@ void gauntletbeam_think()
 	self.nextthink = time;
 
 	makevectors(self.owner.v_angle);
-	vector angle;
-	angle = v_forward;
 
-	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * myradius, FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	float dt;
+	dt = frametime;
+
+	W_SetupShot_Range(self.owner, TRUE, 0, "", damage * dt, myradius);
+	WarpZone_traceline_antilag(self.owner, w_shotorg, w_shotend, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
 
 	// apply the damage
-	if(trace_fraction < 1)
+	if(trace_ent)
 	{
 		vector force;
-		force = angle * myforce;
-		Damage (trace_ent, self.owner, self.owner, damage * frametime, WEP_ELECTRO, trace_endpos, force * frametime);
+		force = w_shotdir * myforce;
+		Damage (trace_ent, self.owner, self.owner, damage * dt, WEP_LASER | HITTYPE_SECONDARY, trace_endpos, force * dt);
+		Damage_RecordDamage(self.owner, WEP_LASER | HITTYPE_SECONDARY, damage * dt);
 	}
 
 	// draw effect
-	vector vecs, org;
-	if(self.owner.weaponentity.movedir_x > 0)
+	if(w_shotorg != self.hook_start)
 	{
-		vecs = self.owner.weaponentity.movedir;
-		vecs_y = -vecs_y;
+		self.SendFlags |= 2;
+		self.hook_start = w_shotorg;
+	}
+	if(w_shotend != self.hook_end)
+	{
+		self.SendFlags |= 4;
+		self.hook_end = w_shotend;
 	}
-	else
-		vecs = '0 0 0';
-	org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * vecs_y + v_up * vecs_z;
-	
-	// TODO turn into a csqc entity
-	WriteByte(MSG_BROADCAST, SVC_TEMPENTITY);
-	WriteByte(MSG_BROADCAST, TE_CSQC_BEAM);
-	WriteByte(MSG_BROADCAST, num_for_edict(self.owner));
-	WriteByte(MSG_BROADCAST, 3);
-	WriteCoord(MSG_BROADCAST, trace_endpos_x);
-	WriteCoord(MSG_BROADCAST, trace_endpos_y);
-	WriteCoord(MSG_BROADCAST, trace_endpos_z);
-	WriteCoord(MSG_BROADCAST, org_x);
-	WriteCoord(MSG_BROADCAST, org_y);
-	WriteCoord(MSG_BROADCAST, org_z);
 }
 
 // experimental gauntlet
-void W_Laser_Attack2 (float issecondary)
+void W_Laser_Attack2 ()
 {
 	// only play fire sound if 0.5 sec has passed since player let go the fire button
 	if(time - self.prevgauntletfire > 0.5)
@@ -185,7 +180,7 @@ void W_Laser_Attack2 (float issecondary)
 	beam.shot_spread = 0;
 	beam.bot_dodge = TRUE;
 	beam.bot_dodgerating = cvar("g_balance_laser_primary_damage");
-	beam.cnt = issecondary;
+	Net_LinkEntity(beam, FALSE, 0, gauntletbeam_send);
 
 	oldself = self;
 	self = beam;
@@ -230,22 +225,16 @@ float w_laser(float req)
 		if (self.BUTTON_ATCK)
 		if (weapon_prepareattack(0, cvar("g_balance_laser_primary_refire")))
 		{
-			if(cvar("g_balance_laser_primary_gauntlet"))
-				W_Laser_Attack2(0);
-			else
-				W_Laser_Attack(0);
+			W_Laser_Attack(1);
 			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_primary_animtime"), w_ready);
 		}
 		if (self.BUTTON_ATCK2)
 		{
 			if(cvar("g_balance_laser_secondary"))
 			{
-				if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
+				if (weapon_prepareattack(0, 0))
 				{
-					if(cvar("g_balance_laser_secondary_gauntlet"))
-						W_Laser_Attack2(1);
-					else
-						W_Laser_Attack(1);
+					W_Laser_Attack2();
 					weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_laser_secondary_animtime"), w_ready);
 				}
 			}
@@ -289,10 +278,13 @@ float w_laser(float req)
 		precache_sound("weapons/laserimpact.wav");
 	}
 	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = "lasered themself to hell";
+		w_deathtypestring = "%s lasered themself to hell";
 	else if (req == WR_KILLMESSAGE)
 	{
-		w_deathtypestring = "was lasered to death by"; // unchecked: SPLASH
+		if(w_deathtype & HITTYPE_SECONDARY)
+			w_deathtypestring = "%s was cut in half by %s's gauntlet"; // unchecked: SPLASH
+		else
+			w_deathtypestring = "%s was lasered to death by %s"; // unchecked: SPLASH
 	}
 	return TRUE;
 }