Fix the final shader typos for the evil set

diff --git a/data/scripts/evil1_misc.shader b/data/scripts/evil1_misc.shader
index 8a66b8dc091ff3965e239332fec890bc3e70c626..6f803e0b808e8451987fac68866d062dc95c2082 100644 (file)
--- a/data/scripts/evil1_misc.shader
+++ b/data/scripts/evil1_misc.shader
@@ -1,8 +1,8 @@
-textures/evil1_metals/mtl_support\r
+textures/evil1_misc/mtl_support\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/mtl_support\r
+               map textures/evil1_misc/mtl_support\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil1_metals/mtl_support
     }\r
 }\r
 \r
-textures/evil1_metals/mtl_support_wrn\r
+textures/evil1_misc/mtl_support_wrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/mtl_support_wrn\r
+               map textures/evil1_misc/mtl_support_wrn\r
        }\r
        {\r
                map $lightmap\r
@@ -24,11 +24,11 @@ textures/evil1_metals/mtl_support_wrn
     }\r
 }\r
 \r
-textures/evil1_metals/pipemetal\r
+textures/evil1_misc/pipemetal\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/pipemetal\r
+               map textures/evil1_misc/pipemetal\r
        }\r
        {\r
                map $lightmap\r
@@ -37,11 +37,11 @@ textures/evil1_metals/pipemetal
     }\r
 }\r
 \r
-textures/evil1_metals/pipes\r
+textures/evil1_misc/pipes\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/pipes\r
+               map textures/evil1_misc/pipes\r
        }\r
        {\r
                map $lightmap\r
@@ -50,11 +50,11 @@ textures/evil1_metals/pipes
     }\r
 }\r
 \r
-textures/evil1_metals/pipes2\r
+textures/evil1_misc/pipes2\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/pipes2\r
+               map textures/evil1_misc/pipes2\r
        }\r
        {\r
                map $lightmap\r
@@ -63,11 +63,11 @@ textures/evil1_metals/pipes2
     }\r
 }\r
 \r
-textures/evil1_metals/rstpipes_lum\r
+textures/evil1_misc/rstpipes_lum\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/rstpipes_lum\r
+               map textures/evil1_misc/rstpipes_lum\r
        }\r
        {\r
                map $lightmap\r
@@ -76,11 +76,11 @@ textures/evil1_metals/rstpipes_lum
     }\r
 }\r
 \r
-textures/evil1_metals/rstpipes_misc\r
+textures/evil1_misc/rstpipes_misc\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/rstpipes_misc\r
+               map textures/evil1_misc/rstpipes_misc\r
        }\r
        {\r
                map $lightmap\r
@@ -89,11 +89,11 @@ textures/evil1_metals/rstpipes_misc
     }\r
 }\r
 \r
-textures/evil1_metals/ta_wrnsign\r
+textures/evil1_misc/ta_wrnsign\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/ta_wrnsign\r
+               map textures/evil1_misc/ta_wrnsign\r
        }\r
        {\r
                map $lightmap\r

diff --git a/data/scripts/evil1_trims.shader b/data/scripts/evil1_trims.shader
index 3bd218d7ae7baa68778dc51305552a70625a62f9..de14afb011b7378bebf71cc33e93e477f49ab830 100644 (file)
--- a/data/scripts/evil1_trims.shader
+++ b/data/scripts/evil1_trims.shader
@@ -1,8 +1,8 @@
-textures/evil1_metals/brdmtl_rst\r
+textures/evil1_trims/brdmtl_rst\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/brdmtl_rst\r
+               map textures/evil1_trims/brdmtl_rst\r
        }\r
        {\r
                map $lightmap\r
@@ -11,11 +11,11 @@ textures/evil1_metals/brdmtl_rst
     }\r
 }\r
 \r
-textures/evil1_metals/grllkinda0\r
+textures/evil1_trims/grllkinda0\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/grllkinda0\r
+               map textures/evil1_trims/grllkinda0\r
        }\r
        {\r
                map $lightmap\r
@@ -24,11 +24,11 @@ textures/evil1_metals/grllkinda0
     }\r
 }\r
 \r
-textures/evil1_metals/trim_mtl\r
+textures/evil1_trims/trim_mtl\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_mtl\r
+               map textures/evil1_trims/trim_mtl\r
        }\r
        {\r
                map $lightmap\r
@@ -37,11 +37,11 @@ textures/evil1_metals/trim_mtl
     }\r
 }\r
 \r
-textures/evil1_metals/trim_mtlb\r
+textures/evil1_trims/trim_mtlb\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_mtlb\r
+               map textures/evil1_trims/trim_mtlb\r
        }\r
        {\r
                map $lightmap\r
@@ -50,11 +50,11 @@ textures/evil1_metals/trim_mtlb
     }\r
 }\r
 \r
-textures/evil1_metals/trim_mtlc\r
+textures/evil1_trims/trim_mtlc\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_mtlc\r
+               map textures/evil1_trims/trim_mtlc\r
        }\r
        {\r
                map $lightmap\r
@@ -63,11 +63,11 @@ textures/evil1_metals/trim_mtlc
     }\r
 }\r
 \r
-textures/evil1_metals/trim_mtlwrn\r
+textures/evil1_trims/trim_mtlwrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_mtlwrn\r
+               map textures/evil1_trims/trim_mtlwrn\r
        }\r
        {\r
                map $lightmap\r
@@ -76,11 +76,11 @@ textures/evil1_metals/trim_mtlwrn
     }\r
 }\r
 \r
-textures/evil1_metals/trim_wallpaper_drty\r
+textures/evil1_trims/trim_wallpaper_drty\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_wallpaper_drty\r
+               map textures/evil1_trims/trim_wallpaper_drty\r
        }\r
        {\r
                map $lightmap\r
@@ -89,11 +89,11 @@ textures/evil1_metals/trim_wallpaper_drty
     }\r
 }\r
 \r
-textures/evil1_metals/trim_wallpaper\r
+textures/evil1_trims/trim_wallpaper\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_wallpaper\r
+               map textures/evil1_trims/trim_wallpaper\r
        }\r
        {\r
                map $lightmap\r
@@ -102,11 +102,11 @@ textures/evil1_metals/trim_wallpaper
     }\r
 }\r
 \r
-textures/evil1_metals/trim_wlpr_drtyckred\r
+textures/evil1_trims/trim_wlpr_drtyckred\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trim_wlpr_drtyckred\r
+               map textures/evil1_trims/trim_wlpr_drtyckred\r
        }\r
        {\r
                map $lightmap\r
@@ -115,11 +115,11 @@ textures/evil1_metals/trim_wlpr_drtyckred
     }\r
 }\r
 \r
-textures/evil1_metals/trm_rivetmtl\r
+textures/evil1_trims/trm_rivetmtl\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trm_rivetmtl\r
+               map textures/evil1_trims/trm_rivetmtl\r
        }\r
        {\r
                map $lightmap\r
@@ -128,11 +128,11 @@ textures/evil1_metals/trm_rivetmtl
     }\r
 }\r
 \r
-textures/evil1_metals/trm_rivetmtl0\r
+textures/evil1_trims/trm_rivetmtl0\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trm_rivetmtl0\r
+               map textures/evil1_trims/trm_rivetmtl0\r
        }\r
        {\r
                map $lightmap\r
@@ -141,11 +141,11 @@ textures/evil1_metals/trm_rivetmtl0
     }\r
 }\r
 \r
-textures/evil1_metals/trm_rivetmtlgrt\r
+textures/evil1_trims/trm_rivetmtlgrt\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trm_rivetmtlgrt\r
+               map textures/evil1_trims/trm_rivetmtlgrt\r
        }\r
        {\r
                map $lightmap\r
@@ -154,11 +154,11 @@ textures/evil1_metals/trm_rivetmtlgrt
     }\r
 }\r
 \r
-textures/evil1_metals/trm_rivetmtlpipes\r
+textures/evil1_trims/trm_rivetmtlpipes\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trm_rivetmtlpipes\r
+               map textures/evil1_trims/trm_rivetmtlpipes\r
        }\r
        {\r
                map $lightmap\r
@@ -167,11 +167,11 @@ textures/evil1_metals/trm_rivetmtlpipes
     }\r
 }\r
 \r
-textures/evil1_metals/trm_rivetmtlwrn\r
+textures/evil1_trims/trm_rivetmtlwrn\r
 {\r
        dpreflectcube cubemaps/exomorph/exomorph\r
        {\r
-               map textures/evil1_metals/trm_rivetmtlwrn\r
+               map textures/evil1_trims/trm_rivetmtlwrn\r
        }\r
        {\r
                map $lightmap\r