X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Fex2x.shader;h=5ca03aaccc318aba0c600e5fa9ee75a4981f69ef;hp=4e06645bc4dff8bc035581928cd83213e3a22e40;hb=05ba71783494288c9e16ab3ddf6b0546f6ed9b11;hpb=f3e65a89c140501b9a4c24e217a88ac919ec59c6

diff --git a/scripts/ex2x.shader b/scripts/ex2x.shader
index 4e06645b..5ca03aac 100644
--- a/scripts/ex2x.shader
+++ b/scripts/ex2x.shader
@@ -3,7 +3,7 @@ textures/ex2x/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,12 +47,13 @@ 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
 
 	surfaceparm trans
 	cull none
+	surfaceparm alphashadow
 
 	{
 		map textures/ex2x/base/base_chainlink.tga
@@ -70,7 +71,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 +93,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 +115,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 +137,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 +159,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 +181,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 +203,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 +225,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 +247,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 +269,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 +291,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 +313,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 +335,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 +357,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
 
@@ -378,7 +379,7 @@ textures/ex2x/floor-r1
 	qer_editorimage textures/ex2x/floor/floor_r1.tga
 	
 	q3map_bounceScale  0.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 205
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -400,7 +401,7 @@ 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
 
@@ -422,7 +423,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
 
@@ -444,7 +445,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
 
@@ -453,6 +454,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
@@ -467,7 +490,7 @@ textures/ex2x/trim-green2
 	
 	surfaceparm metalsteps
 	q3map_bounceScale  1.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 202
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -490,7 +513,7 @@ textures/ex2x/trim-warn1
 	
 	surfaceparm metalsteps
 	q3map_bounceScale  1.5
-	dpoffsetmapping - 0.5
+	dpoffsetmapping - 0.5 match8 202
 	dpglossintensitymod  3
 	dpglossexponentmod  4
 
@@ -512,7 +535,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