Merge branch 'master' into Mirio/geoplanetary

[xonotic/xonotic-maps.pk3dir.git] / scripts / map_space-elevator.shader

diff --git a/scripts/map_space-elevator.shader b/scripts/map_space-elevator.shader
index 6f33d320945c268526c9f9ab1d33b87865179d76..64c9d23c3e3460fc0a57230975b8456f34a82cc8 100644 (file)
--- a/scripts/map_space-elevator.shader
+++ b/scripts/map_space-elevator.shader
@@ -1,6 +1,6 @@
 textures/map_space-elevator/hangwires
 {
-       surfaceparm nolightmap
+       surfaceparm alphashadow
        surfaceparm nomarks
        surfaceparm trans
        cull disable
@@ -58,42 +58,6 @@ textures/map_space-elevator/sign-train-blue
        }
 }
 
-textures/map_space-elevator/beam-blue
-{
-       surfaceparm nonsolid
-       surfaceparm nomarks
-       cull none
-       q3map_surfacelight 3000
-       {
-               map textures/map_space-elevator/beam-blue.tga
-               blendfunc add
-       }
-}
-
-textures/map_space-elevator/beam-purple
-{
-       surfaceparm nonsolid
-       surfaceparm nomarks
-       cull none
-       q3map_surfacelight 3000
-       {
-               map textures/map_space-elevator/beam-purple.tga
-               blendfunc add
-       }
-}
-
-textures/map_space-elevator/beam-red
-{
-       surfaceparm nonsolid
-       surfaceparm nomarks
-       cull none
-       q3map_surfacelight 3000
-       {
-               map textures/map_space-elevator/beam-red.tga
-               blendfunc add
-       }
-}
-
 textures/map_space-elevator/panels
 {
        qer_editorimage textures/map_space-elevator/panels.tga
@@ -123,3 +87,22 @@ textures/map_space-elevator/solarmetal
                blendfunc filter
        }
 }
+
+textures/map_space-elevator/polluted_earth
+{
+       qer_editorimage textures/skies/polluted_earth.jpg
+       surfaceparm sky
+       surfaceparm noimpact
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       q3map_globaltexture
+       q3map_surfacelight 20
+       surfaceparm sky
+
+        nopicmip
+        nomipmaps
+
+       q3map_sunExt 1 0.9 0.9 250 320 20
+       q3map_skylight 05 4
+       skyparms env/polluted_earth/polluted_earth - -
+}