X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=e4c6347fedf430d3f505b5ce7b66e22815f83409;hb=bf373f4f3d439352b070895136f9c38c96613944;hp=c23a47b5d668fbe1b000321698f4404e5dcc260d;hpb=83b0c96edec0a188371873bb83b15d024568bca3;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index c23a47b5d..e4c6347fe 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -16,15 +16,44 @@ void SendCSQCNexBeamParticle() {
 	WriteCoord(MSG_BROADCAST, v_z);
 }
 
-void W_Nex_Attack (void)
+void W_Nex_Attack (float issecondary)
 {
+	float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo, f;
+	if(issecondary)
+	{
+		mydmg = cvar("g_balance_nex_secondary_damage");
+		myforce = cvar("g_balance_nex_secondary_force");
+		mymindist = cvar("g_balance_nex_secondary_damagefalloff_mindist");
+		mymaxdist = cvar("g_balance_nex_secondary_damagefalloff_maxdist");
+		myhalflife = cvar("g_balance_nex_secondary_damagefalloff_halflife");
+		myforcehalflife = cvar("g_balance_nex_secondary_damagefalloff_forcehalflife");
+		myammo = cvar("g_balance_nex_secondary_ammo");
+	}
+	else
+	{
+		mydmg = cvar("g_balance_nex_primary_damage");
+		myforce = cvar("g_balance_nex_primary_force");
+		mymindist = cvar("g_balance_nex_primary_damagefalloff_mindist");
+		mymaxdist = cvar("g_balance_nex_primary_damagefalloff_maxdist");
+		myhalflife = cvar("g_balance_nex_primary_damagefalloff_halflife");
+		myforcehalflife = cvar("g_balance_nex_primary_damagefalloff_forcehalflife");
+		myammo = cvar("g_balance_nex_primary_ammo");
+	}
+
 	float flying;
 	flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
 
-	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", cvar("g_balance_nex_damage"));
+	f = ExponentialFalloff(cvar("g_balance_nex_velocitydependent_minspeed"), cvar("g_balance_nex_velocitydependent_maxspeed"), cvar("g_balance_nex_velocitydependent_halflife"), self.nexspeed);
+
+	// TODO: make it more obvious (through effects, indicator on weapon) that damage increases when speed increases
+	mydmg *= f;
+	myforce *= f;
+	//print("^1Damage: ^7", ftos(mydmg), "\n");
+
+	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);
 
 	yoda = 0;
-	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), cvar("g_balance_nex_damagefalloff_mindist"), cvar("g_balance_nex_damagefalloff_maxdist"), cvar("g_balance_nex_damagefalloff_halflife"), cvar("g_balance_nex_damagefalloff_forcehalflife"), WEP_NEX);
+	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_NEX);
 
 	if(yoda && flying)
 		AnnounceTo(self, "yoda");
@@ -34,10 +63,10 @@ void W_Nex_Attack (void)
 	
 	// flash and burn the wall
 	if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
-		Damage_DamageInfo(trace_endpos, cvar("g_balance_nex_damage"), 0, 0, cvar("g_balance_nex_force") * w_shotdir, WEP_NEX, self);
+		Damage_DamageInfo(trace_endpos, mydmg, 0, 0, myforce * w_shotdir, WEP_NEX, self);
 
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		self.ammo_cells = self.ammo_cells - cvar("g_balance_nex_ammo");
+		self.ammo_cells = self.ammo_cells - myammo;
 }
 
 void spawnfunc_weapon_nex (void); // defined in t_items.qc
@@ -45,15 +74,37 @@ void spawnfunc_weapon_nex (void); // defined in t_items.qc
 float w_nex(float req)
 {
 	if (req == WR_AIM)
+	{
 		self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
+		self.BUTTON_ATCK2 = bot_aim(1000000, 0, 1, FALSE);
+	}
 	else if (req == WR_THINK)
 	{
 		if (self.BUTTON_ATCK)
 		{
-			if (weapon_prepareattack(0, cvar("g_balance_nex_refire")))
+			if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire")))
 			{
-				W_Nex_Attack();
-				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_animtime"), w_ready);
+				W_Nex_Attack(0);
+				weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_primary_animtime"), w_ready);
+			}
+		}
+		if (self.BUTTON_ATCK2)
+		{
+			if(cvar("g_balance_nex_secondary_charge"))
+			{
+				if(self.ammo_cells)
+				{
+					self.nexspeed = min(cvar("g_balance_nex_velocitydependent_maxspeed"), self.nexspeed + cvar("g_balance_nex_secondary_charge_rate") * frametime / W_TICSPERFRAME);
+					self.ammo_cells = max(0, self.ammo_cells - cvar("g_balance_nex_secondary_charge_ammo") * frametime / W_TICSPERFRAME);
+				}
+			}
+			else if(cvar("g_balance_nex_secondary"))
+			{
+				if (weapon_prepareattack(0, cvar("g_balance_nex_secondary_refire")))
+				{
+					W_Nex_Attack(1);
+					weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_secondary_animtime"), w_ready);
+				}
 			}
 		}
 	}
@@ -71,13 +122,9 @@ float w_nex(float req)
 	else if (req == WR_SETUP)
 		weapon_setup(WEP_NEX);
 	else if (req == WR_CHECKAMMO1)
-		return self.ammo_cells >= cvar("g_balance_nex_ammo");
+		return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
 	else if (req == WR_CHECKAMMO2)
-		return FALSE;
-	else if (req == WR_SUICIDEMESSAGE)
-		w_deathtypestring = "did the impossible";
-	else if (req == WR_KILLMESSAGE)
-		w_deathtypestring = "has been vaporized by";
+		return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo");
 	return TRUE;
 };
 #endif
@@ -96,6 +143,10 @@ float w_nex(float req)
 	{
 		precache_sound("weapons/neximpact.wav");
 	}
+	else if (req == WR_SUICIDEMESSAGE)
+		w_deathtypestring = "%s did the impossible";
+	else if (req == WR_KILLMESSAGE)
+		w_deathtypestring = "%s has been vaporized by %s";
 	return TRUE;
 }
 #endif