Merge branch 'master' into cbrutail/map-lightspeed

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

diff --git a/scripts/map_leave_em_behind.shader b/scripts/map_leave_em_behind.shader
index 6a39b0310897f2e48f4b4ef086261d911098cdce..6f8d06417dc62ab32e24d82c3d5bd057a2977f92 100644 (file)
--- a/scripts/map_leave_em_behind.shader
+++ b/scripts/map_leave_em_behind.shader
@@ -1,4 +1,4 @@
-textures/map_leave_em_behind/biolumi2_yellow
+textures/map_leave_em_behind/biolumi2_yellow_wave
 {
        q3map_lightimage textures/map_leave_em_behind/biolumi2_yellow.tga
        qer_editorimage textures/map_leave_em_behind/biolumi2_yellow.tga
@@ -6,6 +6,7 @@ textures/map_leave_em_behind/biolumi2_yellow
        surfaceparm nolightmap
        surfaceparm trans
        surfaceparm nomarks
+       deformVertexes wave 10 sin 1 2 0.25 0.1
        cull disable
        qer_trans 0.5
        q3map_lightsubdivide 16
@@ -13,10 +14,9 @@ textures/map_leave_em_behind/biolumi2_yellow
        {
                tcMod scroll 0 0.05
                map textures/map_leave_em_behind/biolumi2_yellow.tga
-               blendfunc blend
        }
 }
-textures/map_leave_em_behind/biolumi2_green
+textures/map_leave_em_behind/biolumi2_green_wave
 {
        q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga
        qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga
@@ -24,6 +24,7 @@ textures/map_leave_em_behind/biolumi2_green
        surfaceparm nolightmap
        surfaceparm trans
        surfaceparm nomarks
+       deformVertexes wave 10 sin 1 2 0.25 0.1
        cull disable
        qer_trans 0.5
        q3map_lightsubdivide 16
@@ -31,8 +32,26 @@ textures/map_leave_em_behind/biolumi2_green
        {
          tcMod scroll 0 0.05
          map textures/map_leave_em_behind/biolumi2_green.tga
-         blendfunc blend
        }
 
 }
 
+textures/map_leave_em_behind/biolumi2_green
+{
+       q3map_lightimage textures/map_leave_em_behind/biolumi2_green.tga
+       qer_editorimage textures/map_leave_em_behind/biolumi2_green.tga
+       q3map_lightmapFilterRadius 0 4
+       surfaceparm nolightmap
+       surfaceparm trans
+       surfaceparm nomarks
+//     deformVertexes wave 50 sin 2 5 0.25 0.1
+       cull disable
+       qer_trans 0.5
+       q3map_lightsubdivide 16
+       q3map_surfacelight 2500
+       {
+         tcMod scroll 0 0.05
+         map textures/map_leave_em_behind/biolumi2_green.tga
+       }
+
+}