Merge in data-gpp1.pk3.

6 files changed, 1486 insertions, 0 deletions

diff --git a/assets/scripts/crosshairs.shader b/assets/scripts/crosshairs.shader
new file mode 100644
index 0000000..278a296
--- /dev/null
+++ b/assets/scripts/crosshairs.shader
@@ -0,0 +1,96 @@
+gfx/2d/crosshair-alien_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-alien.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-rifle_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-rifle.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-prifle_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-prifle.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-chaingun_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-chaingun.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-mdriver_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-mdriver.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-lcannon_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-lcannon.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-lgun_s
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-lgun.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-flamer_s
+{
+	nopicmip
+	{
+		clampmap gfx/2d/crosshair-flamer1.tga
+		blendfunc blend
+		tcmod rotate 5
+		rgbGen vertex
+	}
+	{
+		clampmap gfx/2d/crosshair-flamer1.tga
+		blendfunc blend
+		tcmod rotate -5
+		rgbGen vertex
+	}
+}
+
+gfx/2d/crosshair-psaw
+{
+	nopicmip
+	{
+		map gfx/2d/crosshair-psaw.tga
+		blendfunc blend
+		rgbGen vertex
+	}
+}
\ No newline at end of file
diff --git a/assets/scripts/mdriver.trail b/assets/scripts/mdriver.trail
new file mode 100644
index 0000000..b1545e6
--- /dev/null
+++ b/assets/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/assets/scripts/misc.particle b/assets/scripts/misc.particle
new file mode 100644
index 0000000..40f3cc0
--- /dev/null
+++ b/assets/scripts/misc.particle
@@ -0,0 +1,378 @@
+firstPersonPoisonCloudPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/poisoncloud
+
+      displacement 0 0 0 ~32.0
+
+      parentVelocityFraction  1.0
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 16
+      velocity          0 0 1 ~0
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 1 0
+
+      radius 0 10.0 40.0
+      alpha  0 0.5 0.0
+      rotation 0 ~360 -
+      bounce 0.5
+
+      lifeTime 1000
+    }
+
+    count 400
+    delay 0
+    period 20 - ~0%
+  }
+}
+
+poisonCloudedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/poisoncloud
+
+      displacement 0 0 0 ~6.0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 60
+      velocity          0 0 0 ~50
+
+      radius 0 4.0 12.0
+      alpha  0 0.25 0.0
+      rotation 0 ~360 -
+
+      lifeTime 800
+    }
+
+    count 100
+    delay 0
+    period 50 200 ~0%
+  }
+}
+
+
+alienEvolvePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/green_acid
+
+      displacement 0 0 0 ~0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 150~75%
+      velocity          0 0 1 ~50
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 0
+
+      radius 0 5.0 30.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.2
+
+      lifeTime 1000
+    }
+
+    count 30
+    delay 0
+    period 5 - ~0%
+  }
+}
+
+alienBleedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .85 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 1.0 1.0 0.6 } -
+
+      lifeTime              400~100
+    }
+
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .85 0
+      rotation              0 ~165 ~195
+      bounce                0.0
+      color                 0 { 1.0 1.0 0.6 } -
+
+      lifeTime              400~100
+    }
+
+    count   2
+    delay   0
+    period  0 - 0
+  }
+
+  thirdPersonOnly
+}
+
+alienBuildableBleedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .85 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 1.0 1.0 0.6 } -
+
+      lifeTime              400~100
+    }
+
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .85 0
+      rotation              0 ~165 ~195
+      bounce                0.0
+      color                 0 { 1.0 1.0 0.6 } -
+
+      lifeTime              400~100
+    }
+
+    count   2
+    delay   0
+    period  0 - 0
+  }
+}
+
+
+humanBleedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
+
+      lifeTime              400~100
+    }
+
+    particle
+    {
+      shader sync gfx/damage/blood.tga
+      displacement          0 0 0 0
+
+      velocityType          normal
+
+      velocityDir           linear
+
+      velocityMagnitude     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
+
+      lifeTime              400~100
+    }
+
+    count   2
+    delay   0
+    period  0 - 0
+  }
+
+  thirdPersonOnly
+}
+
+humanBuildableBleedPS
+{
+  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     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
+
+      lifeTime              200~50
+    }
+
+    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     15
+      velocity              0 0 0 ~35
+
+      accelerationType      static
+      accelerationDir       linear
+      acceleration          0 0 -1 ~5
+      accelerationMagnitude 25
+
+      radius                0 5 8
+      alpha                 250 .75 0
+      rotation              0 ~-15 ~15
+      bounce                0.0
+      color                 0 { 0.8 0.2 0.2 } -
+
+      lifeTime              200~50
+    }
+
+    count   2
+    delay   0
+    period  0 - 0
+  }
+
+
+}
+
+disconnectPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/bubble
+      displacement          0 0 0 ~60
+
+      velocityType          static
+      velocityDir           linear
+      velocityMagnitude     15
+      velocity              0 0 1 ~90
+
+      radius                0 24 32
+      alpha                 0 1.0 -
+
+      lifeTime              1000~300
+    }
+
+    count   3
+    delay   0
+    period  0 - 0
+  }
+}
diff --git a/assets/scripts/ui.shader b/assets/scripts/ui.shader
new file mode 100644
index 0000000..a99d4f7
--- /dev/null
+++ b/assets/scripts/ui.shader
@@ -0,0 +1,19 @@
+ui/assets/neutral/squad_h
+{
+  nopicmip
+  {
+    map ui/assets/neutral/squad_h.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbgen vertex
+  }
+}
+
+ui/assets/neutral/squad_v
+{
+  nopicmip
+  {
+    map ui/assets/neutral/squad_v.tga
+		blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+		rgbgen vertex
+  }
+}
diff --git a/assets/scripts/weapons.particle b/assets/scripts/weapons.particle
new file mode 100644
index 0000000..cc4854e
--- /dev/null
+++ b/assets/scripts/weapons.particle
@@ -0,0 +1,890 @@
+models/weapons/hive/missilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader 20 models/weapons/hive/sprite1.tga models/weapons/hive/sprite2.tga
+
+      displacement 0 0 0 ~4.0
+
+      parentVelocityFraction  0.5
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 1 ~180
+
+      accelerationType      cent
+      accelerationDir       point
+      accelerationMagnitude 2000
+
+      rotation 0 -20.0~40.0 -20.0~40.0
+      radius 0 2.0 2.0
+      alpha  0 1.0 0.0
+      bounce 0.5
+
+      lifeTime 4000
+    }
+
+    count infinite
+    delay 0
+    period 100 - ~0%
+  }
+}
+
+models/weapons/rifle/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/rifle/verysmallrock
+
+      displacement 0 0 0 ~4.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 0 ~20
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 600
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 1.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 350
+    }
+
+    count 0~2
+    delay ~100
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/smoke
+
+      displacement 0 0 0 ~1.0
+      normalDisplacement 3.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 20
+      velocity          0 0 0 0
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 1 0
+
+      radius 0 4.0 6.0
+      alpha  0 0.5 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 250
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      normalDisplacement 3.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 200
+      velocity          0 0 0 ~160
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 600
+      acceleration          0 0 -1 0
+
+      radius 0 3.0 0.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 200
+    }
+
+    count 0~1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/rifle/muzzlePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/smoke
+
+      displacement 0 0 0 ~0.0
+
+      parentVelocityFraction 0.9
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 20
+      velocity          0 0 0 0
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 1 0
+
+      radius 0 2.0 4.0
+      alpha  0 0.4 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 200
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      model models/weapons/shells/rifle-shell.md3
+
+      displacement -5 -3 0 ~0.0
+
+      parentVelocityFraction 0.85
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 200
+      velocity          0 -1 3 ~10
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 -
+      bounce 0.5
+
+      lifeTime 5000
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/shotgun/muzzlePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/smoke
+
+      displacement 0 0 0 ~0.0
+
+      parentVelocityFraction 0.9
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 20
+      velocity          0 0 0 0
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 1 0
+
+      radius 0 2.0 4.0
+      alpha  0 0.4 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 200
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      model models/weapons/shells/shotgun-shell.md3
+
+      displacement -5 -3 0 ~0.0
+
+      parentVelocityFraction 0.85
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 200
+      velocity          0 -1 3 ~10
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 -
+      bounce 0.5
+
+      lifeTime 5000
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/chaingun/muzzlePS
+{
+  ejector
+  {
+    particle
+    {
+      model models/weapons/shells/rifle-shell.md3
+
+      displacement -5 -3 0 ~0.0
+
+      parentVelocityFraction 0.85
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 200
+      velocity          0 -1 3 ~10
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 -
+      bounce 0.5
+
+      lifeTime 5000
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/flamer/muzzlePS
+{
+  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.0
+
+      parentVelocityFraction 0.65
+
+      velocityType      cent
+      velocityDir       linear
+      velocityMagnitude 300
+      velocity          0 0 0 ~0
+
+      physicsRadius 15
+
+      radius 0 4.0 40.0
+      alpha  0 1.0 1.0
+      rotation 0 ~360 -
+      bounce 0.1
+
+      lifeTime 800
+    }
+
+    count infinite
+    delay 0
+    period 15 - ~0%
+  }
+}
+
+models/weapons/level1upg/muzzlePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/poisoncloud
+
+      displacement 0 0 0 ~0.0
+
+      parentVelocityFraction 1.0
+
+      velocityType      cent
+      velocityDir       linear
+      velocityMagnitude 80
+      velocity          0 0 0 ~50
+
+      radius 0 10.0 25.0
+      alpha  0 0.5 0.0
+      rotation 0 ~360 -
+      bounce 1.0
+
+      lifeTime 800
+    }
+
+    count 20
+    delay 0
+    period 40 - ~0%
+  }
+}
+
+models/weapons/blaster/missilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      displacement 0 0 0 ~2.0
+
+      parentVelocityFraction 0.5
+
+      radius 0 1.5 0.0
+      alpha  0 1.0 0.0
+      bounce 0.01
+
+      lifeTime 400
+    }
+
+    count infinite
+    delay 0
+    period 10 - ~0%
+  }
+}
+
+models/weapons/prifle/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/prifle/red_blob
+      
+      radius 0 3.0 6.0
+      alpha  70 1.0 0.0
+      rotation 0 ~360 -
+
+      lifeTime 140
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/prifle/missilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/prifle/red_blob
+
+      parentVelocityFraction 0.8
+
+      radius 0 2.0 1.5
+      alpha  0 0.8 0.0
+      bounce 0.01
+
+      lifeTime 400
+    }
+
+    count infinite
+    delay 0
+    period 10 - ~0%
+  }
+}
+
+models/weapons/mdriver/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/mdriver/green_particle
+
+      displacement 0 0 0 ~2.0
+
+      normalDisplacement 10.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 400
+      velocity          0 0 0 ~80
+
+      accelerationType      normal
+      accelerationDir       linear
+      accelerationMagnitude 200
+      acceleration          0 0 1 ~360
+
+      radius 0 6.0 4.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.5
+
+      lifeTime 1000
+    }
+
+    count 10
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/lcannon/missilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      displacement 0 0 0 ~3.0
+
+      parentVelocityFraction  1.0
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 120
+      velocity          0 0 1 ~360
+
+      radius 0 1.0 5.0
+      alpha  0 1.0 0.0
+      bounce 0.1
+
+      lifeTime 1000
+    }
+
+    count infinite
+    delay 0
+    period 50 - ~0%
+  }
+}
+
+models/weapons/lcannon/secondaryMissilePS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      displacement 0 0 0 ~3.0
+
+      parentVelocityFraction  0.5
+
+      radius 0 2.0 0.0
+      alpha  0 1.0 0.0
+      bounce 0.1
+
+      lifeTime 400
+    }
+
+    count infinite
+    delay 0
+    period 25 - ~0%
+  }
+}
+
+models/weapons/lcannon/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+      
+      radius 0 8.0 16.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      
+      scaleWithCharge 0.10
+
+      lifeTime 250
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      displacement 0 0 0 ~2.0
+
+      normalDisplacement 10.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 200
+      velocity          0 0 0 ~160
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 5.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.8
+
+      lifeTime 2000~1000
+    }
+
+    count 30
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/lcannon/primary
+
+      displacement 0 0 0 ~10.0
+
+      normalDisplacement 15.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 0 ~160
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 150
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 0.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 1.0
+      
+      scaleWithCharge 0.10
+
+      lifeTime 1000~1000
+    }
+
+    count 6
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/lcannon/secondaryImpactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+      
+      radius 0 8.0 16.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+
+      lifeTime 250
+    }
+
+    count 1
+    delay 0
+    period 0 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/blaster/orange_particle
+
+      displacement 0 0 0 ~2.0
+
+      normalDisplacement 10.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 150
+      velocity          0 0 0 ~160
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 -1 0
+
+      radius 0 1.0 5.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.8
+
+      lifeTime 2000~1000
+    }
+
+    count 10
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/psaw/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/psaw/blue_particle
+
+      displacement 0 0 0 ~2.0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 -1 ~25
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 ~10
+
+      radius 0 1.0~2.0 3.0~2.0
+      alpha  0 1.0 1.0
+      rotation 0 ~360 -
+      bounce 0.5
+
+      lifeTime 1000
+    }
+
+    count 3
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/lasgun/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/lasgun/purple_particle
+
+      displacement 0 0 0 ~2.0
+      normalDisplacement  7.0
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 100
+      velocity          0 0 0 ~90
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 600
+      acceleration          0 0 -1 ~10
+
+      radius 0 3.0~2.0 0.0
+      alpha  0 1.0 1.0
+      rotation 0 ~360 -
+      bounce 0.5
+
+      lifeTime 500
+    }
+
+    count 3
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/grenade/impactTrailPS
+{
+  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      static
+      velocityDir       linear
+      velocityMagnitude 30
+      velocity          0 0 -1 ~0
+
+      radius 0 30.0 10.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0
+
+      lifeTime 500
+    }
+
+    count 5
+    delay 0
+    period 40 - 0
+  }
+}
+
+models/weapons/grenade/impactPS
+{
+  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 11 ~0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 200~75%
+      velocity          0 0 1 ~10
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 300
+      acceleration          0 0 -1 0
+
+      radius 0 10.0 40.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0
+
+      lifeTime 500
+
+      childSystem models/weapons/grenade/impactTrailPS
+    }
+
+    count 5
+    delay 0
+    period 10 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/grenade/flare_01
+
+      displacement 0 0 8 ~0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 10~50%
+      velocity          0 0 1 ~60
+
+      radius 0 100.0 200.0
+      alpha  250 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0.0
+
+      lifeTime 300
+    }
+
+    count 1
+    delay 0
+    period 10 - ~0%
+  }
+
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/spark
+
+      displacement 0 0 8 ~0
+
+      velocityType      static
+      velocityDir       linear
+      velocityMagnitude 700~3%
+      velocity          0 0 1 ~180
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 1 0
+
+      radius 0 10.0 2.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      bounce 0
+
+      lifeTime 300
+    }
+
+    count 150
+    delay 0
+    period 0 - ~0%
+  }
+}
+
+models/weapons/level3upg/impactPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/level3upg/barb_splash
+
+      displacement 0 0 0 ~8
+
+      velocityType      normal
+      velocityDir       linear
+      velocityMagnitude 800
+      velocity          0 0 1 ~80
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 0
+
+      radius 0 3.0~2.0 0.0
+      alpha  0 1.0 1.0
+      rotation 0 ~360 -
+      bounce 0.4~100%
+
+      lifeTime 175
+    }
+
+    count 12
+    delay 0
+    period 0 - ~0%
+  }
+}
diff --git a/assets/scripts/weapons.shader b/assets/scripts/weapons.shader
new file mode 100644
index 0000000..960aecb
--- /dev/null
+++ b/assets/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
+  }
+}
+