From: FruitieX <fruitiex@gmail.com>
Date: Thu, 2 Dec 2010 19:04:41 +0000 (+0200)
Subject: change the glow on the nex depending on how charged it is (warning: looks pretty... 
X-Git-Tag: xonotic-v0.1.0preview~76^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96913ae9dc8fb84b7be13b47040896cc68b027f5;p=xonotic%2Fxonotic-data.pk3dir.git

change the glow on the nex depending on how charged it is (warning: looks pretty ugly currently with the blue colored background (only the glowmap should color it)
---

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index dbfd72923..5b1943b5d 100644
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -48,6 +48,7 @@ void W_Nex_Attack (float issecondary)
 		charge = cvar("g_balance_nex_charge_mindmg") / mydmg + (1 - cvar("g_balance_nex_charge_mindmg") / mydmg) * self.nex_charge;
 		self.nex_charge *= cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce
 		                                                                 // O RLY? -- divVerent
+                                                                         // YA RLY -- FruitieX
 	}
 	else
 		charge = 1;
@@ -93,6 +94,17 @@ 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_charge"))
+        {
+            self.weaponentity.weaponentity.glowmod = '1 1 1' * self.nex_charge;
+            self.exteriorweaponentity.glowmod = '1 1 1' * self.nex_charge;
+            if(self.nex_charge > cvar("g_balance_nex_charge_limit"))
+            {
+                self.weaponentity.weaponentity.glowmod_y -= 0.5 * (self.nex_charge - cvar("g_balance_nex_charge_limit")) / (1 - cvar("g_balance_nex_charge_limit"));
+                self.weaponentity.weaponentity.glowmod_z -= 0.5 * (self.nex_charge - cvar("g_balance_nex_charge_limit")) / (1 - cvar("g_balance_nex_charge_limit"));
+            }
+        }
+
 		if(cvar("g_balance_nex_secondary_charge_pool"))
 		if(self.nex_charge_pool_ammo < 1)
 		{