X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=61f4dc2929feacf92f54270c8c185171aac8e666;hb=a3147c2e5642ce132e0d6bc3952718dd8acfc84a;hp=c1687536541c01838a41550618ced3dc28b850fc;hpb=cdf4fd224cc017619bae2b01f07a5c5dff74af18;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index c16875365..61f4dc292 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -46,14 +46,15 @@ void W_Nex_Attack (float issecondary)
 	if(cvar("g_balance_nex_charge"))
 	{
 		charge = cvar("g_balance_nex_charge_mindmg") / mydmg + (1 - cvar("g_balance_nex_charge_mindmg") / mydmg) * self.nex_charge;
-		self.nex_charge = self.nex_charge * cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
+		self.nex_charge *= cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
+		                                                                 // O RLY? -- divVerent
 	}
 	else
 		charge = 1;
-	mydmg = mydmg * charge;
-	myforce = myforce * charge;
+	mydmg *= charge;
+	myforce *= charge;
 
-	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg);
+	W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", CHAN_WEAPON, mydmg);
 
 	yoda = 0;
 	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_NEX);
@@ -74,6 +75,7 @@ void W_Nex_Attack (float issecondary)
 
 void spawnfunc_weapon_nex (void); // defined in t_items.qc
 
+.float nex_charge_pool_pauseregen_finished;
 float w_nex(float req)
 {
 	float dt;
@@ -87,6 +89,14 @@ float w_nex(float req)
 		if(cvar("g_balance_nex_charge") && self.nex_charge < cvar("g_balance_nex_charge_limit"))
 			self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_rate") * frametime / W_TICSPERFRAME);
 
+		if(cvar("g_balance_nex_secondary_charge_pool"))
+		if(self.nex_charge_pool_ammo < 1)
+		{
+			if(self.nex_charge_pool_pauseregen_finished < time)
+				self.nex_charge_pool_ammo = min(1, self.nex_charge_pool_ammo + cvar("g_balance_nex_secondary_charge_pool_regen") * frametime / W_TICSPERFRAME);
+			self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_nex_secondary_charge_pool_pause_health_regen"));
+		}
+
 		if (self.BUTTON_ATCK)
 		{
 			if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire")))
@@ -99,13 +109,31 @@ float w_nex(float req)
 		{
 			if(cvar("g_balance_nex_secondary_charge"))
 			{
+				self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause");
 				dt = frametime / W_TICSPERFRAME;
-				if(self.nex_charge < 1)
+
+				if(cvar("g_balance_nex_secondary_charge_pool"))
 				{
-					dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate"));
-					if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
+					if(cvar("g_balance_nex_secondary_ammo"))
 					{
-						if(cvar("g_balance_nex_secondary_ammo"))
+						// always deplete if secondary is held
+						self.nex_charge_pool_ammo = max(0, self.nex_charge_pool_ammo - cvar("g_balance_nex_secondary_ammo") * dt);
+
+						dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate"));
+						self.nex_charge_pool_pauseregen_finished = time + cvar("g_balance_nex_secondary_charge_pool_pause_regen");
+						dt = min(dt, self.nex_charge_pool_ammo);
+						dt = max(0, dt);
+
+						self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate");
+					}
+				}
+
+				else if(cvar("g_balance_nex_secondary_ammo"))
+				{
+					if(self.nex_charge < 1)
+					{
+						dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate"));
+						if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
 						{
 							dt = min(dt, (self.ammo_cells - cvar("g_balance_nex_primary_ammo")) / cvar("g_balance_nex_secondary_ammo"));
 							dt = max(0, dt);
@@ -114,8 +142,8 @@ float w_nex(float req)
 								self.ammo_cells = max(cvar("g_balance_nex_secondary_ammo"), self.ammo_cells - cvar("g_balance_nex_secondary_ammo") * dt);
 							}
 						}
+						self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate");
 					}
-					self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate");
 				}
 			}
 			else if(cvar("g_balance_nex_secondary"))
@@ -144,11 +172,7 @@ float w_nex(float req)
 	else if (req == WR_CHECKAMMO1)
 		return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
 	else if (req == WR_CHECKAMMO2)
-	{
-		if(cvar("g_balance_nex_secondary_charge"))
-			return self.ammo_cells >= cvar("g_balance_nex_primary_ammo");
-		return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo");
-	}
+		return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); // don't allow charging if we don't have enough ammo
 	return TRUE;
 };
 #endif