Further fix the shaders in evil2

diff --git a/data/scripts/evil2_basefloor.shader b/data/scripts/evil2_basefloor.shader
index 1a72f3e743ccb3710420f1433d508ca8f59e7a14..e30ea1da2b2971bbeb7ff3bd54ae3f73af09c95b 100644 (file)
--- a/data/scripts/evil2_basefloor.shader
+++ b/data/scripts/evil2_basefloor.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/flr_bigrndwrn\r
+textures/evil2_basefloor/flr_bigrndwrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_bigrndwrn\r
+               map textures/evil2_basefloor/flr_bigrndwrn\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil2_metals/flr_bigrndwrn
     }\r
 }\r
 \r
-textures/evil2_metals/flr_b-w_drty_bbig\r
+textures/evil2_basefloor/flr_b-w_drty_bbig\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_b-w_drty_bbig\r
+               map textures/evil2_basefloor/flr_b-w_drty_bbig\r
        }\r
        {\r
                map $lightmap\r
@@ -24,11 +24,11 @@ textures/evil2_metals/flr_b-w_drty_bbig
     }\r
 }\r
 \r
-textures/evil2_metals/flr_b-w_drty_bld\r
+textures/evil2_basefloor/flr_b-w_drty_bld\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_b-w_drty_bld\r
+               map textures/evil2_basefloor/flr_b-w_drty_bld\r
        }\r
        {\r
                map $lightmap\r
@@ -37,11 +37,11 @@ textures/evil2_metals/flr_b-w_drty_bld
     }\r
 }\r
 \r
-textures/evil2_metals/flr_b-w_drty_bld2\r
+textures/evil2_basefloor/flr_b-w_drty_bld2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_b-w_drty_bld2\r
+               map textures/evil2_basefloor/flr_b-w_drty_bld2\r
        }\r
        {\r
                map $lightmap\r
@@ -50,11 +50,11 @@ textures/evil2_metals/flr_b-w_drty_bld2
     }\r
 }\r
 \r
-textures/evil2_metals/flr_b-w_drty\r
+textures/evil2_basefloor/flr_b-w_drty\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_b-w_drty\r
+               map textures/evil2_basefloor/flr_b-w_drty\r
        }\r
        {\r
                map $lightmap\r
@@ -63,11 +63,11 @@ textures/evil2_metals/flr_b-w_drty
     }\r
 }\r
 \r
-textures/evil2_metals/flr_b-w\r
+textures/evil2_basefloor/flr_b-w\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_b-w\r
+               map textures/evil2_basefloor/flr_b-w\r
        }\r
        {\r
                map $lightmap\r
@@ -76,11 +76,11 @@ textures/evil2_metals/flr_b-w
     }\r
 }\r
 \r
-textures/evil2_metals/flr_cemtile_bigbrk\r
+textures/evil2_basefloor/flr_cemtile_bigbrk\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_cemtile_bigbrk\r
+               map textures/evil2_basefloor/flr_cemtile_bigbrk\r
        }\r
        {\r
                map $lightmap\r
@@ -89,11 +89,11 @@ textures/evil2_metals/flr_cemtile_bigbrk
     }\r
 }\r
 \r
-textures/evil2_metals/flr_cemtile_drk\r
+textures/evil2_basefloor/flr_cemtile_drk\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_cemtile_drk\r
+               map textures/evil2_basefloor/flr_cemtile_drk\r
        }\r
        {\r
                map $lightmap\r
@@ -102,11 +102,11 @@ textures/evil2_metals/flr_cemtile_drk
     }\r
 }\r
 \r
-textures/evil2_metals/flr_cemtile_m\r
+textures/evil2_basefloor/flr_cemtile_m\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_cemtile_m\r
+               map textures/evil2_basefloor/flr_cemtile_m\r
        }\r
        {\r
                map $lightmap\r
@@ -115,11 +115,11 @@ textures/evil2_metals/flr_cemtile_m
     }\r
 }\r
 \r
-textures/evil2_metals/flr_cemtile\r
+textures/evil2_basefloor/flr_cemtile\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_cemtile\r
+               map textures/evil2_basefloor/flr_cemtile\r
        }\r
        {\r
                map $lightmap\r
@@ -128,11 +128,11 @@ textures/evil2_metals/flr_cemtile
     }\r
 }\r
 \r
-textures/evil2_metals/flr_cemtilesmll_drk\r
+textures/evil2_basefloor/flr_cemtilesmll_drk\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_cemtilesmll_drk\r
+               map textures/evil2_basefloor/flr_cemtilesmll_drk\r
        }\r
        {\r
                map $lightmap\r
@@ -141,11 +141,11 @@ textures/evil2_metals/flr_cemtilesmll_drk
     }\r
 }\r
 \r
-textures/evil2_metals/flr_tmtl_drk_bld\r
+textures/evil2_basefloor/flr_tmtl_drk_bld\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_tmtl_drk_bld\r
+               map textures/evil2_basefloor/flr_tmtl_drk_bld\r
        }\r
        {\r
                map $lightmap\r
@@ -154,11 +154,11 @@ textures/evil2_metals/flr_tmtl_drk_bld
     }\r
 }\r
 \r
-textures/evil2_metals/flr_tmtl_drk\r
+textures/evil2_basefloor/flr_tmtl_drk\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_tmtl_drk\r
+               map textures/evil2_basefloor/flr_tmtl_drk\r
        }\r
        {\r
                map $lightmap\r
@@ -167,11 +167,11 @@ textures/evil2_metals/flr_tmtl_drk
     }\r
 }\r
 \r
-textures/evil2_metals/flr_tmtl_drkwrn\r
+textures/evil2_basefloor/flr_tmtl_drkwrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_tmtl_drkwrn\r
+               map textures/evil2_basefloor/flr_tmtl_drkwrn\r
        }\r
        {\r
                map $lightmap\r
@@ -180,11 +180,11 @@ textures/evil2_metals/flr_tmtl_drkwrn
     }\r
 }\r
 \r
-textures/evil2_metals/flr_tmtl\r
+textures/evil2_basefloor/flr_tmtl\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/flr_tmtl\r
+               map textures/evil2_basefloor/flr_tmtl\r
        }\r
        {\r
                map $lightmap\r
@@ -193,11 +193,11 @@ textures/evil2_metals/flr_tmtl
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_floorgrt_h\r
+textures/evil2_basefloor/mtl_floorgrt_h\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_floorgrt_h\r
+               map textures/evil2_basefloor/mtl_floorgrt_h\r
        }\r
        {\r
                map $lightmap\r
@@ -206,11 +206,11 @@ textures/evil2_metals/mtl_floorgrt_h
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_floorgrt_old_h\r
+textures/evil2_basefloor/mtl_floorgrt_old_h\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_floorgrt_old_h\r
+               map textures/evil2_basefloor/mtl_floorgrt_old_h\r
        }\r
        {\r
                map $lightmap\r

diff --git a/data/scripts/evil2_basemetal.shader b/data/scripts/evil2_basemetal.shader
index ca2b4ac3a79493e5e737fc3bb14d30ed945161fb..c176565338ccaaa378b80e4ac4b817800bd82b14 100644 (file)
--- a/data/scripts/evil2_basemetal.shader
+++ b/data/scripts/evil2_basemetal.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/mtl_old0\r
+textures/evil2_basemetal/mtl_old0\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_old0\r
+               map textures/evil2_basemetal/mtl_old0\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil2_metals/mtl_old0
     }\r
 }\r
 \r
-textures/evil2_metals/p_mtl_blue\r
+textures/evil2_basemetal/p_mtl_blue\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/p_mtl_blue\r
+               map textures/evil2_basemetal/p_mtl_blue\r
        }\r
        {\r
                map $lightmap\r
@@ -24,11 +24,11 @@ textures/evil2_metals/p_mtl_blue
     }\r
 }\r
 \r
-textures/evil2_metals/p_mtl_brn\r
+textures/evil2_basemetal/p_mtl_brn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/p_mtl_brn\r
+               map textures/evil2_basemetal/p_mtl_brn\r
        }\r
        {\r
                map $lightmap\r
@@ -37,11 +37,11 @@ textures/evil2_metals/p_mtl_brn
     }\r
 }\r
 \r
-textures/evil2_metals/p_mtl_tin\r
+textures/evil2_basemetal/p_mtl_tin\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/p_mtl_tin\r
+               map textures/evil2_basemetal/p_mtl_tin\r
        }\r
        {\r
                map $lightmap\r
@@ -50,11 +50,11 @@ textures/evil2_metals/p_mtl_tin
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_rstb\r
+textures/evil2_basemetal/mtl_rstb\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_rstb\r
+               map textures/evil2_basemetal/mtl_rstb\r
        }\r
        {\r
                map $lightmap\r

diff --git a/data/scripts/evil2_basewall.shader b/data/scripts/evil2_basewall.shader
index 852628d8871014033c4bdba356f641904a7eebf6..04091f5b884824dbe7363035097cec61c9d0f11e 100644 (file)
--- a/data/scripts/evil2_basewall.shader
+++ b/data/scripts/evil2_basewall.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/mtl_btmwrnblah\r
+textures/evil2_basewall/mtl_btmwrnblah\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_btmwrnblah\r
+               map textures/evil2_basewall/mtl_btmwrnblah\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil2_metals/mtl_btmwrnblah
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_chn_grt\r
+textures/evil2_basewall/mtl_chn_grt\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_chn_grt\r
+               map textures/evil2_basewall/mtl_chn_grt\r
        }\r
        {\r
                map $lightmap\r
@@ -24,11 +24,11 @@ textures/evil2_metals/mtl_chn_grt
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_fnce\r
+textures/evil2_basewall/mtl_fnce\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_fnce\r
+               map textures/evil2_basewall/mtl_fnce\r
        }\r
        {\r
                map $lightmap\r
@@ -37,11 +37,11 @@ textures/evil2_metals/mtl_fnce
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_fnce2\r
+textures/evil2_basewall/mtl_fnce2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_fnce2\r
+               map textures/evil2_basewall/mtl_fnce2\r
        }\r
        {\r
                map $lightmap\r
@@ -50,11 +50,11 @@ textures/evil2_metals/mtl_fnce2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_fnce3\r
+textures/evil2_basewall/mtl_fnce3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_fnce3\r
+               map textures/evil2_basewall/mtl_fnce3\r
        }\r
        {\r
                map $lightmap\r
@@ -63,11 +63,11 @@ textures/evil2_metals/mtl_fnce3
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_fnce4\r
+textures/evil2_basewall/mtl_fnce4\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_fnce4\r
+               map textures/evil2_basewall/mtl_fnce4\r
        }\r
        {\r
                map $lightmap\r
@@ -76,11 +76,11 @@ textures/evil2_metals/mtl_fnce4
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray\r
+textures/evil2_basewall/mtl_gray\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray\r
+               map textures/evil2_basewall/mtl_gray\r
        }\r
        {\r
                map $lightmap\r
@@ -89,11 +89,11 @@ textures/evil2_metals/mtl_gray
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray2\r
+textures/evil2_basewall/mtl_gray2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray2\r
+               map textures/evil2_basewall/mtl_gray2\r
        }\r
        {\r
                map $lightmap\r
@@ -102,11 +102,11 @@ textures/evil2_metals/mtl_gray2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray3\r
+textures/evil2_basewall/mtl_gray3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray3\r
+               map textures/evil2_basewall/mtl_gray3\r
        }\r
        {\r
                map $lightmap\r
@@ -115,11 +115,11 @@ textures/evil2_metals/mtl_gray3
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_ow\r
+textures/evil2_basewall/mtl_gray4_ow\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_ow\r
+               map textures/evil2_basewall/mtl_gray4_ow\r
        }\r
        {\r
                map $lightmap\r
@@ -128,11 +128,11 @@ textures/evil2_metals/mtl_gray4_ow
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_ow2_0000\r
+textures/evil2_basewall/mtl_gray4_ow2_0000\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_ow2_0000\r
+               map textures/evil2_basewall/mtl_gray4_ow2_0000\r
        }\r
        {\r
                map $lightmap\r
@@ -141,11 +141,11 @@ textures/evil2_metals/mtl_gray4_ow2_0000
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_ow2\r
+textures/evil2_basewall/mtl_gray4_ow2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_ow2\r
+               map textures/evil2_basewall/mtl_gray4_ow2\r
        }\r
        {\r
                map $lightmap\r
@@ -154,11 +154,11 @@ textures/evil2_metals/mtl_gray4_ow2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4\r
+textures/evil2_basewall/mtl_gray4\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4\r
+               map textures/evil2_basewall/mtl_gray4\r
        }\r
        {\r
                map $lightmap\r
@@ -167,11 +167,11 @@ textures/evil2_metals/mtl_gray4
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_sec1\r
+textures/evil2_basewall/mtl_gray4_sec1\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_sec1\r
+               map textures/evil2_basewall/mtl_gray4_sec1\r
        }\r
        {\r
                map $lightmap\r
@@ -180,11 +180,11 @@ textures/evil2_metals/mtl_gray4_sec1
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_sec2\r
+textures/evil2_basewall/mtl_gray4_sec2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_sec2\r
+               map textures/evil2_basewall/mtl_gray4_sec2\r
        }\r
        {\r
                map $lightmap\r
@@ -193,11 +193,11 @@ textures/evil2_metals/mtl_gray4_sec2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_sec3\r
+textures/evil2_basewall/mtl_gray4_sec3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_sec3\r
+               map textures/evil2_basewall/mtl_gray4_sec3\r
        }\r
        {\r
                map $lightmap\r
@@ -206,11 +206,11 @@ textures/evil2_metals/mtl_gray4_sec3
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_sec4\r
+textures/evil2_basewall/mtl_gray4_sec4\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_sec4\r
+               map textures/evil2_basewall/mtl_gray4_sec4\r
        }\r
        {\r
                map $lightmap\r
@@ -219,11 +219,11 @@ textures/evil2_metals/mtl_gray4_sec4
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_gray4_sec5\r
+textures/evil2_basewall/mtl_gray4_sec5\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_gray4_sec5\r
+               map textures/evil2_basewall/mtl_gray4_sec5\r
        }\r
        {\r
                map $lightmap\r
@@ -232,11 +232,11 @@ textures/evil2_metals/mtl_gray4_sec5
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_grtmdl\r
+textures/evil2_basewall/mtl_grtmdl\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_grtmdl\r
+               map textures/evil2_basewall/mtl_grtmdl\r
        }\r
        {\r
                map $lightmap\r
@@ -245,11 +245,11 @@ textures/evil2_metals/mtl_grtmdl
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_grtodd\r
+textures/evil2_basewall/mtl_grtodd\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_grtodd\r
+               map textures/evil2_basewall/mtl_grtodd\r
        }\r
        {\r
                map $lightmap\r
@@ -258,11 +258,11 @@ textures/evil2_metals/mtl_grtodd
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_grtodd2\r
+textures/evil2_basewall/mtl_grtodd2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_grtodd2\r
+               map textures/evil2_basewall/mtl_grtodd2\r
        }\r
        {\r
                map $lightmap\r
@@ -271,11 +271,11 @@ textures/evil2_metals/mtl_grtodd2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_grtodd3\r
+textures/evil2_basewall/mtl_grtodd3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_grtodd3\r
+               map textures/evil2_basewall/mtl_grtodd3\r
        }\r
        {\r
                map $lightmap\r
@@ -284,11 +284,11 @@ textures/evil2_metals/mtl_grtodd3
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_midwrn\r
+textures/evil2_basewall/mtl_midwrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_midwrn\r
+               map textures/evil2_basewall/mtl_midwrn\r
        }\r
        {\r
                map $lightmap\r
@@ -297,11 +297,11 @@ textures/evil2_metals/mtl_midwrn
     }\r
 }\r
 \r
-textures/evil2_metals/t_wll_fnctrm_ow\r
+textures/evil2_basewall/t_wll_fnctrm_ow\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/t_wll_fnctrm_ow\r
+               map textures/evil2_basewall/t_wll_fnctrm_ow\r
        }\r
        {\r
                map $lightmap\r
@@ -310,11 +310,11 @@ textures/evil2_metals/t_wll_fnctrm_ow
     }\r
 }\r
 \r
-textures/evil2_metals/t_wll_fnctrm\r
+textures/evil2_basewall/t_wll_fnctrm\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/t_wll_fnctrm\r
+               map textures/evil2_basewall/t_wll_fnctrm\r
        }\r
        {\r
                map $lightmap\r
@@ -323,11 +323,11 @@ textures/evil2_metals/t_wll_fnctrm
     }\r
 }\r
 \r
-textures/evil2_metals/t_wll_fnctrm_sign\r
+textures/evil2_basewall/t_wll_fnctrm_sign\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/t_wll_fnctrm_sign\r
+               map textures/evil2_basewall/t_wll_fnctrm_sign\r
        }\r
        {\r
                map $lightmap\r
@@ -336,11 +336,11 @@ textures/evil2_metals/t_wll_fnctrm_sign
     }\r
 }\r
 \r
-textures/evil2_metals/t_wll_fnctrm_sign2\r
+textures/evil2_basewall/t_wll_fnctrm_sign2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/t_wll_fnctrm_sign2\r
+               map textures/evil2_basewall/t_wll_fnctrm_sign2\r
        }\r
        {\r
                map $lightmap\r
@@ -349,11 +349,11 @@ textures/evil2_metals/t_wll_fnctrm_sign2
     }\r
 }\r
 \r
-textures/evil2_metals/t_wll_fnctrm2\r
+textures/evil2_basewall/t_wll_fnctrm2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/t_wll_fnctrm2\r
+               map textures/evil2_basewall/t_wll_fnctrm2\r
        }\r
        {\r
                map $lightmap\r

diff --git a/data/scripts/evil2_misc.shader b/data/scripts/evil2_misc.shader
index 66d4249e4da5c42d3c4dfb838909599f3c08fc75..3ca98e9d2bead3a8be3c17a59d1dfa8c581733d6 100644 (file)
--- a/data/scripts/evil2_misc.shader
+++ b/data/scripts/evil2_misc.shader
@@ -22,11 +22,11 @@ textures/evil2_misc/support_grate3
        }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_ow\r
+textures/evil2_misc/barrel_rst_ow\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_ow\r
+               map textures/evil2_misc/barrel_rst_ow\r
        }\r
        {\r
                map $lightmap\r
@@ -35,11 +35,11 @@ textures/evil2_metals/barrel_rst_ow
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst\r
+textures/evil2_misc/barrel_rst\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst\r
+               map textures/evil2_misc/barrel_rst\r
        }\r
        {\r
                map $lightmap\r
@@ -48,11 +48,11 @@ textures/evil2_metals/barrel_rst
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_sign\r
+textures/evil2_misc/barrel_rst_sign\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_sign\r
+               map textures/evil2_misc/barrel_rst_sign\r
        }\r
        {\r
                map $lightmap\r
@@ -61,11 +61,11 @@ textures/evil2_metals/barrel_rst_sign
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_sign2\r
+textures/evil2_misc/barrel_rst_sign2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_sign2\r
+               map textures/evil2_misc/barrel_rst_sign2\r
        }\r
        {\r
                map $lightmap\r
@@ -74,11 +74,11 @@ textures/evil2_metals/barrel_rst_sign2
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_sign3\r
+textures/evil2_misc/barrel_rst_sign3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_sign3\r
+               map textures/evil2_misc/barrel_rst_sign3\r
        }\r
        {\r
                map $lightmap\r
@@ -87,11 +87,11 @@ textures/evil2_metals/barrel_rst_sign3
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_top\r
+textures/evil2_misc/barrel_rst_top\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_top\r
+               map textures/evil2_misc/barrel_rst_top\r
        }\r
        {\r
                map $lightmap\r
@@ -100,11 +100,11 @@ textures/evil2_metals/barrel_rst_top
     }\r
 }\r
 \r
-textures/evil2_metals/barrel_rst_top2\r
+textures/evil2_misc/barrel_rst_top2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/barrel_rst_top2\r
+               map textures/evil2_misc/barrel_rst_top2\r
        }\r
        {\r
                map $lightmap\r
@@ -113,11 +113,11 @@ textures/evil2_metals/barrel_rst_top2
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_grtx\r
+textures/evil2_misc/mtl_grtx\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_grtx\r
+               map textures/evil2_misc/mtl_grtx\r
        }\r
        {\r
                map $lightmap\r
@@ -126,11 +126,11 @@ textures/evil2_metals/mtl_grtx
     }\r
 }\r
 \r
-textures/evil2_metals/mtl_meshplate\r
+textures/evil2_misc/mtl_meshplate\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtl_meshplate\r
+               map textures/evil2_misc/mtl_meshplate\r
        }\r
        {\r
                map $lightmap\r
@@ -139,11 +139,11 @@ textures/evil2_metals/mtl_meshplate
     }\r
 }\r
 \r
-textures/evil2_metals/mtlrail\r
+textures/evil2_misc/mtlrail\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtlrail\r
+               map textures/evil2_misc/mtlrail\r
        }\r
        {\r
                map $lightmap\r
@@ -152,11 +152,11 @@ textures/evil2_metals/mtlrail
     }\r
 }\r
 \r
-textures/evil2_metals/mtlrail_rst\r
+textures/evil2_misc/mtlrail_rst\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtlrail_rst\r
+               map textures/evil2_misc/mtlrail_rst\r
        }\r
        {\r
                map $lightmap\r
@@ -165,11 +165,11 @@ textures/evil2_metals/mtlrail_rst
     }\r
 }\r
 \r
-textures/evil2_metals/mtlrail_rst2\r
+textures/evil2_misc/mtlrail_rst2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/mtlrail_rst2\r
+               map textures/evil2_misc/mtlrail_rst2\r
        }\r
        {\r
                map $lightmap\r
@@ -178,11 +178,11 @@ textures/evil2_metals/mtlrail_rst2
     }\r
 }\r
 \r
-textures/evil2_metals/smll_pipes\r
+textures/evil2_misc/smll_pipes\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/smll_pipes\r
+               map textures/evil2_misc/smll_pipes\r
        }\r
        {\r
                map $lightmap\r
@@ -191,11 +191,11 @@ textures/evil2_metals/smll_pipes
     }\r
 }\r
 \r
-textures/evil2_metals/support_grate\r
+textures/evil2_misc/support_grate\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/support_grate\r
+               map textures/evil2_misc/support_grate\r
        }\r
        {\r
                map $lightmap\r
@@ -204,11 +204,11 @@ textures/evil2_metals/support_grate
     }\r
 }\r
 \r
-textures/evil2_metals/support_grate2\r
+textures/evil2_misc/support_grate2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/support_grate2\r
+               map textures/evil2_misc/support_grate2\r
        }\r
        {\r
                map $lightmap\r
@@ -217,11 +217,11 @@ textures/evil2_metals/support_grate2
     }\r
 }\r
 \r
-textures/evil2_metals/support_grate3\r
+textures/evil2_misc/support_grate3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/support_grate3\r
+               map textures/evil2_misc/support_grate3\r
        }\r
        {\r
                map $lightmap\r
@@ -230,11 +230,11 @@ textures/evil2_metals/support_grate3
     }\r
 }\r
 \r
-textures/evil2_metals/support_grate3\r
+textures/evil2_misc/support_grate3\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/support_grate3\r
+               map textures/evil2_misc/support_grate3\r
        }\r
        {\r
                map $lightmap\r

diff --git a/data/scripts/evil2_trim.shader b/data/scripts/evil2_trim.shader
index c50ab251587172f8318b8e7267df60f44d1a4eb3..40806124e3cf75b9e3965349e9824fe5da946851 100644 (file)
--- a/data/scripts/evil2_trim.shader
+++ b/data/scripts/evil2_trim.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/trim_odd\r
+textures/evil2_trim/trim_odd\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/trim_odd\r
+               map textures/evil2_trim/trim_odd\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil2_metals/trim_odd
     }\r
 }\r
 \r
-textures/evil2_metals/trim_wrnodd_reflect\r
+textures/evil2_trim/trim_wrnodd_reflect\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil2_metals/trim_wrnodd_reflect\r
+               map textures/evil2_trim/trim_wrnodd_reflect\r
        }\r
        {\r
                map $lightmap\r