Merge branch 'Spike29/fix_badly_placed_entities' into 'master'

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

diff --git a/scripts/exx.shader b/scripts/exx.shader
index 50d555b1e22afc4d1a35a67a0f76e27d18d30a97..a124c66af62ad6598ea26c8def6716d9291f0285 100644 (file)
--- a/scripts/exx.shader
+++ b/scripts/exx.shader
@@ -3,8 +3,8 @@ textures/exx/base-crete01
        qer_editorimage textures/exx/base/base_crete01.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 65
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -26,7 +26,7 @@ textures/exx/base-crete01blue
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -48,7 +48,7 @@ textures/exx/base-crete01red
        
        q3map_bounceScale  0.5
        dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -69,8 +69,8 @@ textures/exx/base-crete02
        qer_editorimage textures/exx/base/base_crete02.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 65
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -91,8 +91,8 @@ textures/exx/base-crete03
        qer_editorimage textures/exx/base/base_crete03.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 65
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -114,8 +114,8 @@ textures/exx/base-metal01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -137,8 +137,8 @@ textures/exx/base-metal02
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -160,8 +160,8 @@ textures/exx/base-metal03
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -183,8 +183,8 @@ textures/exx/base-metal04
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 106
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -206,8 +206,8 @@ textures/exx/base-metal05rust
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -229,8 +229,8 @@ textures/exx/base-metal06rust
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -252,8 +252,8 @@ textures/exx/base-metal07rust
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 70
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -274,8 +274,8 @@ textures/exx/floor-clang01
        qer_editorimage textures/exx/floor/floor_clang01.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 37
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
        surfaceparm metalsteps
 
@@ -298,8 +298,8 @@ textures/exx/floor-clang01b
        qer_editorimage textures/exx/floor/floor_clang01b.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 37
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
        surfaceparm metalsteps
        
@@ -321,8 +321,8 @@ textures/exx/floor-crete01
        qer_editorimage textures/exx/floor/floor_crete01.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 148
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -343,8 +343,8 @@ textures/exx/floor-crete01-phoenix
        qer_editorimage textures/exx/floor/floor_crete01_phoenix.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 148
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -365,8 +365,8 @@ textures/exx/floor-crete01-phoenixb
        qer_editorimage textures/exx/floor/floor_crete01_phoenixb.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 148
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -387,8 +387,8 @@ textures/exx/floor-crete01b
        qer_editorimage textures/exx/floor/floor_crete01b.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 48
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -413,14 +413,14 @@ textures/exx/floor-grate01
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 126
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate01.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -437,14 +437,14 @@ textures/exx/floor-grate01-cull
        q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 126
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate01.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -462,14 +462,14 @@ textures/exx/floor-grate02
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate02.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -486,14 +486,14 @@ textures/exx/floor-grate02-cull
        q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 224
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate02.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -511,14 +511,14 @@ textures/exx/floor-grate03
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate03.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -535,14 +535,14 @@ textures/exx/floor-grate03-cull
        q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 223
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate03.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -560,14 +560,14 @@ textures/exx/floor-grate04
        surfaceparm alphashadow
        surfaceparm nomarks
        Cull None
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate04.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -585,14 +585,14 @@ textures/exx/floor-grate04-cull
        q3map_bounceScale  0.75
        surfaceparm alphashadow
        surfaceparm nomarks
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 248
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
        {
                map textures/exx/floor/floor_grate04.tga
-            alphaFunc GT0
+            alphaFunc GE128
        }
        {
                map $lightmap
@@ -609,8 +609,8 @@ textures/exx/floor-metal02
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -631,8 +631,8 @@ textures/exx/floor-panel01
        qer_editorimage textures/exx/floor/floor_panel01.tga
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 172
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -654,8 +654,8 @@ textures/exx/floor-rnd01
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 128
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -677,8 +677,8 @@ textures/exx/floor-rnd02
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -700,8 +700,8 @@ textures/exx/floor-simple05
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 4 match8 32
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -722,8 +722,8 @@ textures/exx/floor-simplines
        qer_editorimage textures/exx/floor/floor_simplines.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 1 match8 244
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -745,8 +745,8 @@ textures/exx/floor-tile03
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 218
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -768,8 +768,8 @@ textures/exx/floor-tread01
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 1 match8 221
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -790,8 +790,8 @@ textures/exx/floor-wrn01
        qer_editorimage textures/exx/floor/floor_wrn01.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -813,8 +813,8 @@ textures/exx/floor-wrn01-blue
        qer_editorimage textures/exx/floor/floor_wrn01-blue.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -836,8 +836,8 @@ textures/exx/floor-wrn01-red
        qer_editorimage textures/exx/floor/floor_wrn01-red.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -859,8 +859,8 @@ textures/exx/floor-wrn01-purple
        qer_editorimage textures/exx/floor/floor_wrn01-purple.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 46
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -882,8 +882,8 @@ textures/exx/light-panel01
        qer_editorimage textures/exx/light/light_panel01.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        {
@@ -903,8 +903,8 @@ textures/exx/light-panel01-surfacelight
        qer_editorimage textures/exx/light/light_panel01.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        q3map_surfacelight 2500
@@ -922,13 +922,38 @@ textures/exx/light-panel01-surfacelight
                blendfunc filter
        }
 }
+textures/exx/light-panel01-surfacelight_sRGB
+{
+       qer_editorimage textures/exx/light/light_panel01.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 79
+       dpglossintensitymod 1.5
+       dpglossexponentmod  4
+
+       q3map_surfacelight 625
+       q3map_lightSubdivide 64
+
+       {
+               map textures/exx/light/light_panel01.tga
+               
+
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+
 textures/exx/light-u201
 {
        qer_editorimage textures/exx/light/light_u201.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        {
@@ -948,8 +973,8 @@ textures/exx/light-u201-surfacelight
        qer_editorimage textures/exx/light/light_u201.tga
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        q3map_surfacelight 2500
@@ -959,6 +984,30 @@ textures/exx/light-u201-surfacelight
                map textures/exx/light/light_u201.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/light-u201-surfacelight_sRGB
+{
+       qer_editorimage textures/exx/light/light_u201.tga
+       
+       q3map_bounceScale  0.75
+       dpoffsetmapping - 2 match8 76
+       dpglossintensitymod 1.5
+       dpglossexponentmod  4
+
+       q3map_surfacelight 625
+       q3map_lightSubdivide 64
+
+       {
+               map textures/exx/light/light_u201.tga
+               
+
        }
        {
                map $lightmap
@@ -974,7 +1023,7 @@ textures/exx/panel-grate01
        surfaceparm metalsteps
        q3map_bounceScale  2
        dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        surfaceparm nomarks
@@ -986,7 +1035,7 @@ textures/exx/panel-grate01
        nomipmaps
        {
                map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
+               alphaFunc GE128
                rgbgen vertex
        }
        {
@@ -1003,7 +1052,7 @@ textures/exx/panel-grate01-cull
        surfaceparm metalsteps
        q3map_bounceScale  2
        dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
        surfaceparm nomarks
@@ -1014,7 +1063,7 @@ textures/exx/panel-grate01-cull
        nomipmaps
        {
                map textures/exx/panel/panel_grate01.tga
-               alphaFunc GT0
+               alphaFunc GE128
                rgbgen vertex
        }
        {
@@ -1030,8 +1079,8 @@ textures/exx/panel-metal01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1053,8 +1102,8 @@ textures/exx/panel-metal01b
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 101
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1076,8 +1125,8 @@ textures/exx/panel-metal01c
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 116
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1099,8 +1148,8 @@ textures/exx/panel-metal02
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1122,8 +1171,8 @@ textures/exx/panel-metal03
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 241
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1145,8 +1194,8 @@ textures/exx/panel-metal04
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 229
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1168,8 +1217,8 @@ textures/exx/panel-metal05
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 238
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1191,8 +1240,8 @@ textures/exx/panel-metalbig04
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 165
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1214,8 +1263,8 @@ textures/exx/panel-metalbig04b
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1237,8 +1286,8 @@ textures/exx/panel-q201
        surfaceparm metalsteps
        
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 138
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1260,8 +1309,8 @@ textures/exx/panel-q201b
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 81
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1283,8 +1332,8 @@ textures/exx/panel-q201c
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 98
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1306,8 +1355,8 @@ textures/exx/panel-q201d
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 189
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1329,8 +1378,8 @@ textures/exx/panel-q201e
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 132
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1352,8 +1401,8 @@ textures/exx/panel-rs01
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 178
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1375,8 +1424,8 @@ textures/exx/trim-01
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 169
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1398,8 +1447,8 @@ textures/exx/trim-baseboard
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 181
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1420,8 +1469,8 @@ textures/exx/trim-baseboard02
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 162
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1443,8 +1492,8 @@ textures/exx/trim-baseboard03
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 110
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1466,8 +1515,8 @@ textures/exx/trim-metalsupp01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 8 match8 243
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1489,8 +1538,8 @@ textures/exx/trim-psimple04
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 44
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1512,8 +1561,8 @@ textures/exx/trim-psimple05
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 230
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1535,8 +1584,8 @@ textures/exx/trim-simple01
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 213
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1558,8 +1607,8 @@ textures/exx/trim-simple03
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 142
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1581,8 +1630,8 @@ textures/exx/trim-steptop01
        
        surfaceparm metalsteps
        q3map_bounceScale  0.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 140
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1604,8 +1653,8 @@ textures/exx/trim-support03
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 111
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1627,8 +1676,8 @@ textures/exx/trim-vert01
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1650,8 +1699,8 @@ textures/exx/trim-horz01
        
        surfaceparm metalsteps
        q3map_bounceScale  1.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 231
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1674,8 +1723,8 @@ textures/exx/wall-bigrib02
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 250
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1697,8 +1746,8 @@ textures/exx/wall-bplate06
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 8 match8 114
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1719,8 +1768,8 @@ textures/exx/wall-crete01
        qer_editorimage textures/exx/wall/wall_crete01.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 44
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -1741,8 +1790,8 @@ textures/exx/wall-crete02
        qer_editorimage textures/exx/wall/wall_crete02.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 242
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -1763,8 +1812,8 @@ textures/exx/wall-crete03
        qer_editorimage textures/exx/wall/wall_crete03.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 233
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -1785,8 +1834,8 @@ textures/exx/wall-crete03b
        qer_editorimage textures/exx/wall/wall_crete03b.tga
        
        q3map_bounceScale  0.5
-       dpoffsetmapping - 2
-       dpglossintensitymod  1
+       dpoffsetmapping - 2 match8 38
+       dpglossintensitymod 0.5
        dpglossexponentmod  1
 
 
@@ -1808,8 +1857,8 @@ textures/exx/wall-des01
 
        surfaceparm metalsteps  
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 55
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1831,8 +1880,8 @@ textures/exx/wall-metal01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 225
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1854,8 +1903,8 @@ textures/exx/wall-metal01b
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 225
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1863,6 +1912,29 @@ textures/exx/wall-metal01b
                map textures/exx/wall/wall_metal01b.tga
                
 
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
+}
+textures/exx/wall-metal01c
+{
+       qer_editorimage textures/exx/wall/wall_metal01c.tga
+       
+       surfaceparm metalsteps
+       q3map_bounceScale  2
+       dpoffsetmapping - 2 match8 225
+       dpglossintensitymod 1.5
+       dpglossexponentmod  4
+
+
+       {
+               map textures/exx/wall/wall_metal01c.tga
+               
+
        }
        {
                map $lightmap
@@ -1877,8 +1949,8 @@ textures/exx/wall-metal02
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 177
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1900,8 +1972,8 @@ textures/exx/wall-metalb01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 1 match8 37
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1923,8 +1995,8 @@ textures/exx/wall-metalrib01
        
        surfaceparm metalsteps
        q3map_bounceScale  2
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 216
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1946,8 +2018,8 @@ textures/exx/wall-panel05
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 66
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1969,8 +2041,8 @@ textures/exx/wall-panels08
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 195
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -1992,8 +2064,8 @@ textures/exx/wall-panels08b
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 195
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -2015,8 +2087,8 @@ textures/exx/wall-pipe
        
        surfaceparm metalsteps
        q3map_bounceScale  1.25
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 157
+       dpglossintensitymod 1.5
        dpglossexponentmod  4
 
 
@@ -2038,8 +2110,8 @@ textures/exx/wall-u207
        
        surfaceparm metalsteps
        q3map_bounceScale  1.75
-       dpoffsetmapping - 2
-       dpglossintensitymod  3
+       dpoffsetmapping - 2 match8 109
+       dpglossintensitymod 1.5
        dpglossexponentmod  4