diff options
author | Michael Levin <risujin@fastmail.fm> | 2009-10-03 11:17:25 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:14:50 +0000 |
commit | 6916f8fb5d3a19bf0bdfb84948b19445954306d9 (patch) | |
tree | 464c47a1e3655dae4cd2c6d307ece5d8ba2fef6b /scripts | |
parent | 2765a1c4a871cd9d34e5b6fce1e3c419a8e4dd6a (diff) |
* I'm sick of entering \give 9999 every time I need to test something. Whenever cheats are enabled, players spawn with half-full credits.
* Reactor used to deal more damage to each Alien when multiple Aliens attacked it, fixed to ONE radius damage call.
Extensive visual modifications to Mass Driver:
* Added a short, briefly-displayed pseudo-trail
* Impact system modified to have a large impact sprite and otherwise be more consistent with Lasgun
* Added several files for the trail and shader
* Firing code modified to generate visually correct trails and impact positions
* Added a new event for Mass Driver trails, doubles as impact event to save bandwidth
The Mass Driver trail extends from the gun rather than the muzzle to be more visually realistic. Shooting it from the muzzle prevents you from even seeing the trail and in 3rd person looks very wrong. The downside to the shifted origin is that the impact positions (multiple hits only) are not aligned with the beam. Had to add a good bit of complicated, mathy code to generate impact events in visually accurate locations. Looks damn good though.
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mdriver.trail | 10 | ||||
-rw-r--r-- | scripts/weapons.particle | 47 | ||||
-rw-r--r-- | scripts/weapons.shader | 93 |
3 files changed, 137 insertions, 13 deletions
diff --git a/scripts/mdriver.trail b/scripts/mdriver.trail new file mode 100644 index 00000000..b1545e6b --- /dev/null +++ b/scripts/mdriver.trail @@ -0,0 +1,10 @@ +models/weapons/mdriver/fireTS +{ + beam + { + shader gfx/mdriver/trail + width 3.0 3.0 + textureType stretch 0.94 0.03 + } + lifeTime 70 +} diff --git a/scripts/weapons.particle b/scripts/weapons.particle index 40971d49..c0b2ab24 100644 --- a/scripts/weapons.particle +++ b/scripts/weapons.particle @@ -417,36 +417,57 @@ models/weapons/mdriver/impactPS {
particle
{
+ shader sync gfx/mdriver/green_particle + + normalDisplacement 1.0 + + velocityType normal
+
+ radius 0 6.0 12.0
+ alpha 70 1.0 0.0
+ rotation 0 ~360 -
+
+ lifeTime 140
+ }
+
+ count 1
+ delay 0
+ period 0 - ~0%
+ } + + ejector + { + particle
+ {
shader sync gfx/mdriver/green_particle
displacement 0 0 0 ~2.0
-
- normalDisplacement 10.0
+ normalDisplacement 7.0
velocityType normal
velocityDir linear
- velocityMagnitude 400
- velocity 0 0 0 ~80
+ velocityMagnitude 200
+ velocity 0 0 0 ~90
- accelerationType normal
+ accelerationType static
accelerationDir linear
- accelerationMagnitude 200
- acceleration 0 0 1 ~360
+ accelerationMagnitude 300
+ acceleration 0 0 -1 ~10
- radius 0 6.0 4.0
- alpha 0 1.0 0.0
+ radius 0 2.0~1.0 0.0
+ alpha 0 1.0 1.0
rotation 0 ~360 -
bounce 0.5
- lifeTime 1000
+ lifeTime 500
}
- count 10
+ count 3
delay 0
period 0 - ~0%
- }
+ } }
-
+ models/weapons/lcannon/missilePS
{
ejector
diff --git a/scripts/weapons.shader b/scripts/weapons.shader new file mode 100644 index 00000000..960aecb6 --- /dev/null +++ b/scripts/weapons.shader @@ -0,0 +1,93 @@ +gfx/blaster/orange_particle +{ + cull disable + { + map gfx/blaster/orange_particle.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + rgbGen vertex + } +} + +gfx/mdriver/green_particle +{ + cull disable + { + map gfx/mdriver/green_particle.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen vertex + alphaGen vertex + } +} + +gfx/mdriver/trail +{ + nomipmaps + cull disable + { + map gfx/mdriver/trail.tga + blendFunc blend + } +} + +gfx/psaw/blue_particle +{ + cull disable + { + map gfx/psaw/blue_particle.jpg + blendFunc GL_ONE GL_ONE + alphaGen vertex + rgbGen vertex + } +} + +gfx/rifle/verysmallrock +{ + cull disable + { + map gfx/rifle/verysmallrock.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + rgbGen vertex + } +} + +gfx/prifle/red_blob +{ + cull disable + { + map gfx/prifle/red_blob.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + } +} + +gfx/prifle/red_streak +{ + nomipmaps + cull disable + { + map gfx/prifle/red_streak.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + alphaGen vertex + } +} + +gfx/lcannon/primary +{ + cull disable + { + animmap 24 gfx/lcannon/primary_1.jpg gfx/lcannon/primary_2.jpg gfx/lcannon/primary_3.jpg gfx/lcannon/primary_4.jpg + blendFunc GL_ONE GL_ONE + } +} + +gfx/lasgun/purple_particle +{ + cull disable + { + map gfx/lasgun/purple_particle.tga + blendFunc GL_ONE GL_ONE + } +} + |