Give turrets _shirt & glowmod insted of fugly colormod. Fix akward .team check (ons...

diff --git a/models/turrets/base.tga b/models/turrets/base.tga
index a48d18d590240fd7b87fce086c33a0ea980fcf6b..a4f47c05babd0188c57f8597fe45b2b2acafe63e 100644 (file)
Binary files a/models/turrets/base.tga and b/models/turrets/base.tga differ

diff --git a/models/turrets/base_shirt.tga b/models/turrets/base_shirt.tga
new file mode 100644 (file)
index 0000000..2f4810e
Binary files /dev/null and b/models/turrets/base_shirt.tga differ

diff --git a/models/turrets/ewheel-base.tga b/models/turrets/ewheel-base.tga
index e5567509037e06b854f6aeb3cc2a650102f4cfc6..93a3d35236d79dbf8cc898c704fec4180d5330a9 100644 (file)
Binary files a/models/turrets/ewheel-base.tga and b/models/turrets/ewheel-base.tga differ

diff --git a/models/turrets/ewheel-base_glow.tga b/models/turrets/ewheel-base_glow.tga
new file mode 100644 (file)
index 0000000..6ca7016
Binary files /dev/null and b/models/turrets/ewheel-base_glow.tga differ

diff --git a/models/turrets/ewheel-base_shirt.tga b/models/turrets/ewheel-base_shirt.tga
new file mode 100644 (file)
index 0000000..67c05fe
Binary files /dev/null and b/models/turrets/ewheel-base_shirt.tga differ

diff --git a/models/turrets/mggun.tga b/models/turrets/mggun.tga
index fb31d6735aca7c023a320efb2a04459efcf3e8f2..be039a4ea86fc1e1b13962f10f8dc15c2ba4e905 100644 (file)
Binary files a/models/turrets/mggun.tga and b/models/turrets/mggun.tga differ

diff --git a/models/turrets/mggun_shirt.tga b/models/turrets/mggun_shirt.tga
new file mode 100644 (file)
index 0000000..67102a2
Binary files /dev/null and b/models/turrets/mggun_shirt.tga differ

diff --git a/models/turrets/mlrs.tga b/models/turrets/mlrs.tga
index ddddb07fc0c01ee1ed0a7a5e800a7113a4297972..c1da397fb8e450b1f200ecc1f5e75efdb3655e08 100644 (file)
Binary files a/models/turrets/mlrs.tga and b/models/turrets/mlrs.tga differ

diff --git a/models/turrets/mlrs_glow.tga b/models/turrets/mlrs_glow.tga
index c84fa13507f1668b2eb52cf402f38ba8097445ff..c29c16f9d6595f024c6262c1656c4ed3b626cc6e 100644 (file)
Binary files a/models/turrets/mlrs_glow.tga and b/models/turrets/mlrs_glow.tga differ

diff --git a/models/turrets/phaserbody.tga b/models/turrets/phaserbody.tga
index f63f5e959ccb7fbff21a9033f1db3adcb60e04c5..3cb227403b8771a18a519929e2a8b80702d818e3 100644 (file)
Binary files a/models/turrets/phaserbody.tga and b/models/turrets/phaserbody.tga differ

diff --git a/models/turrets/phaserbody_glow.tga b/models/turrets/phaserbody_glow.tga
index d877e73a27ea0fa06c9c53e409ea2d5e65efe8f1..6f704f0a6e7337961135c290b8f2a143dacccfe4 100644 (file)
Binary files a/models/turrets/phaserbody_glow.tga and b/models/turrets/phaserbody_glow.tga differ

diff --git a/models/turrets/phasermag.tga b/models/turrets/phasermag.tga
index 2d5b1f988966124ec5dac5e2b08e8ca676cd915e..cb48d5eb7f1e20667b102c6f22f8e39e58ae6c79 100644 (file)
Binary files a/models/turrets/phasermag.tga and b/models/turrets/phasermag.tga differ

diff --git a/models/turrets/phasermag_glow.tga b/models/turrets/phasermag_glow.tga
index b30b540ebbe4e8ba43b05db24d14b14b0d4f6556..fcf104fb7fd94d2efa7d1902b13723858efb25be 100644 (file)
Binary files a/models/turrets/phasermag_glow.tga and b/models/turrets/phasermag_glow.tga differ

diff --git a/models/turrets/plasmagun.tga b/models/turrets/plasmagun.tga
index 31a4ab8b15e92e3f2ca33425eea342af8f6a3eda..cb9726712df0783290789efab9183d461e7bfbd2 100644 (file)
Binary files a/models/turrets/plasmagun.tga and b/models/turrets/plasmagun.tga differ

diff --git a/models/turrets/plasmagun_glow.tga b/models/turrets/plasmagun_glow.tga
index 881b116d514c047c54298ed5bd137b0914147bc7..20e09fbfee452b9320325a81e0702bccda01fdb8 100644 (file)
Binary files a/models/turrets/plasmagun_glow.tga and b/models/turrets/plasmagun_glow.tga differ

diff --git a/models/turrets/plasmagun_shirt.tga b/models/turrets/plasmagun_shirt.tga
new file mode 100644 (file)
index 0000000..c56f8eb
Binary files /dev/null and b/models/turrets/plasmagun_shirt.tga differ

diff --git a/models/turrets/reactor.tga b/models/turrets/reactor.tga
index c7df0397c0cfc2cdf13eec5fd3c344c8097b3020..9d95692935c18f0c7a77da459ff3bbdbd0509f3a 100644 (file)
Binary files a/models/turrets/reactor.tga and b/models/turrets/reactor.tga differ

diff --git a/models/turrets/reactor_glow.tga b/models/turrets/reactor_glow.tga
index 720fa2e57ca0b1e731db566e4d3a1a629da27d78..573e0c03b8ed9d100322142500a31ef55c500c3f 100644 (file)
Binary files a/models/turrets/reactor_glow.tga and b/models/turrets/reactor_glow.tga differ

diff --git a/models/turrets/rocket.tga b/models/turrets/rocket.tga
index e2217d181634a4027b8270290fa6d87b24264e11..cadfcba9cbea579a34ddce4752f28f9a8ad963e3 100644 (file)
Binary files a/models/turrets/rocket.tga and b/models/turrets/rocket.tga differ

diff --git a/models/turrets/rocket_glow.tga b/models/turrets/rocket_glow.tga
index b1a84a4ed0f76878b7aacde950bf7722da83211b..33019c2c5683a27000a1669b41ec1a21e174e0fa 100644 (file)
Binary files a/models/turrets/rocket_glow.tga and b/models/turrets/rocket_glow.tga differ

diff --git a/models/turrets/tesla.tga b/models/turrets/tesla.tga
index cb952b0f1fcc98eed6c1b6974d8f52f0e04ff825..b9a5e2ec99dd9c70ea4af698dfd93ce17e28eac5 100644 (file)
Binary files a/models/turrets/tesla.tga and b/models/turrets/tesla.tga differ

diff --git a/models/turrets/tesla_glow.tga b/models/turrets/tesla_glow.tga
index 82f4e9bfa7092670d1fc5898dca77ffca2f09668..d33dec20c53b9d0e1a32aaa9675dc283138a699a 100644 (file)
Binary files a/models/turrets/tesla_glow.tga and b/models/turrets/tesla_glow.tga differ

diff --git a/models/turrets/walker_base.tga b/models/turrets/walker_base.tga
index 2381003110178f2c415839a2ada8facbeb605ca4..41ce98375a2f142c35e6679851ae445a94a2afbb 100644 (file)
Binary files a/models/turrets/walker_base.tga and b/models/turrets/walker_base.tga differ

diff --git a/models/turrets/walker_base_glow.tga b/models/turrets/walker_base_glow.tga
index bfe8dfeb05bc4f421845e2087669abdf8dfdd897..bc4ebd01ee31246611cc9c907b7370ccba974037 100644 (file)
Binary files a/models/turrets/walker_base_glow.tga and b/models/turrets/walker_base_glow.tga differ

diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc
index 1332d60ca106f35fd90f1658be69f978b20a22f4..95efb4cc61c730d822a75fcc50afed9e36bf3c1b 100644 (file)
--- a/qcsrc/client/tturrets.qc
+++ b/qcsrc/client/tturrets.qc
@@ -165,31 +165,36 @@ void turret_remove()
     remove(self.tur_head);
     self.tur_head = world;    
 }
-
+.vector glowmod;
 void turret_changeteam()
-{
-       self.colormod = '0 0 0';
-       
-       switch(self.team)
+{      
+       switch(self.team - 1)
        {
         case COLOR_TEAM1: // Red
-            self.colormod = '2 0.5 0.5';
+            self.glowmod = '2 0 0';
             break;
 
         case COLOR_TEAM2: // Blue
-            self.colormod = '0.5 0.5 2';
+            self.glowmod = '0 0 2';
             break;
 
         case COLOR_TEAM3: // Yellow
-            self.colormod = '1.4 1.4 0.6';
+            self.glowmod = '1 1 0';
             break;
 
         case COLOR_TEAM4: // Pink
-            self.colormod = '1.4 0.6 1.4';
+            self.glowmod = '1 0 1';
             break;
        }
        
-       self.tur_head.colormod = self.colormod;    
+       if(self.team)
+        self.colormap = 1024 + (self.team - 1) * 17;
+       else
+           self.colormap = 1024 + (1 + rint(random() * 3) - 1) * 17;           
+       
+       self.tur_head.colormap = self.colormap;
+       self.tur_head.glowmod = self.glowmod;
+       
 }
 
 void turret_head_draw()
@@ -218,7 +223,7 @@ void turret_draw()
     }
     
     if(self.health < 85)    
-    if(dt < 0.1)
+    if(dt < 0.05)
         pointparticles(particleeffectnum("smoke_small"), (self.origin + (randomvec() * 80)), '0 0 0', 1);        
     
     if(self.health < 32)
@@ -247,7 +252,7 @@ void turret_walker_draw()
     self.angles_y = self.move_angles_y;
     
     if (self.health < 127)
-    if(random() < 0.25)
+    if(random() < 0.15)
         te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16);    
 }
 
@@ -275,7 +280,7 @@ void turret_ewheel_draw()
     self.angles_y = self.move_angles_y;
     
     if (self.health < 127)
-    if(random() < 0.25)
+    if(random() < 0.05)
         te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16);    
 }
 
@@ -448,6 +453,12 @@ void ent_turret()
            
            turret_precache(self.turret_type);
            turret_construct();
+           self.colormap = 1024; // + (1 + rint(random() * 3) - 1) * 17;               
+           self.glowmod = '0 1 1'; 
+           self.tur_head.colormap = self.colormap;
+           self.tur_head.glowmod = self.glowmod;
+           
+           //turret_changeteam();
     }
     
     if(sf & TNSF_ANG)
@@ -491,12 +502,12 @@ void ent_turret()
     {
         float _team;
         _team = ReadByte();
-        _team -= 1; // /&)=(%&#)&%)/#&)=½!!!½!!". thanks.
+        //_team -= 1; // /&)=(%&#)&%)/#&)=½!!!½!!". thanks.
         self.health = ReadByte();
         if(_team != self.team)
         {
             self.team = _team;
-            turret_changeteam();        
+            turret_changeteam();
         }
         
         if(self.health == 0)

diff --git a/qcsrc/server/tturrets/system/system_main.qc b/qcsrc/server/tturrets/system/system_main.qc
index ea0f6b22668dd3ddcb9d6a3595d2798294fe0c5c..b4ee78139c21c6e31538fa7b2ad781de13ef1725 100644 (file)
--- a/qcsrc/server/tturrets/system/system_main.qc
+++ b/qcsrc/server/tturrets/system/system_main.qc
@@ -759,7 +759,7 @@ void turret_think()
     // ONS uses somewhat backwards linking.
     if (teamplay)
     {
-        if not (g_onslaught)
+        if (g_onslaught)
             if (self.target)
             {
                 e = find(world, targetname,self.target);