X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fex2x.shader;h=ecd6b0d89d5312e9b1f94e767c50dd441636e656;hp=0de893dad598b469048a44449e75d1237555c81c;hb=1e3886b872c286e385013a8878e34c09f6da23fd;hpb=64fb647c51fb663d04863b56c8381f946ef02b63

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 0de893da..ecd6b0d8 100644
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -1,9 +1,9 @@
-textures/ex2x/base-yellowpaint
+textures/exx/base-yellowpaint
 {
 	qer_editorimage textures/ex2x/base/base_yellowpaint.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 204
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -25,7 +25,7 @@ textures/ex2x/base-bluepaint
 	qer_editorimage textures/ex2x/base/base_bluepaint.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 204
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -47,7 +47,7 @@ textures/ex2x/base-chainlink
 	qer_editorimage textures/ex2x/base/base_chainlink.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 204
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -70,7 +70,7 @@ textures/ex2x/base-metal1
 	qer_editorimage textures/ex2x/base/base_metal1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 220
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -92,7 +92,7 @@ textures/ex2x/base-metal2
 	qer_editorimage textures/ex2x/base/base_metal2.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 196
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -114,7 +114,7 @@ textures/ex2x/base-metal3
 	qer_editorimage textures/ex2x/base/base_metal3.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 203
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -136,7 +136,7 @@ textures/ex2x/base-metal4
 	qer_editorimage textures/ex2x/base/base_metal4.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -158,7 +158,7 @@ textures/ex2x/base-metalmaterial1
 	qer_editorimage textures/ex2x/base/base_metalmaterial1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 204
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -180,7 +180,7 @@ textures/ex2x/base-stone_metal
 	qer_editorimage textures/ex2x/base/base_stone_metal.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -202,7 +202,7 @@ textures/ex2x/floor-1
 	qer_editorimage textures/ex2x/floor/floor_1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 204
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -224,7 +224,7 @@ textures/ex2x/floor-h1
 	qer_editorimage textures/ex2x/floor/floor_h1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -246,7 +246,7 @@ textures/ex2x/floor-h2
 	qer_editorimage textures/ex2x/floor/floor_h2.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -268,7 +268,7 @@ textures/ex2x/floor-h3
 	qer_editorimage textures/ex2x/floor/floor_h3.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -290,7 +290,7 @@ textures/ex2x/floor-h4
 	qer_editorimage textures/ex2x/floor/floor_h4.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 201
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -312,7 +312,7 @@ textures/ex2x/floor-metal3
 	qer_editorimage textures/ex2x/floor/floor_metal3.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 193
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -334,7 +334,7 @@ textures/ex2x/floor-plate1
 	qer_editorimage textures/ex2x/floor/floor_plate1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 197
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -356,7 +356,7 @@ textures/ex2x/floor-plate2
 	qer_editorimage textures/ex2x/floor/floor_plate2.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 212
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -373,12 +373,34 @@ textures/ex2x/floor-plate2
 		blendfunc filter
 	}
 }
-extures/ex2x/light-1
+textures/ex2x/floor-r1
+{
+	qer_editorimage textures/ex2x/floor/floor_r1.tga
+	
+	q3map_bounceScale  0.5
+	dpoffsetmapping - 0.5 match8 205
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/floor/floor_r1.tga
+		
+
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-1
 {
 	qer_editorimage textures/ex2x/light/light_1.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 247
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -400,7 +422,7 @@ textures/ex2x/light-beam_blue
 	qer_editorimage textures/ex2x/light/light_beam_blue.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 99
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -422,7 +444,7 @@ textures/ex2x/light-beam_red
 	qer_editorimage textures/ex2x/light/light_beam_red.tga
 	
 	q3map_bounceScale  0.75
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 99
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -431,6 +453,28 @@ textures/ex2x/light-beam_red
 		map textures/ex2x/light/light_beam_red.tga
 		
 
+	}
+	{
+		map $lightmap
+		rgbGen identity
+		tcGen lightmap
+		blendfunc filter
+	}
+}
+textures/ex2x/light-beam_green
+{
+	qer_editorimage textures/ex2x/light/light_beam_green.tga
+	
+	q3map_bounceScale  0.75
+	dpoffsetmapping - 0.5 match8 99
+	dpglossintensitymod  3
+	dpglossexponentmod  4
+
+
+	{
+		map textures/ex2x/light/light_beam_green.tga
+		
+
 	}
 	{
 		map $lightmap
@@ -445,7 +489,7 @@ textures/ex2x/trim-green2
 	
 	surfaceparm metalsteps
 	q3map_bounceScale  1.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 202
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -468,7 +512,7 @@ textures/ex2x/trim-warn1
 	
 	surfaceparm metalsteps
 	q3map_bounceScale  1.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 202
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -490,7 +534,7 @@ textures/ex2x/wall-purple1
 	qer_editorimage textures/ex2x/wall/wall_purple1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 234
 	dpglossintensitymod  3
 	dpglossexponentmod  4