X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fliquids_lava.shader;h=60931cdc0bee58d3d2ce751fedb7ff456b095d49;hp=f2060c4f215ffd24a9e945f483b2d2abab4a5b28;hb=4d3266df75b37c9a1ea5fff5731e31c46045c359;hpb=9e609a787f1c1ee70e62d999b4a6fbe35cbdc991

diff --git a/scripts/liquids_lava.shader b/scripts/liquids_lava.shader
index f2060c4f..60931cdc 100644
--- a/scripts/liquids_lava.shader
+++ b/scripts/liquids_lava.shader
@@ -11,7 +11,7 @@ textures/liquids_lava/lava0
 	q3map_lightSubdivide 64
 	{
 		map textures/liquids_lava/lava0.tga
-		blendfunc add
+		blendfunc GL_SRC_ALPHA GL_ONE
 	}
 }
 
@@ -26,8 +26,174 @@ textures/liquids_lava/lava0_flow
 	q3map_lightSubdivide 64
 	{
 		map textures/liquids_lava/lava0.tga
-		blendfunc add
+		blendfunc GL_SRC_ALPHA GL_ONE
 		tcMod scroll 0 -0.25
 	}
 }
 
+textures/liquids_lava/lava0_flow_pipe
+{
+	qer_editorimage textures/liquids_lava/lava0.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 2 sin 1 2 0.25 0.1
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_blue
+{
+	qer_editorimage textures/liquids_lava/lava0_blue.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_blue.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+	}
+}
+
+textures/liquids_lava/lava0_blue_flow
+{
+	qer_editorimage textures/liquids_lava/lava0_blue.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_blue.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_blue_flow_pipe
+{
+	qer_editorimage textures/liquids_lava/lava0_blue.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 2 sin 1 2 0.25 0.1
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_blue.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_green
+{
+	qer_editorimage textures/liquids_lava/lava0_green.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_green.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+	}
+}
+
+textures/liquids_lava/lava0_green_flow
+{
+	qer_editorimage textures/liquids_lava/lava0_green.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_green.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_green_flow_pipe
+{
+	qer_editorimage textures/liquids_lava/lava0_green.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 2 sin 1 2 0.25 0.1
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_green.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_purple
+{
+	qer_editorimage textures/liquids_lava/lava0_purple.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_purple.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+	}
+}
+
+textures/liquids_lava/lava0_purple_flow
+{
+	qer_editorimage textures/liquids_lava/lava0_purple.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_purple.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
+
+textures/liquids_lava/lava0_purple_flow_pipe
+{
+	qer_editorimage textures/liquids_lava/lava0_purple.tga
+	surfaceparm lava
+	surfaceparm noimpact
+	surfaceparm trans
+	cull disable
+	deformVertexes wave 2 sin 1 2 0.25 0.1
+	q3map_surfacelight 1000
+	q3map_lightSubdivide 64
+	{
+		map textures/liquids_lava/lava0_purple.tga
+		blendfunc GL_SRC_ALPHA GL_ONE
+		tcMod scroll 0 -0.25
+	}
+}
\ No newline at end of file