From: Mario Date: Wed, 3 Apr 2013 18:06:03 +0000 (+1100) Subject: Improve monster team colors X-Git-Tag: xonotic-v0.8.0~241^2^2~436 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ade4baffae1193ea32bd885a4a0855305273a1a3;p=xonotic%2Fxonotic-data.pk3dir.git Improve monster team colors --- diff --git a/qcsrc/server/monsters/lib/monsters.qc b/qcsrc/server/monsters/lib/monsters.qc index 31992873dd..bf5e9cd559 100644 --- 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 d9d68f1c65..2b5fed4810 100644 --- 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 e1dd7ea843..0213aab21d 100644 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 e0083ac02b..51850c115f 100644 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 index 0000000000..66319a3191 Binary files /dev/null and b/textures/bloodyskull_robot_pants.tga differ diff --git a/textures/mage.tga b/textures/mage.tga index 89c02fc4c0..55aadbaffa 100644 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 index 0000000000..8498c467f0 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 index 0000000000..a3d2e132bc Binary files /dev/null and b/textures/mage_pants.tga differ diff --git a/textures/meat.tga b/textures/meat.tga index e9a74e2937..b9c2ccc9fe 100644 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 52c5246f2d..44ca7ac1e9 100644 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 index 0000000000..de367045c1 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 838f75d5f1..94360a072a 100644 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 index 0000000000..0286700299 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 e9f8df1e9a..c1c40c0dee 100644 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 index 0000000000..146cded10f 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 index 0000000000..09263af9b1 Binary files /dev/null and b/textures/spider/spidertex_pants.tga differ