Merge branch 'master' of https://github.com/mtiusane/new-edge into bp-on-hud

3 files changed, 194 insertions, 1 deletions

diff --git a/assets/scripts/general_human_buildables.particle b/assets/scripts/general_human_buildables.particle
index 52ffb64..8a40717 100644
--- a/assets/scripts/general_human_buildables.particle
+++ b/assets/scripts/general_human_buildables.particle
@@ -261,4 +261,4 @@ humanBuildableDestroyedPS
     delay 0
     period 0 - ~0%
   }
-}
\ No newline at end of file
+}
diff --git a/assets/scripts/hw_rocketl.particle b/assets/scripts/hw_rocketl.particle
new file mode 100644
index 0000000..891ac18
--- /dev/null
+++ b/assets/scripts/hw_rocketl.particle
@@ -0,0 +1,135 @@
+models/weapons/rocketl/missilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/smoke
+
+      displacement 0 0 0 ~0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 50
+      velocity          0 0 1 ~20
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 50
+      acceleration          0 0 0 0
+
+      radius 0 0.0 60.0
+      alpha  0 1.0 0.0
+      rotation ~360 ~360 -
+      bounce 0.5
+
+      lifeTime 700~50%
+    }
+
+    count infinite
+    delay 0
+    period 20 - ~0%
+  }
+}
+
+models/weapons/rocketl/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync rocketFlareParticle
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     0
+      velocity              0 0 0 ~0
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 0 ~0
+      accelerationMagnitude 0
+
+      radius                0 50 100
+      alpha                 250 1 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+
+      lifeTime              40
+    }
+
+    count   1
+    delay   0
+    period  0 - 0
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/smoke
+      //shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     100
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 0 60
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+
+      lifeTime              800~200
+    }
+
+    count   10
+    delay   0
+    period  0 - 0
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync flame3 flame4 flame5 flame6 flame7 flame8 flame9 flame10 flame11 flame12 flame13 flame14 flame15 flame16 flame17 flame18 flame19 flame20 flame21 flame22 flame23 flame24 flame25
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     100
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 0 100
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
+
+      lifeTime              300~100
+    }
+
+    count   1
+    delay   0
+    period  0 - 0
+  }
+}
+
diff --git a/assets/scripts/hw_rocketl.shader b/assets/scripts/hw_rocketl.shader
new file mode 100644
index 0000000..28c56cb
--- /dev/null
+++ b/assets/scripts/hw_rocketl.shader
@@ -0,0 +1,58 @@
+rocketFlash
+{
+	deformVertexes autosprite
+	{
+		clampmap models/weapons/rocketl/muzzy.tga
+		blendfunc add
+		tcMod rotate 1246
+	}
+	{
+		clampmap models/weapons/rocketl/muzzy.tga
+		blendfunc add
+		tcMod rotate -1246
+	}
+}
+
+rocketFlare
+{
+	deformVertexes autosprite
+	{
+		clampmap models/weapons/rocketl/wide.tga
+		blendfunc add
+		rgbGen const ( 0.980392 0.882353 0.737255 )
+	}
+}
+
+rocketFlareParticle
+{
+	{
+		clampmap models/weapons/rocketl/wide.tga
+		blendfunc add
+		rgbGen const ( 0.980392 0.882353 0.737255 )
+	}
+}
+
+rocketThrust
+{
+	cull disable
+	{
+		clampmap models/weapons/rocketl/flarey.tga
+		blendfunc add
+		rgbGen const ( 0.541176 0.341176 0.156863 )
+		tcMod rotate -96
+		tcMod stretch sin 0.3 0.7 0 8 
+	}
+	{
+		clampmap models/weapons/rocketl/wide.tga
+		blendfunc add
+		rgbGen const ( 0.843137 0.588235 0.4 )
+	}
+	{
+		clampmap models/weapons/rocketl/newflare.tga
+		blendfunc add
+		rgbGen const ( 0.713726 0.270588 0.121569 )
+		tcMod rotate 46
+		tcMod stretch inversesawtooth 0.6 0.4 0 4 
+	}
+}
+