0.1.7

3 files changed, 396 insertions, 31 deletions

diff --git a/assets/scripts/conkit.shader b/assets/scripts/conkit.shader
new file mode 100644
index 0000000..6bcf33f
--- /dev/null
+++ b/assets/scripts/conkit.shader
@@ -0,0 +1,300 @@
+models/weapons/ckit/screen
+{
+	{
+    videoMap video/ckit.roq
+	}
+}
+
+gfx/ckit/background
+{
+  sort 16
+  {
+    map gfx/ckit/background.jpg
+    blendFunc add
+    rgbGen wave sin 0.15 0.02 0 129
+  }
+}
+
+gfx/ckit/overlay
+{
+  sort 16
+	{
+		map gfx/ckit/noise.jpg
+		blendFunc filter
+    tcMod scroll 123.456 789.012
+	}
+}
+
+// need to manually define all these shaders
+// otherwise the shading and the sorting are screwed up
+
+gfx/2d/digital/0
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/0.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/1
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/1.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/2
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/2.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/3
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/3.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/4
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/4.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/5
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/5.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/6
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/6.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/7
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/7.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/8
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/8.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/9
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/9.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/comma
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/comma.tga
+    blendFunc blend
+  }
+}
+
+gfx/2d/digital/minus
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/2d/digital/minus.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_bp
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_bp.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_current
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_current.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_depth
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_depth.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_health
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_health.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_height
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_height.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_network
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_network.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_nopower
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_nopower.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_nosurge
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_nosurge.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_off
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_off.tga
+    blendFunc blend
+  }
+}
+
+
+gfx/ckit/icon_power
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_power.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_storedbp
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_storedbp.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_surge
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_surge.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_time
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_time.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_voltage
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_voltage.tga
+    blendFunc blend
+  }
+}
+
+gfx/ckit/icon_width
+{
+  nopicmip
+  nomipmaps
+  {
+    map gfx/ckit/icon_width.tga
+    blendFunc blend
+  }
+}
diff --git a/assets/scripts/cuboid.particle b/assets/scripts/cuboid.particle
index c601bdf..343fecc 100644
--- a/assets/scripts/cuboid.particle
+++ b/assets/scripts/cuboid.particle
@@ -64,3 +64,30 @@ alienHatchPS
     period 10 - ~0%
   }
 }
+
+humanPowerZapPS
+{
+  ejector // RC overloading
+  {
+    particle
+    {
+      shader sync lightning01
+
+      displacement 0 0 0 80
+
+      velocityType static
+      accelerationType static
+
+      radius 0 80~30 80~30
+      alpha  0 1 1
+      rotation 0 ~360 -
+      bounce 0
+
+      lifeTime 75
+    }
+
+    count 3
+    delay 0
+    period 10 - 0
+  }
+}
\ No newline at end of file
diff --git a/assets/scripts/cuboid.shader b/assets/scripts/cuboid.shader
index fc5a764..66b9c5b 100644
--- a/assets/scripts/cuboid.shader
+++ b/assets/scripts/cuboid.shader
@@ -119,75 +119,69 @@ gfx/cuboid/build_axis
  }
 }
 
-/*  GENERIC DESTRUCTION ANIMATION SHADERS
- * These shaders are applied on model if the
- * cuboid is damaged.
+/*  CRACKS
+ * This is an animated shader, starting at 0s and ending at 1s.
+ * Cgame uses a shaderTime hack to select the proper frame.
  */
-models/cuboid/cracks_0
-{
- {
-  map models/cuboid/cracks_0.jpg
-  blendFunc filter
- }
-}
 
-models/cuboid/cracks_1
+models/cuboid/cracks
 {
+ sort 3
  {
-  map models/cuboid/cracks_1.jpg
-  blendFunc filter
+  map models/cuboid/cracks.tga
+  alphaFunc GT0
+  alphaGen wave sin 0.5 0.5 0.0 0.2
  }
 }
-
-models/cuboid/cracks_2
-{
- {
-  map models/cuboid/cracks_2.jpg
-  blendFunc filter
- }
-}
-
+ 
 /*  CUBOID-SPECIFIC TEXTURES
  * These shaders are applied to cuboid's model.
  */
 
 models/cuboid/glass/glass
 {
+ cull none
+ sort 4
  {
   map models/cuboid/glass/glass
   blendFunc filter
-  rgbGen lightingDiffuse
+  rgbGen identity
  }
 }
 
+
 models/cuboid/concrete/concrete
 {
+ sort 3
  {
   map models/cuboid/concrete/concrete.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
 }
 
 models/cuboid/ladder/ladder
 {
+ sort 3
  {
   map models/cuboid/ladder/ladder.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
 }
 
 models/cuboid/organic/organic
 {
+ sort 3
  {
   map models/cuboid/organic/organic.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
 }
 models/cuboid/organic/organic_1
 {
+ sort 3
  {
   map models/cuboid/organic/organic.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
  {
   map models/cuboid/organic/organic_fx.jpg
@@ -198,9 +192,10 @@ models/cuboid/organic/organic_1
 
 models/cuboid/organic/organic_2
 {
+ sort 3
  {
   map models/cuboid/organic/organic.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
  {
   map models/cuboid/organic/organic_fx.jpg
@@ -211,9 +206,10 @@ models/cuboid/organic/organic_2
 
 models/cuboid/organic/organic_3
 {
+ sort 3
  {
   map models/cuboid/organic/organic.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
  }
  {
   map models/cuboid/organic/organic_fx.jpg
@@ -224,11 +220,32 @@ models/cuboid/organic/organic_3
 
 models/cuboid/slime/slime
 {
+ sort 3
  {
   map models/cuboid/slime/slime.jpg
-  rgbGen lightingDiffuse
+  rgbGen vertex
   tcMod turb 0.75 0.25 0 0.07
-  tcGen environment
+ }
+ {
+  map models/cuboid/slime/slime.jpg
+  blendFunc add
+  rgbGen vertex
+  tcMod turb 0.63 0.19 0.5 0.11
+ }
+}
+
+/*  CAPACITOR BANK
+ */
+models/buildables/capbank/capbank
+{
+ {
+  map models/buildables/capbank/capbank.jpg
+  rgbGen lightingDiffuse
+ }
+ {
+  map models/buildables/capbank/capbank_lights.jpg
+  blendFunc add
+  rgbGen wave sin 0.9 0.1 0 1.5
  }
 }
 
@@ -284,3 +301,24 @@ gfx/2d/basivisionFlare
   blendFunc add
  }
 }
+
+gfx/misc/unpowered_prebuild
+{
+ cull disable
+ {
+  map models/buildables/telenode/rep_cyl.jpg
+  blendfunc add
+  rgbGen wave sin 0.1 0.05 0 123.45
+  tcMod scroll 0.2 0
+ }
+}
+
+lightning01
+{
+ nopicmip
+ {
+  map gfx/lightning/lightning01.jpg
+  blendFunc add
+ }
+}
+