Merge branch 'master' into fruitiex/runningmanctf

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

diff --git a/scripts/exx.shader b/scripts/exx.shader
index eb3db9d2948aaba25845295cb1ba49c26691a414..76b014ce0abfb8e18d8eb09c83608d40bddb7d0c 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -709,6 +709,75 @@ textures/exx/floor-wrn01
        }
 }
 
+textures/exx/floor-wrn01-blue
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-blue.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/exx/floor-wrn01-red
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-red.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-red.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
+textures/exx/floor-wrn01-purple
+{
+       qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/floor/floor_wrn01-purple.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
 textures/exx/light-panel01
 {
        qer_editorimage textures/exx/light/light_panel01.tga
@@ -739,7 +808,7 @@ textures/exx/light-panel01-surfacelight
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-       q3map_surfacelight 1700
+       q3map_surfacelight 2500
 
        {
                map textures/exx/light/light_panel01.tga
@@ -783,7 +852,7 @@ textures/exx/light-u201-surfacelight
        dpglossintensitymod  3
        dpglossexponentmod  4
 
-       q3map_surfacelight 1700
+       q3map_surfacelight 2500
 
        {
                map textures/exx/light/light_u201.tga
@@ -797,6 +866,35 @@ textures/exx/light-u201-surfacelight
                blendfunc filter
        }
 }
+textures/exx/panel-grate01
+{
+       qer_editorimage textures/exx/panel/panel_grate01.tga
+       
+       surfaceparm metalsteps
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm alphashadow
+
+       cull none
+       nopicmip
+       nomipmaps
+       {
+               map textures/exx/panel/panel_grate01.tga
+               alphaFunc GT0
+               rgbgen vertex
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
 textures/exx/panel-metal01
 {
        qer_editorimage textures/exx/panel/panel_metal01.tga
@@ -812,6 +910,29 @@ textures/exx/panel-metal01
                map textures/exx/panel/panel_metal01.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/panel-metal01b
+{
+       qer_editorimage textures/exx/panel/panel_metal01b.tga
+       
+       surfaceparm metalsteps
+       q3map_bounceScale  2
+       dpoffsetmapping - 2
+       dpglossintensitymod  3
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/panel/panel_metal01b.tga
+               
+
        }
        {
                map $lightmap