Merge branch 'master' into justin/erbium

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

diff --git a/scripts/map_silentsiege.shader b/scripts/map_silentsiege.shader
index 7fe4e2fb5d425e2e429a8f864bd90a92bd2b8bee..33661a635922e97915e4b745311d6a889cb4ceb8 100644 (file)
--- a/scripts/map_silentsiege.shader
+++ b/scripts/map_silentsiege.shader
@@ -1,82 +1,29 @@
-
-textures/map_silentsiege/straps_decal01
+models/map_silentsiege/gspawn1-1
 {
-       qer_editorimage textures/map_silentsiege/straps_decal01.tga
-       surfaceparm     nomarks   
-    surfaceparm        trans
-       surfaceparm     nonsolid
-    surfaceparm pointlight
-       nopicmip
+       qer_editorimage models/map_silentsiege/gspawn1.tga
+    
+       q3map_forcemeta
        {
-               map textures/map_silentsiege/straps_decal01.tga
+               map $lightmap 
                rgbGen identity
-               blendFunc add
-               
+               tcGen lightmap 
        }
-       
-}
-
-textures/map_silentsiege/straps_decal06
-{
-       qer_editorimage textures/map_silentsiege/straps_decal06.tga
-       surfaceparm     nomarks   
-    surfaceparm        trans
-       surfaceparm     nonsolid
-    surfaceparm pointlight
-       nopicmip
        {
-               map textures/map_silentsiege/straps_decal06.tga
-               rgbGen identity
-               blendFunc add
-               
+               map models/map_silentsiege/gspawn1.tga
+               blendfunc filter
        }
-       
 }
-textures/map_silentsiege/straps_decal05
-{
-       qer_editorimage textures/map_silentsiege/straps_decal05.tga
-       surfaceparm     nomarks   
-    surfaceparm        trans
-       surfaceparm     nonsolid
-    surfaceparm pointlight
-       nopicmip
-       {
-               map textures/map_silentsiege/straps_decal05.tga
-               rgbGen identity
-               blendFunc add
-               
-       }
-       
-}
-textures/map_silentsiege/cantpass
-{
-       qer_editorimage textures/map_silentsiege/cantpass.tga
-       surfaceparm     nomarks   
-    surfaceparm        trans
-       surfaceparm     nonsolid
-    surfaceparm pointlight
-       nopicmip
-       {
-               map textures/map_silentsiege/cantpass.tga
-               rgbGen identity
-               blendFunc add
-               
-       }
-       
-}
-textures/map_silentsiege/msg
+
+models/map_silentsiege/gspawn1-2
 {
-       qer_editorimage textures/map_silentsiege/msg.tga
-       surfaceparm     nomarks   
-    surfaceparm        trans
-       surfaceparm     nonsolid
-    surfaceparm pointlight
-       nopicmip
+       qer_editorimage models/map_silentsiege/gspawn1.tga
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       cull none
+       q3map_lightsubdivide 16
+       q3map_surfacelight 5000
        {
-               map textures/map_silentsiege/msg.tga
-               rgbGen identity
-               blendFunc add
-               
+               map models/map_silentsiege/gspawn1.tga
+               blendfunc blend
        }
-       
 }