[nexuiz-commits] r6651 - in branches/nexuiz-2.0: . data/models/onslaught data/qcsrc/server data/textures

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-05-04 02:57:00 -0400 (Mon, 04 May 2009)
New Revision: 6651

Added:
   branches/nexuiz-2.0/data/models/onslaught/reactor_dead.md3
   branches/nexuiz-2.0/data/models/onslaught/reactor_dmg1.md3
   branches/nexuiz-2.0/data/models/onslaught/reactor_dmg2.md3
   branches/nexuiz-2.0/data/textures/core_dmg1.tga
   branches/nexuiz-2.0/data/textures/core_dmg1_glow.tga
   branches/nexuiz-2.0/data/textures/core_dmg2.tga
   branches/nexuiz-2.0/data/textures/core_dmg2_glow.tga
   branches/nexuiz-2.0/data/textures/reactor_dead.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg1.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg1_glow.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg1_shirt.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg2.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg2_glow.tga
   branches/nexuiz-2.0/data/textures/reactor_dmg2_shirt.tga
Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
Log:
r6647 | morphed | 2009-05-04 01:50:45 +0200 (Mon, 04 May 2009) | 1 line
onslaught - visible damage for generator ( code by Taoki )


Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-05-04 06:50:55 UTC (rev 6650)
+++ branches/nexuiz-2.0/.patchsets	2009-05-04 06:57:00 UTC (rev 6651)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6549,6552-6567,6572-6582,6585-6589,6592-6593,6597-6629,6632-6646,6648-6648
+revisions_applied = 1-6549,6552-6567,6572-6582,6585-6589,6592-6593,6597-6629,6632-6648

Copied: branches/nexuiz-2.0/data/models/onslaught/reactor_dead.md3 (from rev 6647, trunk/data/models/onslaught/reactor_dead.md3)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/onslaught/reactor_dmg1.md3 (from rev 6647, trunk/data/models/onslaught/reactor_dmg1.md3)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/models/onslaught/reactor_dmg2.md3 (from rev 6647, trunk/data/models/onslaught/reactor_dmg2.md3)
===================================================================
(Binary files differ)

Modified: branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-05-04 06:50:55 UTC (rev 6650)
+++ branches/nexuiz-2.0/data/qcsrc/server/mode_onslaught.qc	2009-05-04 06:57:00 UTC (rev 6651)
@@ -416,6 +416,12 @@
 		self.think(); // do the first explosion now
 		onslaught_updatelinks();
 	}
+	if(self.health < cvar("g_onslaught_gen_health") * 0.75)
+		setmodel(self, "models/onslaught/reactor_dmg1.md3");
+	if(self.health < cvar("g_onslaught_gen_health") * 0.35)
+		setmodel(self, "models/onslaught/reactor_dmg2.md3");
+	if(self.health <= 0)
+		setmodel(self, "models/onslaught/reactor_dead.md3");
 };
 
 // update links after a delay
@@ -594,6 +600,9 @@
 	local entity e;
 	precache_model("models/onslaught/generator.md3");
 	precache_model("models/onslaught/generator_shield.md3");
+	precache_model("models/onslaught/reactor_dmg1.md3");
+	precache_model("models/onslaught/reactor_dmg2.md3");
+	precache_model("models/onslaught/reactor_dead.md3");
 	precache_sound("onslaught/generator_decay.wav");
 	precache_sound("weapons/grenade_impact.wav");
 	precache_sound("weapons/rocket_impact.wav");

Copied: branches/nexuiz-2.0/data/textures/core_dmg1.tga (from rev 6647, trunk/data/textures/core_dmg1.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/core_dmg1_glow.tga (from rev 6647, trunk/data/textures/core_dmg1_glow.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/core_dmg2.tga (from rev 6647, trunk/data/textures/core_dmg2.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/core_dmg2_glow.tga (from rev 6647, trunk/data/textures/core_dmg2_glow.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dead.tga (from rev 6647, trunk/data/textures/reactor_dead.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg1.tga (from rev 6647, trunk/data/textures/reactor_dmg1.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg1_glow.tga (from rev 6647, trunk/data/textures/reactor_dmg1_glow.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg1_shirt.tga (from rev 6647, trunk/data/textures/reactor_dmg1_shirt.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg2.tga (from rev 6647, trunk/data/textures/reactor_dmg2.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg2_glow.tga (from rev 6647, trunk/data/textures/reactor_dmg2_glow.tga)
===================================================================
(Binary files differ)

Copied: branches/nexuiz-2.0/data/textures/reactor_dmg2_shirt.tga (from rev 6647, trunk/data/textures/reactor_dmg2_shirt.tga)
===================================================================
(Binary files differ)