X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fmap_warfare.shader;h=e84971e05978ef2373313be83cf2e91daad37134;hb=HEAD;hp=254bb77d2549554fc8d4d5cf9e10a36227824c40;hpb=aa71a8cd844068762077428a03114860fe933526;p=xonotic%2Fxonotic-maps.pk3dir.git

diff --git a/scripts/map_warfare.shader b/scripts/map_warfare.shader
index 254bb77d..4a546c28 100644
--- a/scripts/map_warfare.shader
+++ b/scripts/map_warfare.shader
@@ -1,82 +1,112 @@
 textures/map_warfare/rocktosoil
 {
-	qer_editorimage textures/map_warfare/rocktosoil
-	
-	dpoffsetmapping - 2 match8 168
-	
-	q3map_bouncescale  0.75
-	q3map_lightmapsampleoffset 8
-	q3map_nonplanar
-	q3map_shadeangle 90
+    qer_editorimage textures/map_warfare/rocktosoil
+
+    dpoffsetmapping - 2 match8 168
+    dpglossintensitymod 1.5
+    dpglossexponentmod 4
+
+    q3map_lightmapsampleoffset 8
+    q3map_nonplanar
+    q3map_shadeangle 90
     q3map_alphamod dotproduct2 ( 0 0 1 )
-	{
-		map textures/phillipk2x/natural/pk02_rock01
-	}
-	{
-		map textures/phillipk2x/natural/pk02_sand01
-		blendfunc blend
-		alphagen vertex
-	}
-	{
-		map $lightmap
-		blendfunc GL_DST_COLOR GL_ZERO
-	}
+    {
+        map textures/phillipk2x/natural/pk02_rock01
+    }
+    {
+        map textures/phillipk2x/natural/pk02_sand01
+        blendfunc blend
+        alphagen vertex
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/env
 {
-	qer_editorimage textures/map_warfare/env.tga
-	qer_trans 0.5
-	
-	surfaceparm trans
-	
-	cull none
-	{
-		map textures/map_warfare/env.tga
-		blendfunc add
-		tcgen environment
-	}
+    qer_editorimage textures/map_warfare/env
+    qer_trans 0.5
+
+    surfaceparm trans
+    {
+        map textures/map_warfare/env
+        blendfunc add
+        tcgen environment
+    }
 }
 
 textures/map_warfare/floor_panel
 {
-	qer_editorimage textures/map_warfare/floor_panel
-	qer_alphafunc qequal 0.5
-    
+    qer_editorimage textures/map_warfare/floor_panel
+    qer_alphafunc qequal 0.5
+
     dpoffsetmapping - 2 match8 172
-	dpglossintensitymod  3
-	dpglossexponentmod  4
-	
-	surfaceparm metalsteps
-	surfaceparm trans
-	
-	q3map_bouncescale  0.75
+    dpglossintensitymod 1.5
+    dpglossexponentmod 4
+
+    surfaceparm metalsteps
+    surfaceparm trans
+    surfaceparm nonsolid
+
+    q3map_bouncescale 0.75
 
     polygonoffset
-	{
-		map textures/map_warfare/floor_panel
-		alphaFunc GT0
-	}
-	{
-		map $lightmap
-		blendfunc filter
-	}
+    {
+        map textures/map_warfare/floor_panel
+        alphaFunc GE128
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }
 
 textures/map_warfare/sky
 {
-	qer_editorimage textures/skies/exosystem
-	
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nodlight
-	surfaceparm nomarks
-	surfaceparm sky
-
-	q3map_sunext 1 1 1 350 60 42 3 16
-	q3map_lightmapfilterradius 0 8
-	q3map_skylight 400 4
-
-	skyparms env/exosystem/exosystem - -
+    qer_editorimage textures/skies/exosystem
+
+    surfaceparm noimpact
+    surfaceparm nolightmap
+    surfaceparm nodlight
+    surfaceparm nomarks
+    surfaceparm sky
+
+    q3map_sunext 1 1 1 350 60 42 3 16
+    q3map_lightmapfilterradius 0 8
+    q3map_skylight 400 4
+
+    skyparms env/exosystem/exosystem - -
+}
+
+textures/map_warfare/cactus
+{
+    qer_editorimage textures/map_warfare/cactus
+    qer_alphafunc qequal 0.5
+
+    dpoffsetmapping - 2 match8 68
+    dpglossintensitymod 1.5
+    dpglossexponentmod 4
+
+    surfaceparm trans
+    surfaceparm alphashadow
+    surfaceparm nonsolid
+
+    cull none
+    {
+        map textures/map_warfare/cactus
+        alphaFunc GE128
+    }
+    {
+        map $lightmap
+        rgbgen identity
+        tcgen lightmap
+        blendfunc filter
+    }
 }