X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=2be1573cd34e0c6b049acfffbb8eba464b4bc328;hb=b4a912024bf4786b87ee5ab789c53befcc48acb2;hp=330adee16bea4f5d3c9af2062593e322ac858361;hpb=94484151805d7d493b1932e5dfaf976ddbe3fd21;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index 330adee16..2be1573cd 100644
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -142,7 +142,7 @@ void W_Electro_Attack2()
 {
 	local entity proj;
 
-	W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage"));
+	W_SetupShot_ProjectileSize (self, '0 0 -4', '0 0 -4', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage"));
 	w_shotdir = v_forward; // no TrueAim for grenades please
 
 	pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -166,7 +166,7 @@ void W_Electro_Attack2()
 	proj.movetype = MOVETYPE_BOUNCE;
 	W_SETUPPROJECTILEVELOCITY_UP(proj, g_balance_electro_secondary);
 	proj.touch = W_Plasma_Touch;
-	setsize(proj, '0 0 -3', '0 0 -3');
+	setsize(proj, '0 0 -4', '0 0 -4');
 	proj.takedamage = DAMAGE_YES;
 	proj.damageforcescale = cvar("g_balance_electro_secondary_damageforcescale");
 	proj.health = cvar("g_balance_electro_secondary_health");
@@ -184,117 +184,115 @@ void W_Electro_Attack2()
 	CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound
 }
 
-.entity lgbeam, exteriorlgbeam;
-void lgbeam_think()
+.vector hook_start, hook_end;
+float lgbeam_send(entity to, float sf)
 {
-	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam)
+	WriteByte(MSG_ENTITY, ENT_CLIENT_LGBEAM);
+	sf = sf & 0x7F;
+	if(sound_allowed(MSG_BROADCAST, self.owner))
+		sf |= 0x80;
+	WriteByte(MSG_ENTITY, sf);
+	if(sf & 1)
 	{
-		remove(self);
-		return;
+		WriteByte(MSG_ENTITY, num_for_edict(self.owner));
 	}
-
-	self.nextthink = time;
-
-	makevectors(self.owner.v_angle);
-	vector angle;
-	angle = v_forward;
-
-	vector force;
-	force = angle * cvar("g_balance_electro_primary_force");
-
-	traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
-
-	self.scale = vlen(self.owner.origin - trace_endpos) / 256 * (0.75 + 0.75 * random());
+	if(sf & 2)
+	{
+		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;
 }
-
-void exteriorlgbeam_think()
+.entity lgbeam;
+.float prevlgfire;
+void lgbeam_think()
 {
-	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.exteriorlgbeam)
+	vector endpos;
+	float oldsolid;
+
+	self.owner.prevlgfire = time;
+	if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK)
 	{
-		sound (self, CHAN_PROJECTILE, "sound/misc/null.wav", VOL_BASE, ATTN_NORM);
 		remove(self);
 		return;
 	}
 
-	if (time - self.shot_spread + random() * 0.2 > 0)
-	{
-		self.shot_spread = time + 2;
-		sound (self, CHAN_PROJECTILE, "turrets/phaser.wav", VOL_BASE, ATTN_NORM);
-	}
-
-	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		self.ammo_cells = self.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime;
-
 	self.nextthink = time;
 
 	makevectors(self.owner.v_angle);
 	vector angle;
 	angle = v_forward;
+	// get effect origin
+	vector vecs, org;
+	if(self.owner.weaponentity.movedir_x > 0)
+		vecs = self.owner.weaponentity.movedir;
+	else
+		vecs = '0 0 0';
+	if(debug_shotorg != '0 0 0')
+		vecs = debug_shotorg;
+	org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * -vecs_y + v_up * vecs_z;
 
-	traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner));
+	oldsolid = self.owner.dphitcontentsmask;
+	self.owner.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_CORPSE;
+
+	WarpZone_traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+	endpos = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
+	WarpZone_traceline_antilag(self.owner, org, endpos + 4 * normalize(endpos - org), MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner));
+
+	self.owner.dphitcontentsmask = oldsolid;
+
+	if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)
+		self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime);
 
 	// apply the damage
 	if(trace_fraction < 1)
 	{
 		vector force;
-		force = angle * cvar("g_balance_electro_primary_force") + trace_ent.velocity * cvar("g_balance_electro_primary_velocityfactor") + '0 0 1' * cvar("g_balance_electro_primary_force_up");
+		force = angle * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up");
 		Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * frametime, WEP_ELECTRO, trace_endpos, force * frametime);
+		W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner);
 	}
 
-	self.angles = '0 0 0';
-	self.scale = vlen(gettaginfo(self, 0) - trace_endpos) / 256 * (0.75 + 0.75 * random());
-
-	// v_forward, v_right, v_up now are the ACTUAL directions
-	// express self.angles in terms of them to aim at target!
-	self.angles = vectoangles('1 0 0' * (angle * v_forward) + '0 -1 0' * (angle * v_right) + '0 0 1' * (angle * v_up));
+	// draw effect
+	if(org != self.hook_start)
+	{
+		self.SendFlags |= 2;
+		self.hook_start = org;
+	}
+	if(endpos != self.hook_end)
+	{
+		self.SendFlags |= 4;
+		self.hook_end = endpos;
+	}
 }
 
 // experimental lightning gun
 void W_Electro_Attack3 (void)
 {
+	// only play fire sound if 0.5 sec has passed since player let go the fire button
+	if(time - self.prevlgfire > 0.5)
+	{
+		sound (self, CHAN_WEAPON, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM);
+	}
+
 	entity beam, oldself;
 
 	self.lgbeam = beam = spawn();
-	setmodel(beam,"models/turrets/phaser_beam.md3");
-	beam.effects = EF_LOWPRECISION;
 	beam.solid = SOLID_NOT;
 	beam.think = lgbeam_think;
 	beam.owner = self;
 	beam.movetype = MOVETYPE_NONE;
-	if(gettagindex(self.weaponentity, "shot"))
-		setattachment(beam, self.weaponentity, "shot");
-	else
-		setattachment(beam, self.weaponentity, "tag_shot");
-
-	oldself = self;
-	self = beam;
-	self.think();
-	self = oldself;
-
-	self.exteriorlgbeam = beam = spawn();
-	setmodel(beam,"models/turrets/phaser_beam.md3");
-	beam.effects = EF_LOWPRECISION;
-	beam.solid = SOLID_NOT;
-	beam.think = exteriorlgbeam_think;
-	beam.owner = self;
-	beam.movetype = MOVETYPE_NONE;
-	//beam.viewmodelforclient = self;
-	if(self.weaponentity.oldorigin_x > 0)
-	{
-		setattachment(beam, self.exteriorweaponentity, "");
-		setorigin(beam, self.weaponentity.oldorigin);
-	}
-	else
-	{
-		if(gettagindex(self.exteriorweaponentity, "shot"))
-			setattachment(beam, self.exteriorweaponentity, "shot");
-		else
-			setattachment(beam, self.exteriorweaponentity, "tag_shot");
-	}
-
 	beam.shot_spread = 0;
 	beam.bot_dodge = TRUE;
 	beam.bot_dodgerating = cvar("g_balance_electro_primary_damage");
+	Net_LinkEntity(beam, FALSE, 0, lgbeam_send);
 
 	oldself = self;
 	self = beam;
@@ -302,6 +300,15 @@ void W_Electro_Attack3 (void)
 	self = oldself;
 }
 
+void ElectroInit()
+{
+	weapon_action(WEP_ELECTRO, WR_PRECACHE);
+	electro_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 1);
+	electro_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 2);
+	electro_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 3);
+	electro_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), FALSE, FALSE, 4);
+}
+
 void spawnfunc_weapon_electro (void)
 {
 	weapon_defaultspawnfunc(WEP_ELECTRO);
@@ -352,21 +359,27 @@ float w_electro(float req)
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
-		if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
 		{
-			if(cvar("g_balance_electro_lightning"))
+			if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire")))
 			{
-				if (self.BUTTON_ATCK_prev == 0)
+				if(cvar("g_balance_electro_lightning"))
 				{
-					W_Electro_Attack3();
+					if (self.BUTTON_ATCK_prev == 0)
+					{
+						W_Electro_Attack3();
+					}
+					self.BUTTON_ATCK_prev = 1;
 				}
+				else
+				{
+					W_Electro_Attack();
+				}
+				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
 			}
-			else
-			{
-				W_Electro_Attack();
-			}
-			weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_primary_animtime"), w_ready);
+		} else {
+			self.BUTTON_ATCK_prev = 0;
 		}
+
 		if (self.BUTTON_ATCK2)
 		if (time >= self.electro_secondarytime)
 		if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
@@ -388,19 +401,25 @@ float w_electro(float req)
 		precache_sound ("weapons/electro_impact.wav");
 		precache_sound ("weapons/electro_impact_combo.wav");
 		if(cvar("g_balance_electro_lightning"))
-			precache_sound ("weapons/crylink_fire2.wav");
+		{
+			precache_sound ("weapons/lgbeam_fire.wav");
+		}
 	}
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_ELECTRO);
 	else if (req == WR_CHECKAMMO1)
-		return self.ammo_cells >= cvar("g_balance_electro_primary_ammo");
+	{
+		if(cvar("g_balance_electro_lightning"))
+			return self.ammo_cells >= cvar("g_balance_electro_primary_ammo") * cvar("g_balance_electro_primary_refire");
+		else
+			return self.ammo_cells >= cvar("g_balance_electro_primary_ammo");
+	}
 	else if (req == WR_CHECKAMMO2)
 		return self.ammo_cells >= cvar("g_balance_electro_secondary_ammo");
 	else if (req == WR_RESETPLAYER)
 	{
 		self.electro_secondarytime = time;
 	}
-	self.BUTTON_ATCK_prev = self.BUTTON_ATCK;
 	return TRUE;
 };
 #endif