Merge branch 'master' of https://github.com/mtiusane/new-edge

4 files changed, 137 insertions, 0 deletions

diff --git a/assets/scripts/headshot.particle b/assets/scripts/headshot.particle
new file mode 100644
index 0000000..42c7295
--- /dev/null
+++ b/assets/scripts/headshot.particle
@@ -0,0 +1,37 @@
+headShotPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/blood
+
+      displacement 0 0 20 ~2
+      parentVelocityFraction 1.0
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 150~75%
+      velocity          -1 0 1 ~60
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 ~30
+
+      radius 0 4.0 10.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      //bounce 0.2
+      bounce cull
+      bounceMark 1~1 10 gfx/marks/blood_mrk
+      bounceSound ~0.7 sound/edge/blood_splat.wav
+
+      lifeTime 1000~100%
+    }
+
+    count 50
+    delay 0
+    period 10 - ~0%
+  }
+}
diff --git a/assets/scripts/marks/blood_mrk.shader b/assets/scripts/marks/blood_mrk.shader
new file mode 100644
index 0000000..e1dc7b9
--- /dev/null
+++ b/assets/scripts/marks/blood_mrk.shader
@@ -0,0 +1,21 @@
+gfx/marks/blood_mrk
+{
+  polygonOffset
+  {
+    map gfx/marks/blood_mrk.tga
+    blendFunc blend
+    rgbGen identityLighting
+    alphaGen vertex
+  }
+}
+
+gfx/marks/ablood_mrk
+{
+  polygonOffset
+  {
+    map gfx/sprites/green_acid.tga // TODO
+    blendFunc blend
+    rgbGen identityLighting
+    alphaGen vertex
+  }
+}
diff --git a/assets/scripts/wound_bleed.particle b/assets/scripts/wound_bleed.particle
new file mode 100644
index 0000000..53d1f15
--- /dev/null
+++ b/assets/scripts/wound_bleed.particle
@@ -0,0 +1,79 @@
+humanWoundBleedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/blood
+
+      displacement 0 0 0 ~2
+      parentVelocityFraction 1.0
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 50~100%
+      velocity          -0.5 0 -1 ~30
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 ~30
+
+      radius 0 4.0 10.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      //bounce 0.2
+      bounce cull
+      bounceMark 1~1 10 gfx/marks/blood_mrk
+      //bounceSound ~1 sound/edge/blood_splat.wav
+
+      overdrawProtection
+
+      lifeTime 5000~50%
+    }
+
+    count 3
+    delay 0
+    period 1000 - ~100%
+  }
+}
+
+alienWoundBleedPS
+{
+  ejector
+  {
+    particle
+    {
+      shader sync gfx/sprites/green_acid // TODO?
+
+      displacement 0 0 0 ~2
+      parentVelocityFraction 1.0
+
+      velocityType      static_transform
+      velocityDir       linear
+      velocityMagnitude 50~100%
+      velocity          -0.5 0 -1 ~30
+
+      accelerationType      static
+      accelerationDir       linear
+      accelerationMagnitude 800
+      acceleration          0 0 -1 ~30
+
+      radius 0 4.0 10.0
+      alpha  0 1.0 0.0
+      rotation 0 ~360 -
+      //bounce 0.2
+      bounce cull
+      bounceMark 1~1 10 gfx/marks/ablood_mrk
+      //bounceSound ~1 sound/edge/blood_splat.wav // TODO?
+
+      overdrawProtection
+
+      lifeTime 5000~50%
+    }
+
+    count 3
+    delay 0
+    period 1000 - ~100%
+  }
+}
diff --git a/assets/sound/edge/blood_splat.wav b/assets/sound/edge/blood_splat.wav
new file mode 100644
index 0000000..16d255e
--- /dev/null
+++ b/assets/sound/edge/blood_splat.wav