Removed protolava and added lava0 (originally xonotic-nexcompat.pk3dir/textures/storm...

diff --git a/scripts/liquids.shader b/scripts/liquids.shader
index 56d1376556edbc01f775dfc5b2634bcc145583c4..52adc54c44b9cb84ae86b13e3dc80819ce25a7b8 100644 (file)
--- a/scripts/liquids.shader
+++ b/scripts/liquids.shader
@@ -114,19 +114,34 @@ textures/liquids_slime/slime1
        dp_water 0.1 0.8  3 3  1 1 0.5  1 1 0.5  0.75
 }
 
        dp_water 0.1 0.8  3 3  1 1 0.5  1 1 0.5  0.75
 }
 

-textures/liquids_lava/protolava
+textures/stormkeep/lava0

 {
 {

-       qer_editorimage textures/liquids_lava/protolava.jpg
-       qer_trans 0.5
-       surfaceparm trans
-       surfaceparm nonsolid
+       qer_editorimage textures/stormkeep/lava0.tga

        surfaceparm lava
        surfaceparm lava

+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable

        deformVertexes wave 150.0 sin 2 5 0.25 0.1
        Q3map_TessSize 128
        deformVertexes wave 150.0 sin 2 5 0.25 0.1
        Q3map_TessSize 128

-       cull none
+       q3map_surfacelight 1000

        {
        {

-               map textures/liquids_lava/protolava.jpg
-               blendFunc add
-               rgbGen identity
+               map textures/stormkeep/lava0.tga
+               blendfunc add

        }
 }
        }
 }

+
+textures/stormkeep/lava0_flow
+{
+       qer_editorimage textures/stormkeep/lava0.tga
+       surfaceparm lava
+       surfaceparm noimpact
+       surfaceparm trans
+       cull disable
+       q3map_surfacelight 1000
+       {
+               map textures/stormkeep/lava0.tga
+               blendfunc add
+               tcMod scroll 0 -0.25
+       }
+}
+

diff --git a/textures/liquids_lava/lava0.tga b/textures/liquids_lava/lava0.tga
new file mode 100644 (file)
index 0000000..b602692
Binary files /dev/null and b/textures/liquids_lava/lava0.tga differ

diff --git a/textures/liquids_lava/lava0_glow.tga b/textures/liquids_lava/lava0_glow.tga
new file mode 100644 (file)
index 0000000..f08a088
Binary files /dev/null and b/textures/liquids_lava/lava0_glow.tga differ

diff --git a/textures/liquids_lava/protolava.jpg b/textures/liquids_lava/protolava.jpg
deleted file mode 100644 (file)
index 20083cc..0000000
Binary files a/textures/liquids_lava/protolava.jpg and /dev/null differ

diff --git a/textures/liquids_lava/protolava_glow.jpg b/textures/liquids_lava/protolava_glow.jpg
deleted file mode 100644 (file)
index 166ee79..0000000
Binary files a/textures/liquids_lava/protolava_glow.jpg and /dev/null differ

diff --git a/textures/liquids_lava/protolava_norm.jpg b/textures/liquids_lava/protolava_norm.jpg
deleted file mode 100644 (file)
index 413cefe..0000000
Binary files a/textures/liquids_lava/protolava_norm.jpg and /dev/null differ