Merge branch 'master' into cbrutail/decals-xonotic

[xonotic/xonotic-maps.pk3dir.git] / scripts / liquids_lava.shader

diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index 6e448dd4898927e0bcb5854b2541b62c83287bb8..f2060c4f215ffd24a9e945f483b2d2abab4a5b28 100644 (file)
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -1,16 +1,33 @@
-textures/liquids_lava/protolava
+textures/liquids_lava/lava0
 {
-       qer_editorimage textures/liquids_lava/protolava.jpg
-       qer_trans 0.5
-       surfaceparm trans
-       surfaceparm nonsolid
+       qer_editorimage textures/liquids_lava/lava0.tga
        surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
        deformVertexes wave 150.0 sin 2 5 0.25 0.1
        Q3map_TessSize 128
-       cull none
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
+       {
+               map textures/liquids_lava/lava0.tga
+               blendfunc add
+       }
+}
+
+textures/liquids_lava/lava0_flow
+{
+       qer_editorimage textures/liquids_lava/lava0.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       q3map_surfacelight 1000
+       q3map_lightSubdivide 64
        {
-               map textures/liquids_lava/protolava.jpg
-               blendFunc add
-               rgbGen identity
+               map textures/liquids_lava/lava0.tga
+               blendfunc add
+               tcMod scroll 0 -0.25
        }
 }
+