Improve monster team colors

diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc
index 31992873dd35b909fc7f3c1e7c622612daf3bf7e..bf5e9cd559fa83001170b58f4350e3e21331a9e3 100644 (file)
--- a/qcsrc/server/monsters/lib/monsters.qc
+++ b/qcsrc/server/monsters/lib/monsters.qc
@@ -681,10 +681,17 @@ void monster_hook_spawn()
        
        if(teamplay && self.team)
        {
-               self.colormod = Team_ColorRGB(self.team);
+               //self.colormod = Team_ColorRGB(self.team);
+               //self.glowmod = self.colormod;
+               self.colormap = 1024 + (self.team - 1) * 17;
+               self.colormod = '1 1 1';
+               self.glowmod = Team_ColorRGB(self.team);
                self.monster_attack = TRUE;
        }
+       else
+               self.colormod = self.glowmod = '1 1 1';
        
+       // TODO: fix this...
        if (self.target)
        {
                self.target2 = self.target;

diff --git a/qcsrc/server/monsters/lib/spawn.qc b/qcsrc/server/monsters/lib/spawn.qc
index d9d68f1c65a7db8609cce9e002de6fecfefa88a7..2b5fed48100d06532abcaa8cd68ebeecc2d62a49 100644 (file)
--- a/qcsrc/server/monsters/lib/spawn.qc
+++ b/qcsrc/server/monsters/lib/spawn.qc
@@ -51,7 +51,9 @@ entity spawnmonster (string monster, entity spawnedby, entity own, vector orig,
                if(teamplay && autocvar_g_monsters_teams)
                        e.team = spawnedby.team; // colors handled in spawn code
                        
-               if not(teamplay)
+               if(teamplay)
+                       e.colormap = 1024;
+               else
                        e.colormap = spawnedby.colormap;
                        
                if(autocvar_g_monsters_owners)

diff --git a/textures/bloodyskull.jpg b/textures/bloodyskull.jpg
index e1dd7ea8436cc38d3f26b230914f166254ecc4ae..0213aab21dd3de09191378e68519ba0d9fce5fda 100644 (file)
Binary files a/textures/bloodyskull.jpg and b/textures/bloodyskull.jpg differ

diff --git a/textures/bloodyskull_pants.jpg b/textures/bloodyskull_pants.jpg
index e0083ac02bcc7c73368db4200c441e20bdc68313..51850c115f317f8295279630e37930c51bc92290 100644 (file)
Binary files a/textures/bloodyskull_pants.jpg and b/textures/bloodyskull_pants.jpg differ

diff --git a/textures/bloodyskull_robot_pants.tga b/textures/bloodyskull_robot_pants.tga
new file mode 100644 (file)
index 0000000..66319a3
Binary files /dev/null and b/textures/bloodyskull_robot_pants.tga differ

diff --git a/textures/mage.tga b/textures/mage.tga
index 89c02fc4c0b8e8e45dd6ba6ed0a7df637dc10dfb..55aadbaffa81444a6a4a6f3b5b413d91127d421c 100644 (file)
Binary files a/textures/mage.tga and b/textures/mage.tga differ

diff --git a/textures/mage_glow.tga b/textures/mage_glow.tga
new file mode 100644 (file)
index 0000000..8498c46
Binary files /dev/null and b/textures/mage_glow.tga differ

diff --git a/textures/mage_pants.tga b/textures/mage_pants.tga
new file mode 100644 (file)
index 0000000..a3d2e13
Binary files /dev/null and b/textures/mage_pants.tga differ

diff --git a/textures/meat.tga b/textures/meat.tga
index e9a74e293743845b9ac7bcdcf8bddb46da49072c..b9c2ccc9fe3035f627d6fd8fc755c8d7e621ef85 100644 (file)
Binary files a/textures/meat.tga and b/textures/meat.tga differ

diff --git a/textures/meat_alien.tga b/textures/meat_alien.tga
index 52c5246f2d4cd117b3fdd791be0704a594810e38..44ca7ac1e90d6b007655cd9fe45523636938bf74 100644 (file)
Binary files a/textures/meat_alien.tga and b/textures/meat_alien.tga differ

diff --git a/textures/meat_alien_pants.tga b/textures/meat_alien_pants.tga
new file mode 100644 (file)
index 0000000..de36704
Binary files /dev/null and b/textures/meat_alien_pants.tga differ

diff --git a/textures/meat_robot.tga b/textures/meat_robot.tga
index 838f75d5f1440368376426478dd79cb1cd8dc06f..94360a072aac6c90eb84e4115d268fc3fa331089 100644 (file)
Binary files a/textures/meat_robot.tga and b/textures/meat_robot.tga differ

diff --git a/textures/meat_robot_pants.tga b/textures/meat_robot_pants.tga
new file mode 100644 (file)
index 0000000..0286700
Binary files /dev/null and b/textures/meat_robot_pants.tga differ

diff --git a/textures/spider/spidertex.tga b/textures/spider/spidertex.tga
index e9f8df1e9a559e1f6dba11f03b2ad4f1bb42914e..c1c40c0dee9d039b36aadf0096e7aedd42fe499e 100644 (file)
Binary files a/textures/spider/spidertex.tga and b/textures/spider/spidertex.tga differ

diff --git a/textures/spider/spidertex_glow.tga b/textures/spider/spidertex_glow.tga
new file mode 100644 (file)
index 0000000..146cded
Binary files /dev/null and b/textures/spider/spidertex_glow.tga differ

diff --git a/textures/spider/spidertex_pants.tga b/textures/spider/spidertex_pants.tga
new file mode 100644 (file)
index 0000000..09263af
Binary files /dev/null and b/textures/spider/spidertex_pants.tga differ