Player glow intensity reflects armor, while weapon glow intensity reflects load status

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index 5c2ad9cc9dbb65a65a6391ac20fc48ad62023435..d9e9e1c7aae1fc30cabf7221725356cfa108df14 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -664,6 +664,8 @@ set g_bloodloss 0   "amount of health below which blood loss occurs"
 set g_footsteps 1      "serverside footstep sounds"\r
 \r
 set g_deathglow 1.25 "when enabled, players stop glowing after they die (the value specifies glow fading speed)"\r
+set g_armorglow 100 "when enabled, player glow color reflects armor charge (the value specifies the maximum armor value)"\r
+set g_weaponloadglow 1 "when enabled, weapon glow reflects weapon charge, if the weapon is reloadable"\r
 \r
 set g_multijump 1      "Number of multiple jumps to allow (jumping again in the air), -1 allows for infinite jumps"\r
 set g_multijump_add 0  "0 = make the current z velocity equal to jumpvelocity, 1 = add jumpvelocity to the current z velocity"\r

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 01a3aeae3d68dd14df21ab6782dd9aba6e7aa868..e996aa8a1b7d0804f8a9d1e381f977722cde1472 100644 (file)
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -2695,10 +2695,15 @@ void PlayerPreThink (void)
                                // set weapon and player glowmod\r
                                self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;\r
                                if(self.armorvalue < cvar("g_power"))\r
-                                       self.glowmod = self.glowmod * random(); // make glow flicker when power is down\r
-                               self.weaponentity_glowmod = self.glowmod;\r
+                                       self.glowmod = '-1 -1 -1'; // turn glow off when power is down\r
+                               else if(self.armorvalue < cvar("g_armorglow"))\r
+                                       self.glowmod = self.glowmod * (self.armorvalue / cvar("g_armorglow")); // glow intensity reflects armor charge\r
                        }\r
 \r
+                       self.weaponentity_glowmod = self.glowmod;\r
+                       if(cvar("g_weaponloadglow") && self.clip_size)\r
+                               self.weaponentity_glowmod = self.weaponentity_glowmod * (self.clip_load / self.clip_size); // glow intensity reflects weapon load\r
+\r
                        player_powerups();\r
                }\r
 \r

diff --git a/docs/TODO.txt b/docs/TODO.txt
index 5048f5e49bdb0503f627160758b3eb4d258b9f16..d092c83600f087a8b2f6476c5b375ebeb0b41b68 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -68,7 +68,7 @@
 \r
 - +0.8: Refraction effect for damage when you have armor (using a model)\r
 \r
-- 0.8: Lower glow color on weapon when shooting and reloading?\r
+- 0.8: Lower glow color on weapon when shooting?\r
 \r
 - 0.8 | 0.9 BUG: Fix remaining divisions by zero, look for backtrace in the console\r
 \r
@@ -276,6 +276,4 @@
 \r
 - 0.8 BUG: At startup, make a script re-set sound and music volume so they're not the last set by vore status in-game\r
 \r
-- 0.8: Weight paint new fox state models so that deforms cause less sharp edges when the spine bones rotate from one another\r
-\r
 - 0.8 BUG: Normal grabber shoot seems to play melee animation on player models\r