[nexuiz-commits] r6729 - in trunk/data: models/onslaught qcsrc/server scripts textures
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue May 12 19:38:05 EDT 2009
Author: morphed
Date: 2009-05-12 19:38:05 -0400 (Tue, 12 May 2009)
New Revision: 6729
Added:
trunk/data/models/onslaught/generator_dmg3.md3
trunk/data/models/onslaught/generator_dmg4.md3
trunk/data/models/onslaught/generator_dmg5.md3
trunk/data/models/onslaught/generator_dmg6.md3
trunk/data/models/onslaught/generator_dmg7.md3
trunk/data/models/onslaught/generator_dmg8.md3
trunk/data/models/onslaught/generator_dmg9.md3
trunk/data/textures/generator.tga
trunk/data/textures/generator_destroyed.tga
trunk/data/textures/generator_gloss.tga
trunk/data/textures/generator_glow.tga
trunk/data/textures/generator_lightning.tga
trunk/data/textures/generator_lightning2.tga
trunk/data/textures/generator_norm.tga
trunk/data/textures/generator_pants.tga
Removed:
trunk/data/textures/core.tga
trunk/data/textures/core_dmg1.tga
trunk/data/textures/core_dmg1_glow.tga
trunk/data/textures/core_dmg2.tga
trunk/data/textures/core_dmg2_glow.tga
trunk/data/textures/core_gloss.tga
trunk/data/textures/core_glow.tga
trunk/data/textures/reactor.jpg
trunk/data/textures/reactor.tga
trunk/data/textures/reactor_dead.tga
trunk/data/textures/reactor_dmg1.tga
trunk/data/textures/reactor_dmg1_glow.tga
trunk/data/textures/reactor_dmg1_shirt.tga
trunk/data/textures/reactor_dmg2.tga
trunk/data/textures/reactor_dmg2_glow.tga
trunk/data/textures/reactor_dmg2_shirt.tga
trunk/data/textures/reactor_glow.tga
trunk/data/textures/reactor_shirt.tga
Modified:
trunk/data/models/onslaught/generator.md3
trunk/data/models/onslaught/generator_dead.md3
trunk/data/models/onslaught/generator_dmg1.md3
trunk/data/models/onslaught/generator_dmg2.md3
trunk/data/qcsrc/server/mode_onslaught.qc
trunk/data/scripts/onslaught.shader
Log:
new generator model, with damage models and small code changes for it
Modified: trunk/data/models/onslaught/generator.md3
===================================================================
(Binary files differ)
Modified: trunk/data/models/onslaught/generator_dead.md3
===================================================================
(Binary files differ)
Modified: trunk/data/models/onslaught/generator_dmg1.md3
===================================================================
(Binary files differ)
Modified: trunk/data/models/onslaught/generator_dmg2.md3
===================================================================
(Binary files differ)
Added: trunk/data/models/onslaught/generator_dmg3.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg3.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg4.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg4.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg5.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg5.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg6.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg6.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg7.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg7.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg8.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg8.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/onslaught/generator_dmg9.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/onslaught/generator_dmg9.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2009-05-12 22:43:56 UTC (rev 6728)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2009-05-12 23:38:05 UTC (rev 6729)
@@ -457,10 +457,24 @@
self.think(); // do the first explosion now
onslaught_updatelinks();
}
- if(self.health < cvar("g_onslaught_gen_health") * 0.75)
+ if(self.health < cvar("g_onslaught_gen_health") * 0.90)
setmodel(self, "models/onslaught/generator_dmg1.md3");
- if(self.health < cvar("g_onslaught_gen_health") * 0.35)
+ if(self.health < cvar("g_onslaught_gen_health") * 0.80)
setmodel(self, "models/onslaught/generator_dmg2.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.70)
+ setmodel(self, "models/onslaught/generator_dmg3.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.60)
+ setmodel(self, "models/onslaught/generator_dmg4.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.50)
+ setmodel(self, "models/onslaught/generator_dmg5.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.40)
+ setmodel(self, "models/onslaught/generator_dmg6.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.30)
+ setmodel(self, "models/onslaught/generator_dmg7.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.20)
+ setmodel(self, "models/onslaught/generator_dmg8.md3");
+ if(self.health < cvar("g_onslaught_gen_health") * 0.10)
+ setmodel(self, "models/onslaught/generator_dmg9.md3");
if(self.health <= 0)
setmodel(self, "models/onslaught/generator_dead.md3");
};
@@ -643,6 +657,13 @@
precache_model("models/onslaught/generator_shield.md3");
precache_model("models/onslaught/generator_dmg1.md3");
precache_model("models/onslaught/generator_dmg2.md3");
+ precache_model("models/onslaught/generator_dmg3.md3");
+ precache_model("models/onslaught/generator_dmg4.md3");
+ precache_model("models/onslaught/generator_dmg5.md3");
+ precache_model("models/onslaught/generator_dmg6.md3");
+ precache_model("models/onslaught/generator_dmg7.md3");
+ precache_model("models/onslaught/generator_dmg8.md3");
+ precache_model("models/onslaught/generator_dmg9.md3");
precache_model("models/onslaught/generator_dead.md3");
precache_sound("onslaught/generator_decay.wav");
precache_sound("weapons/grenade_impact.wav");
Modified: trunk/data/scripts/onslaught.shader
===================================================================
--- trunk/data/scripts/onslaught.shader 2009-05-12 22:43:56 UTC (rev 6728)
+++ trunk/data/scripts/onslaught.shader 2009-05-12 23:38:05 UTC (rev 6729)
@@ -35,4 +35,14 @@
tcMod scroll 3 0
tcMod rotate 10
}
+}
+ons_gen_spark
+{
+ cull none
+ {
+ animmap 9 textures/generator_lightning.tga textures/generator_lightning2.tga
+ tcMod scroll 0.5 0
+ blendfunc add
+
+ }
}
\ No newline at end of file
Deleted: trunk/data/textures/core.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_dmg1.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_dmg1_glow.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_dmg2.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_dmg2_glow.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_gloss.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/core_glow.tga
===================================================================
(Binary files differ)
Added: trunk/data/textures/generator.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_destroyed.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_destroyed.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_gloss.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_gloss.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_glow.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_glow.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_lightning.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_lightning.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_lightning2.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_lightning2.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_norm.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_norm.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/generator_pants.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/generator_pants.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/textures/reactor.jpg
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dead.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg1.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg1_glow.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg1_shirt.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg2.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg2_glow.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_dmg2_shirt.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_glow.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/textures/reactor_shirt.tga
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list