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

27 files changed, 234 insertions, 22 deletions

diff --git a/assets/icons/iconw_rocketl.tga b/assets/icons/iconw_rocketl.tga
new file mode 100644
index 0000000..0aa1e97
--- /dev/null
+++ b/assets/icons/iconw_rocketl.tga
diff --git a/assets/models/ammo/rocket/rocket.md3 b/assets/models/ammo/rocket/rocket.md3
new file mode 100644
index 0000000..c181114
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket.md3
diff --git a/assets/models/ammo/rocket/rocket.tga b/assets/models/ammo/rocket/rocket.tga
new file mode 100644
index 0000000..47e4606
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket.tga
diff --git a/assets/models/ammo/rocket/rocket_1.md3 b/assets/models/ammo/rocket/rocket_1.md3
new file mode 100644
index 0000000..668f3f9
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket_1.md3
diff --git a/assets/models/ammo/rocket/rocket_2.md3 b/assets/models/ammo/rocket/rocket_2.md3
new file mode 100644
index 0000000..c2af2a0
--- /dev/null
+++ b/assets/models/ammo/rocket/rocket_2.md3
diff --git a/assets/models/ammo/rocket/thrustc1.tga b/assets/models/ammo/rocket/thrustc1.tga
new file mode 100644
index 0000000..581b972
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc1.tga
diff --git a/assets/models/ammo/rocket/thrustc2.tga b/assets/models/ammo/rocket/thrustc2.tga
new file mode 100644
index 0000000..718f95d
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc2.tga
diff --git a/assets/models/ammo/rocket/thrustc3.tga b/assets/models/ammo/rocket/thrustc3.tga
new file mode 100644
index 0000000..ea1cc68
--- /dev/null
+++ b/assets/models/ammo/rocket/thrustc3.tga
diff --git a/assets/models/weapons/abuildupg/flash0.wav b/assets/models/weapons/abuild/flash0.wav
index 97e12c9..97e12c9 100644
--- a/assets/models/weapons/abuildupg/flash0.wav
+++ b/assets/models/weapons/abuild/flash0.wav
diff --git a/assets/models/weapons/abuildupg/impactflesh0.wav b/assets/models/weapons/abuild/impactflesh0.wav
index 53476e8..53476e8 100644
--- a/assets/models/weapons/abuildupg/impactflesh0.wav
+++ b/assets/models/weapons/abuild/impactflesh0.wav
diff --git a/assets/models/weapons/abuild/weapon.cfg b/assets/models/weapons/abuild/weapon.cfg
index 46cfdaa..a359c2e 100644
--- a/assets/models/weapons/abuild/weapon.cfg
+++ b/assets/models/weapons/abuild/weapon.cfg
@@ -5,7 +5,15 @@ icon              icons/icona_builder
 
 secondary
 {
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
+  flashSound        0 models/weapons/abuild/flash0.wav
+  impactFleshSound  0 models/weapons/abuild/impactflesh0.wav
   alwaysImpact
 }
+
+tertiary
+{
+  missileModel      models/weapons/level3upg/missile.md3
+
+  impactMark        64 granger_spit
+  impactSound       0 sound/misc/organic_bounce.wav
+}
diff --git a/assets/models/weapons/abuildupg/weapon.cfg b/assets/models/weapons/abuildupg/weapon.cfg
deleted file mode 100644
index 45d154c..0000000
--- a/assets/models/weapons/abuildupg/weapon.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-disableIn3rdPerson
-crosshair         15 gfx/2d/crosshair-alien_s
-
-icon              icons/icona_builder
-
-secondary
-{
-  flashSound        0 models/weapons/abuildupg/flash0.wav
-  impactFleshSound  0 models/weapons/abuildupg/impactflesh0.wav
-  alwaysImpact
-}
-
-tertiary
-{
-  missileModel      models/weapons/level3upg/missile.md3
-
-  impactMark        64 granger_spit
-  impactSound       0 sound/misc/organic_bounce.wav
-}
diff --git a/assets/models/weapons/rocketl/flare.tga b/assets/models/weapons/rocketl/flare.tga
new file mode 100644
index 0000000..86516ca
--- /dev/null
+++ b/assets/models/weapons/rocketl/flare.tga
diff --git a/assets/models/weapons/rocketl/flarey.tga b/assets/models/weapons/rocketl/flarey.tga
new file mode 100644
index 0000000..37f56dc
--- /dev/null
+++ b/assets/models/weapons/rocketl/flarey.tga
diff --git a/assets/models/weapons/rocketl/flash0.wav b/assets/models/weapons/rocketl/flash0.wav
new file mode 100644
index 0000000..009febe
--- /dev/null
+++ b/assets/models/weapons/rocketl/flash0.wav
diff --git a/assets/models/weapons/rocketl/impact0.wav b/assets/models/weapons/rocketl/impact0.wav
new file mode 100644
index 0000000..f232ff1
--- /dev/null
+++ b/assets/models/weapons/rocketl/impact0.wav
diff --git a/assets/models/weapons/rocketl/muzzy.tga b/assets/models/weapons/rocketl/muzzy.tga
new file mode 100644
index 0000000..a452b3f
--- /dev/null
+++ b/assets/models/weapons/rocketl/muzzy.tga
diff --git a/assets/models/weapons/rocketl/newflare.tga b/assets/models/weapons/rocketl/newflare.tga
new file mode 100644
index 0000000..fd6866e
--- /dev/null
+++ b/assets/models/weapons/rocketl/newflare.tga
diff --git a/assets/models/weapons/rocketl/rocketl.md3 b/assets/models/weapons/rocketl/rocketl.md3
new file mode 100644
index 0000000..4119209
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl.md3
diff --git a/assets/models/weapons/rocketl/rocketl_hand.md3 b/assets/models/weapons/rocketl/rocketl_hand.md3
new file mode 100644
index 0000000..2a03eed
--- /dev/null
+++ b/assets/models/weapons/rocketl/rocketl_hand.md3
diff --git a/assets/models/weapons/rocketl/skin.tga b/assets/models/weapons/rocketl/skin.tga
new file mode 100644
index 0000000..59e1399
--- /dev/null
+++ b/assets/models/weapons/rocketl/skin.tga
diff --git a/assets/models/weapons/rocketl/weapon.cfg b/assets/models/weapons/rocketl/weapon.cfg
new file mode 100644
index 0000000..e5dafc6
--- /dev/null
+++ b/assets/models/weapons/rocketl/weapon.cfg
@@ -0,0 +1,19 @@
+weaponModel       models/weapons/rocketl/rocketl.md3
+icon              icons/iconw_rocketl
+crosshair         48 gfx/2d/crosshair-lcannon_s
+
+primary
+{
+  missileModel          models/ammo/rocket/rocket.md3
+
+  missileSound          models/weapons/lcannon/missle.wav
+  missileParticleSystem models/weapons/rocketl/missilePS
+
+  flashDlightColor      1.0 0.7 0.0
+  flashSound            0 models/weapons/rocketl/flash0.wav
+
+  impactMark            32 gfx/marks/bullet_mrk
+  impactSound           0 models/weapons/rocketl/impact0.wav
+  impactParticleSystem  models/weapons/rocketl/impactPS
+}
+
diff --git a/assets/models/weapons/rocketl/wide.tga b/assets/models/weapons/rocketl/wide.tga
new file mode 100644
index 0000000..04a59b4
--- /dev/null
+++ b/assets/models/weapons/rocketl/wide.tga
diff --git a/assets/rocketl-copyright b/assets/rocketl-copyright
new file mode 100644
index 0000000..fcb3c04
--- /dev/null
+++ b/assets/rocketl-copyright
@@ -0,0 +1,11 @@
+Rocket Launcher assets:
+
+flash0.wav:
+  http://freesound.org/people/shaynecantly/sounds/131555/
+
+impact0.wav:
+  http://freesound.org/people/sarge4267/sounds/102734/
+  http://freesound.org/people/sarge4267/sounds/102719/
+
+Models and textures:
+  http://openarena.ws/
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 
+	}
+}
+