Merge branch 'itsme/bromine' into 'master'

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

diff --git a/scripts/map_erbium.shader b/scripts/map_erbium.shader
index 363aecca16c3333bc29d2cd23538f02db8953618..900c2ab486cf7ce2fef22ad3518f9affcea2c63a 100644 (file)
--- a/scripts/map_erbium.shader
+++ b/scripts/map_erbium.shader
@@ -1,49 +1,49 @@
-textures/map_evolution/spawn_01
-
+textures/map_erbium/spawn_01
 {
-       qer_editorimage textures/map_evolution/spawn_01.tga
-       surfaceparm     nomarks   
-       surfaceparm     trans
-       surfaceparm     nonsolid
-       surfaceparm     pointlight
+       qer_editorimage textures/map_erbium/spawn_01.jpg
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm pointlight
        nopicmip
+
        {
-               map textures/map_evolution/spawn_01.tga
+               map textures/map_erbium/spawn_01.jpg
                rgbGen identity
                blendFunc add
        }
-       
 }
 
-textures/map_evolution/fightingzone
+textures/map_erbium/fightingzone
 {
-       qer_editorimage textures/map_evolution/fightingzone.tga
-       surfaceparm     nomarks   
-       surfaceparm     trans
-       surfaceparm     nonsolid
-       surfaceparm     pointlight
+       qer_editorimage textures/map_erbium/fightingzone.jpg
+
+       surfaceparm nomarks
+       surfaceparm trans
+       surfaceparm nonsolid
+       surfaceparm pointlight
        nopicmip
+
        {
-               map textures/map_evolution/fightingzone.tga
+               map textures/map_erbium/fightingzone.jpg
                rgbGen identity
                blendFunc add
        }
-       
+}
 
-textures/map_evolution/large-turbine
+textures/map_erbium/large-turbine
 {
-       qer_editorimage textures/map_evolution/large-turbine.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/large-turbine.jpg
 
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
-       {
-               map textures/map_evolution/large-turbine.tga
-               
+       surfaceparm metalsteps
 
+       {
+               map textures/map_erbium/large-turbine.jpg
        }
        {
                map $lightmap
@@ -53,20 +53,18 @@ textures/map_evolution/large-turbine
        }
 }
 
-textures/map_evolution/metalic
+textures/map_erbium/metalic
 {
-       qer_editorimage textures/map_evolution/metalic.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/metalic.jpg
 
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
-       {
-               map textures/map_evolution/metalic.tga
-               
+       surfaceparm metalsteps
 
+       {
+               map textures/map_erbium/metalic.jpg
        }
        {
                map $lightmap
@@ -76,21 +74,18 @@ textures/map_evolution/metalic
        }
 }
 
-
-textures/map_evolution/pickup
+textures/map_erbium/pickup
 {
-       qer_editorimage textures/map_evolution/pickup.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/pickup.jpg
 
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
-       {
-               map textures/map_evolution/pickup.tga
-               
+       surfaceparm metalsteps
 
+       {
+               map textures/map_erbium/pickup.jpg
        }
        {
                map $lightmap
@@ -100,20 +95,18 @@ textures/map_evolution/pickup
        }
 }
 
-textures/map_evolution/metal-tiles
+textures/map_erbium/metal-tiles
 {
-       qer_editorimage textures/map_evolution/metal-tiles.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/metal-tiles.jpg
 
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
-       {
-               map textures/map_evolution/metal-tiles.tga
-               
+       surfaceparm metalsteps
 
+       {
+               map textures/map_erbium/metal-tiles.jpg
        }
        {
                map $lightmap
@@ -123,20 +116,18 @@ textures/map_evolution/metal-tiles
        }
 }
 
-textures/map_evolution/metal-rock-tiles
+textures/map_erbium/metal-rock-tiles
 {
-       qer_editorimage textures/map_evolution/metal-rock-tiles.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/metal-rock-tiles.jpg
+
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
+       surfaceparm metalsteps
 
        {
-               map textures/map_evolution/metal-rock-tiles.tga
-               
-
+               map textures/map_erbium/metal-rock-tiles.jpg
        }
        {
                map $lightmap
@@ -146,21 +137,18 @@ textures/map_evolution/metal-rock-tiles
        }
 }
 
-
-textures/map_evolution/engine
+textures/map_erbium/engine
 {
-       qer_editorimage textures/map_evolution/engine.tga
-       
-       surfaceparm metalsteps
-       q3map_bounceScale  1.5
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/engine.jpg
 
+       q3map_bounceScale 1.5
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
 
-       {
-               map textures/map_evolution/engine.tga
-               
+       surfaceparm metalsteps
 
+       {
+               map textures/map_erbium/engine.jpg
        }
        {
                map $lightmap
@@ -170,9 +158,9 @@ textures/map_evolution/engine
        }
 }
 
-textures/map_evolution/decal1
+textures/map_erbium/decal1
 {
-       qer_editorimage textures/map_evolution/decal1
+       qer_editorimage textures/map_erbium/decal1
 
        surfaceparm trans
        surfaceparm nonsolid
@@ -184,21 +172,22 @@ textures/map_evolution/decal1
        cull none
 
        {
-               map textures/map_evolution/decal1
+               map textures/map_erbium/decal1
                blendFunc filter
                rgbgen identity
        }
 }
 
-
-textures/map_evolution/tree-bark
+textures/map_erbium/tree-bark
 {
-       qer_editorimage textures/map_evolution/tree-bark.tga
+       qer_editorimage textures/map_erbium/tree-bark.jpg
+
        dpoffsetmapping none
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
        dpglossexponentmod 4
+
        {
-               map textures/map_evolution/tree-bark.tga
+               map textures/map_erbium/tree-bark.jpg
        }
        {
                map $lightmap
@@ -208,14 +197,16 @@ textures/map_evolution/tree-bark
        }
 }
 
-textures/map_evolution/branches
+textures/map_erbium/branches
 {
-       qer_editorimage textures/map_evolution/branches.tga
+       qer_editorimage textures/map_erbium/branches.jpg
+
        dpoffsetmapping none
-       dpglossintensitymod 3
+       dpglossintensitymod 1.5
        dpglossexponentmod 4
+
        {
-               map textures/map_evolution/branches.tga
+               map textures/map_erbium/branches.jpg
        }
        {
                map $lightmap
@@ -225,51 +216,52 @@ textures/map_evolution/branches
        }
 }
 
-textures/map_evolution/waterfall
+textures/map_erbium/waterfall
 {
-       qer_editorimage textures/map_evolution/waterfall.tga
+       qer_editorimage textures/map_erbium/waterfall.jpg
+
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
        surfaceparm trans
        surfaceparm water
-       nopicmip        
+       nopicmip
+
        {
-               map textures/map_evolution/waterfall.tga
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               map textures/map_erbium/waterfall.jpg
+               blendFunc blend
                tcMod scroll 0 -1
        }
 }
 
-rocktomoss
+textures/map_erbium/rocktomoss
 {
+       qer_editorimage textures/map_erbium/rocktomoss.jpg
+
        dpoffsetmapping - 2 match8 184
-       q3map_baseShader textures/map_evolution/rocktomoss
-       qer_editorimage textures/map_evolution/rocktomoss.tga
+       q3map_baseShader textures/map_erbium/rocktomoss
 
        {
-               map     textures/map_evolution/moss.tga
-
-       } 
+               map     textures/map_erbium/moss.jpg
+       }
        {
-               map     textures/map_evolution/rock-grey.tga
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA 
+               map     textures/map_erbium/rock-grey.jpg
+               blendFunc blend
                alphagen vertex
-       } 
+       }
        {
                map     $lightmap
-               blendfunc GL_DST_COLOR GL_ZERO
+               blendfunc filter
                rgbGen identity
-
-       } 
+       }
 }
 
-textures/map_evolution/fern
+textures/map_erbium/fern
 {
-       qer_editorimage textures/map_evolution/fern
+       qer_editorimage textures/map_erbium/fern
 
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
        q3map_bouncescale 1.25
 
        surfaceparm trans
@@ -277,18 +269,26 @@ textures/map_evolution/fern
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
-               map textures/map_evolution/fern
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               map textures/map_erbium/fern
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
-textures/map_evolution/ivy
+textures/map_erbium/ivy
 {
-       dpglossintensitymod  3
-       dpglossexponentmod  4
+       qer_editorimage textures/map_erbium/ivy
+
+       dpglossintensitymod 1.5
+       dpglossexponentmod 4
        q3map_bouncescale 1.25
 
        surfaceparm trans
@@ -296,74 +296,99 @@ textures/map_evolution/ivy
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
-               map textures/map_evolution/ivy
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               map textures/map_erbium/ivy
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
-textures/map_evolution/leaves
+
+textures/map_erbium/leaves
 {
-       qer_editorimage textures/map_evolution/leaves
+       qer_editorimage textures/map_erbium/leaves
 
        surfaceparm trans
        surfaceparm nonsolid
        polygonOffset
        cull none
        nopicmip
+
        {
-               map $lightmap
-               map textures/map_evolution/leaves
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               map textures/map_erbium/leaves
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
-textures/map_evolution/leaves2
+textures/map_erbium/leaves2
 {
-    qer_editorimage textures/map_evolution/leaves2
+       qer_editorimage textures/map_erbium/leaves2
 
        surfaceparm trans
        surfaceparm nonsolid
        polygonOffset
        cull none
        nopicmip
-    {
-        map $lightmap
-        map textures/map_evolution/leaves2
-        blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
-        rgbgen identity
-    }
+
+       {
+               map textures/map_erbium/leaves2
+               blendFunc blend
+               rgbgen identity
+       }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
-textures/map_evolution/singular-leaf
+textures/map_erbium/singular-leaf
 {
+       qer_editorimage textures/map_erbium/singular-leaf
 
        surfaceparm trans
        surfaceparm nonsolid
        cull none
        nopicmip
+
        {
-               map $lightmap
-               map textures/map_evolution/singular-leaf
-               blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA
+               map textures/map_erbium/singular-leaf
+               blendFunc blend
                rgbgen identity
        }
+       {
+               map $lightmap
+               rgbGen identity
+               tcGen lightmap
+               blendfunc filter
+       }
 }
 
-textures/map_evolution/black-tiles
+textures/map_erbium/black-tiles
 {
-       qer_editorimage textures/map_evolution/black-tiles
+       qer_editorimage textures/map_erbium/black-tiles
+
        dpoffsetmapping - .09346482113770383774 match8 106.75988500000000000000
-       dpglossintensitymod 1
+       dpglossintensitymod 0.5
        q3map_bouncescale 1.25
 
        {
-               map textures/map_evolution/black-tiles
-                               
+               map textures/map_erbium/black-tiles
        }
-
        {
                map $lightmap
                rgbGen identity
@@ -372,20 +397,17 @@ textures/map_evolution/black-tiles
        }
 }
 
-textures/map_evolution/con-tiled
+textures/map_erbium/con-tiled
 {
-       qer_editorimage textures/map_evolution/con-tiled.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 2 match8 233
-       dpglossintensitymod  1
-       dpglossexponentmod  1
+       qer_editorimage textures/map_erbium/con-tiled.jpg
 
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2 match8 233
+       dpglossintensitymod 0.5
+       dpglossexponentmod 1
 
        {
-               map textures/map_evolution/con-tiled.tga
-               
-
+               map textures/map_erbium/con-tiled.jpg
        }
        {
                map $lightmap
@@ -395,21 +417,17 @@ textures/map_evolution/con-tiled
        }
 }
 
-
-textures/map_evolution/rock-grey
+textures/map_erbium/rock-grey
 {
-       qer_editorimage textures/map_evolution/rock-grey.tga
-       
-       q3map_bounceScale  0.5
-       dpoffsetmapping - 2 match8 233
-       dpglossintensitymod  1
-       dpglossexponentmod  1
+       qer_editorimage textures/map_erbium/rock-grey.jpg
 
+       q3map_bounceScale 0.5
+       dpoffsetmapping - 2 match8 233
+       dpglossintensitymod 0.5
+       dpglossexponentmod 1
 
        {
-               map textures/map_evolution/rock-grey.tga
-               
-
+               map textures/map_erbium/rock-grey.jpg
        }
        {
                map $lightmap
@@ -419,17 +437,16 @@ textures/map_evolution/rock-grey
        }
 }
 
-textures/textures/map_evolution/moss
+textures/map_erbium/moss
 {
-       qer_editorimage textures/map_evolution/moss
+       qer_editorimage textures/map_erbium/moss
+
        dpoffsetmapping - .09346482113770383774 match8 106.75988500000000000000
        q3map_bouncescale 1.25
 
        {
-               map textures/map_evolution/moss
-                               
+               map textures/map_erbium/moss
        }
-
        {
                map $lightmap
                rgbGen identity
@@ -437,9 +454,3 @@ textures/textures/map_evolution/moss
                blendfunc filter
        }
 }
-
-
-
-
-
-