From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 28 Jan 2012 10:57:34 +0000 (+0200)
Subject: Further fix the shaders in evil2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8970380eb2a604915adf5a3fe76a396f9ea61af0;p=voretournament%2Fvoretournament.git

Further fix the shaders in evil2
---

diff --git a/data/scripts/evil2_basefloor.shader b/data/scripts/evil2_basefloor.shader
index 1a72f3e7..e30ea1da 100644
--- a/data/scripts/evil2_basefloor.shader
+++ b/data/scripts/evil2_basefloor.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/flr_bigrndwrn
+textures/evil2_basefloor/flr_bigrndwrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_bigrndwrn
+		map textures/evil2_basefloor/flr_bigrndwrn
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil2_metals/flr_bigrndwrn
     }
 }
 
-textures/evil2_metals/flr_b-w_drty_bbig
+textures/evil2_basefloor/flr_b-w_drty_bbig
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_b-w_drty_bbig
+		map textures/evil2_basefloor/flr_b-w_drty_bbig
 	}
 	{
 		map $lightmap
@@ -24,11 +24,11 @@ textures/evil2_metals/flr_b-w_drty_bbig
     }
 }
 
-textures/evil2_metals/flr_b-w_drty_bld
+textures/evil2_basefloor/flr_b-w_drty_bld
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_b-w_drty_bld
+		map textures/evil2_basefloor/flr_b-w_drty_bld
 	}
 	{
 		map $lightmap
@@ -37,11 +37,11 @@ textures/evil2_metals/flr_b-w_drty_bld
     }
 }
 
-textures/evil2_metals/flr_b-w_drty_bld2
+textures/evil2_basefloor/flr_b-w_drty_bld2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_b-w_drty_bld2
+		map textures/evil2_basefloor/flr_b-w_drty_bld2
 	}
 	{
 		map $lightmap
@@ -50,11 +50,11 @@ textures/evil2_metals/flr_b-w_drty_bld2
     }
 }
 
-textures/evil2_metals/flr_b-w_drty
+textures/evil2_basefloor/flr_b-w_drty
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_b-w_drty
+		map textures/evil2_basefloor/flr_b-w_drty
 	}
 	{
 		map $lightmap
@@ -63,11 +63,11 @@ textures/evil2_metals/flr_b-w_drty
     }
 }
 
-textures/evil2_metals/flr_b-w
+textures/evil2_basefloor/flr_b-w
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_b-w
+		map textures/evil2_basefloor/flr_b-w
 	}
 	{
 		map $lightmap
@@ -76,11 +76,11 @@ textures/evil2_metals/flr_b-w
     }
 }
 
-textures/evil2_metals/flr_cemtile_bigbrk
+textures/evil2_basefloor/flr_cemtile_bigbrk
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_cemtile_bigbrk
+		map textures/evil2_basefloor/flr_cemtile_bigbrk
 	}
 	{
 		map $lightmap
@@ -89,11 +89,11 @@ textures/evil2_metals/flr_cemtile_bigbrk
     }
 }
 
-textures/evil2_metals/flr_cemtile_drk
+textures/evil2_basefloor/flr_cemtile_drk
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_cemtile_drk
+		map textures/evil2_basefloor/flr_cemtile_drk
 	}
 	{
 		map $lightmap
@@ -102,11 +102,11 @@ textures/evil2_metals/flr_cemtile_drk
     }
 }
 
-textures/evil2_metals/flr_cemtile_m
+textures/evil2_basefloor/flr_cemtile_m
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_cemtile_m
+		map textures/evil2_basefloor/flr_cemtile_m
 	}
 	{
 		map $lightmap
@@ -115,11 +115,11 @@ textures/evil2_metals/flr_cemtile_m
     }
 }
 
-textures/evil2_metals/flr_cemtile
+textures/evil2_basefloor/flr_cemtile
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_cemtile
+		map textures/evil2_basefloor/flr_cemtile
 	}
 	{
 		map $lightmap
@@ -128,11 +128,11 @@ textures/evil2_metals/flr_cemtile
     }
 }
 
-textures/evil2_metals/flr_cemtilesmll_drk
+textures/evil2_basefloor/flr_cemtilesmll_drk
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_cemtilesmll_drk
+		map textures/evil2_basefloor/flr_cemtilesmll_drk
 	}
 	{
 		map $lightmap
@@ -141,11 +141,11 @@ textures/evil2_metals/flr_cemtilesmll_drk
     }
 }
 
-textures/evil2_metals/flr_tmtl_drk_bld
+textures/evil2_basefloor/flr_tmtl_drk_bld
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_tmtl_drk_bld
+		map textures/evil2_basefloor/flr_tmtl_drk_bld
 	}
 	{
 		map $lightmap
@@ -154,11 +154,11 @@ textures/evil2_metals/flr_tmtl_drk_bld
     }
 }
 
-textures/evil2_metals/flr_tmtl_drk
+textures/evil2_basefloor/flr_tmtl_drk
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_tmtl_drk
+		map textures/evil2_basefloor/flr_tmtl_drk
 	}
 	{
 		map $lightmap
@@ -167,11 +167,11 @@ textures/evil2_metals/flr_tmtl_drk
     }
 }
 
-textures/evil2_metals/flr_tmtl_drkwrn
+textures/evil2_basefloor/flr_tmtl_drkwrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_tmtl_drkwrn
+		map textures/evil2_basefloor/flr_tmtl_drkwrn
 	}
 	{
 		map $lightmap
@@ -180,11 +180,11 @@ textures/evil2_metals/flr_tmtl_drkwrn
     }
 }
 
-textures/evil2_metals/flr_tmtl
+textures/evil2_basefloor/flr_tmtl
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/flr_tmtl
+		map textures/evil2_basefloor/flr_tmtl
 	}
 	{
 		map $lightmap
@@ -193,11 +193,11 @@ textures/evil2_metals/flr_tmtl
     }
 }
 
-textures/evil2_metals/mtl_floorgrt_h
+textures/evil2_basefloor/mtl_floorgrt_h
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_floorgrt_h
+		map textures/evil2_basefloor/mtl_floorgrt_h
 	}
 	{
 		map $lightmap
@@ -206,11 +206,11 @@ textures/evil2_metals/mtl_floorgrt_h
     }
 }
 
-textures/evil2_metals/mtl_floorgrt_old_h
+textures/evil2_basefloor/mtl_floorgrt_old_h
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_floorgrt_old_h
+		map textures/evil2_basefloor/mtl_floorgrt_old_h
 	}
 	{
 		map $lightmap
diff --git a/data/scripts/evil2_basemetal.shader b/data/scripts/evil2_basemetal.shader
index ca2b4ac3..c1765653 100644
--- a/data/scripts/evil2_basemetal.shader
+++ b/data/scripts/evil2_basemetal.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/mtl_old0
+textures/evil2_basemetal/mtl_old0
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_old0
+		map textures/evil2_basemetal/mtl_old0
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil2_metals/mtl_old0
     }
 }
 
-textures/evil2_metals/p_mtl_blue
+textures/evil2_basemetal/p_mtl_blue
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/p_mtl_blue
+		map textures/evil2_basemetal/p_mtl_blue
 	}
 	{
 		map $lightmap
@@ -24,11 +24,11 @@ textures/evil2_metals/p_mtl_blue
     }
 }
 
-textures/evil2_metals/p_mtl_brn
+textures/evil2_basemetal/p_mtl_brn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/p_mtl_brn
+		map textures/evil2_basemetal/p_mtl_brn
 	}
 	{
 		map $lightmap
@@ -37,11 +37,11 @@ textures/evil2_metals/p_mtl_brn
     }
 }
 
-textures/evil2_metals/p_mtl_tin
+textures/evil2_basemetal/p_mtl_tin
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/p_mtl_tin
+		map textures/evil2_basemetal/p_mtl_tin
 	}
 	{
 		map $lightmap
@@ -50,11 +50,11 @@ textures/evil2_metals/p_mtl_tin
     }
 }
 
-textures/evil2_metals/mtl_rstb
+textures/evil2_basemetal/mtl_rstb
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_rstb
+		map textures/evil2_basemetal/mtl_rstb
 	}
 	{
 		map $lightmap
diff --git a/data/scripts/evil2_basewall.shader b/data/scripts/evil2_basewall.shader
index 852628d8..04091f5b 100644
--- a/data/scripts/evil2_basewall.shader
+++ b/data/scripts/evil2_basewall.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/mtl_btmwrnblah
+textures/evil2_basewall/mtl_btmwrnblah
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_btmwrnblah
+		map textures/evil2_basewall/mtl_btmwrnblah
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil2_metals/mtl_btmwrnblah
     }
 }
 
-textures/evil2_metals/mtl_chn_grt
+textures/evil2_basewall/mtl_chn_grt
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_chn_grt
+		map textures/evil2_basewall/mtl_chn_grt
 	}
 	{
 		map $lightmap
@@ -24,11 +24,11 @@ textures/evil2_metals/mtl_chn_grt
     }
 }
 
-textures/evil2_metals/mtl_fnce
+textures/evil2_basewall/mtl_fnce
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_fnce
+		map textures/evil2_basewall/mtl_fnce
 	}
 	{
 		map $lightmap
@@ -37,11 +37,11 @@ textures/evil2_metals/mtl_fnce
     }
 }
 
-textures/evil2_metals/mtl_fnce2
+textures/evil2_basewall/mtl_fnce2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_fnce2
+		map textures/evil2_basewall/mtl_fnce2
 	}
 	{
 		map $lightmap
@@ -50,11 +50,11 @@ textures/evil2_metals/mtl_fnce2
     }
 }
 
-textures/evil2_metals/mtl_fnce3
+textures/evil2_basewall/mtl_fnce3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_fnce3
+		map textures/evil2_basewall/mtl_fnce3
 	}
 	{
 		map $lightmap
@@ -63,11 +63,11 @@ textures/evil2_metals/mtl_fnce3
     }
 }
 
-textures/evil2_metals/mtl_fnce4
+textures/evil2_basewall/mtl_fnce4
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_fnce4
+		map textures/evil2_basewall/mtl_fnce4
 	}
 	{
 		map $lightmap
@@ -76,11 +76,11 @@ textures/evil2_metals/mtl_fnce4
     }
 }
 
-textures/evil2_metals/mtl_gray
+textures/evil2_basewall/mtl_gray
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray
+		map textures/evil2_basewall/mtl_gray
 	}
 	{
 		map $lightmap
@@ -89,11 +89,11 @@ textures/evil2_metals/mtl_gray
     }
 }
 
-textures/evil2_metals/mtl_gray2
+textures/evil2_basewall/mtl_gray2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray2
+		map textures/evil2_basewall/mtl_gray2
 	}
 	{
 		map $lightmap
@@ -102,11 +102,11 @@ textures/evil2_metals/mtl_gray2
     }
 }
 
-textures/evil2_metals/mtl_gray3
+textures/evil2_basewall/mtl_gray3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray3
+		map textures/evil2_basewall/mtl_gray3
 	}
 	{
 		map $lightmap
@@ -115,11 +115,11 @@ textures/evil2_metals/mtl_gray3
     }
 }
 
-textures/evil2_metals/mtl_gray4_ow
+textures/evil2_basewall/mtl_gray4_ow
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_ow
+		map textures/evil2_basewall/mtl_gray4_ow
 	}
 	{
 		map $lightmap
@@ -128,11 +128,11 @@ textures/evil2_metals/mtl_gray4_ow
     }
 }
 
-textures/evil2_metals/mtl_gray4_ow2_0000
+textures/evil2_basewall/mtl_gray4_ow2_0000
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_ow2_0000
+		map textures/evil2_basewall/mtl_gray4_ow2_0000
 	}
 	{
 		map $lightmap
@@ -141,11 +141,11 @@ textures/evil2_metals/mtl_gray4_ow2_0000
     }
 }
 
-textures/evil2_metals/mtl_gray4_ow2
+textures/evil2_basewall/mtl_gray4_ow2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_ow2
+		map textures/evil2_basewall/mtl_gray4_ow2
 	}
 	{
 		map $lightmap
@@ -154,11 +154,11 @@ textures/evil2_metals/mtl_gray4_ow2
     }
 }
 
-textures/evil2_metals/mtl_gray4
+textures/evil2_basewall/mtl_gray4
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4
+		map textures/evil2_basewall/mtl_gray4
 	}
 	{
 		map $lightmap
@@ -167,11 +167,11 @@ textures/evil2_metals/mtl_gray4
     }
 }
 
-textures/evil2_metals/mtl_gray4_sec1
+textures/evil2_basewall/mtl_gray4_sec1
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_sec1
+		map textures/evil2_basewall/mtl_gray4_sec1
 	}
 	{
 		map $lightmap
@@ -180,11 +180,11 @@ textures/evil2_metals/mtl_gray4_sec1
     }
 }
 
-textures/evil2_metals/mtl_gray4_sec2
+textures/evil2_basewall/mtl_gray4_sec2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_sec2
+		map textures/evil2_basewall/mtl_gray4_sec2
 	}
 	{
 		map $lightmap
@@ -193,11 +193,11 @@ textures/evil2_metals/mtl_gray4_sec2
     }
 }
 
-textures/evil2_metals/mtl_gray4_sec3
+textures/evil2_basewall/mtl_gray4_sec3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_sec3
+		map textures/evil2_basewall/mtl_gray4_sec3
 	}
 	{
 		map $lightmap
@@ -206,11 +206,11 @@ textures/evil2_metals/mtl_gray4_sec3
     }
 }
 
-textures/evil2_metals/mtl_gray4_sec4
+textures/evil2_basewall/mtl_gray4_sec4
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_sec4
+		map textures/evil2_basewall/mtl_gray4_sec4
 	}
 	{
 		map $lightmap
@@ -219,11 +219,11 @@ textures/evil2_metals/mtl_gray4_sec4
     }
 }
 
-textures/evil2_metals/mtl_gray4_sec5
+textures/evil2_basewall/mtl_gray4_sec5
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_gray4_sec5
+		map textures/evil2_basewall/mtl_gray4_sec5
 	}
 	{
 		map $lightmap
@@ -232,11 +232,11 @@ textures/evil2_metals/mtl_gray4_sec5
     }
 }
 
-textures/evil2_metals/mtl_grtmdl
+textures/evil2_basewall/mtl_grtmdl
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_grtmdl
+		map textures/evil2_basewall/mtl_grtmdl
 	}
 	{
 		map $lightmap
@@ -245,11 +245,11 @@ textures/evil2_metals/mtl_grtmdl
     }
 }
 
-textures/evil2_metals/mtl_grtodd
+textures/evil2_basewall/mtl_grtodd
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_grtodd
+		map textures/evil2_basewall/mtl_grtodd
 	}
 	{
 		map $lightmap
@@ -258,11 +258,11 @@ textures/evil2_metals/mtl_grtodd
     }
 }
 
-textures/evil2_metals/mtl_grtodd2
+textures/evil2_basewall/mtl_grtodd2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_grtodd2
+		map textures/evil2_basewall/mtl_grtodd2
 	}
 	{
 		map $lightmap
@@ -271,11 +271,11 @@ textures/evil2_metals/mtl_grtodd2
     }
 }
 
-textures/evil2_metals/mtl_grtodd3
+textures/evil2_basewall/mtl_grtodd3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_grtodd3
+		map textures/evil2_basewall/mtl_grtodd3
 	}
 	{
 		map $lightmap
@@ -284,11 +284,11 @@ textures/evil2_metals/mtl_grtodd3
     }
 }
 
-textures/evil2_metals/mtl_midwrn
+textures/evil2_basewall/mtl_midwrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_midwrn
+		map textures/evil2_basewall/mtl_midwrn
 	}
 	{
 		map $lightmap
@@ -297,11 +297,11 @@ textures/evil2_metals/mtl_midwrn
     }
 }
 
-textures/evil2_metals/t_wll_fnctrm_ow
+textures/evil2_basewall/t_wll_fnctrm_ow
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/t_wll_fnctrm_ow
+		map textures/evil2_basewall/t_wll_fnctrm_ow
 	}
 	{
 		map $lightmap
@@ -310,11 +310,11 @@ textures/evil2_metals/t_wll_fnctrm_ow
     }
 }
 
-textures/evil2_metals/t_wll_fnctrm
+textures/evil2_basewall/t_wll_fnctrm
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/t_wll_fnctrm
+		map textures/evil2_basewall/t_wll_fnctrm
 	}
 	{
 		map $lightmap
@@ -323,11 +323,11 @@ textures/evil2_metals/t_wll_fnctrm
     }
 }
 
-textures/evil2_metals/t_wll_fnctrm_sign
+textures/evil2_basewall/t_wll_fnctrm_sign
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/t_wll_fnctrm_sign
+		map textures/evil2_basewall/t_wll_fnctrm_sign
 	}
 	{
 		map $lightmap
@@ -336,11 +336,11 @@ textures/evil2_metals/t_wll_fnctrm_sign
     }
 }
 
-textures/evil2_metals/t_wll_fnctrm_sign2
+textures/evil2_basewall/t_wll_fnctrm_sign2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/t_wll_fnctrm_sign2
+		map textures/evil2_basewall/t_wll_fnctrm_sign2
 	}
 	{
 		map $lightmap
@@ -349,11 +349,11 @@ textures/evil2_metals/t_wll_fnctrm_sign2
     }
 }
 
-textures/evil2_metals/t_wll_fnctrm2
+textures/evil2_basewall/t_wll_fnctrm2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/t_wll_fnctrm2
+		map textures/evil2_basewall/t_wll_fnctrm2
 	}
 	{
 		map $lightmap
diff --git a/data/scripts/evil2_misc.shader b/data/scripts/evil2_misc.shader
index 66d4249e..3ca98e9d 100644
--- a/data/scripts/evil2_misc.shader
+++ b/data/scripts/evil2_misc.shader
@@ -22,11 +22,11 @@ textures/evil2_misc/support_grate3
 	}
 }
 
-textures/evil2_metals/barrel_rst_ow
+textures/evil2_misc/barrel_rst_ow
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_ow
+		map textures/evil2_misc/barrel_rst_ow
 	}
 	{
 		map $lightmap
@@ -35,11 +35,11 @@ textures/evil2_metals/barrel_rst_ow
     }
 }
 
-textures/evil2_metals/barrel_rst
+textures/evil2_misc/barrel_rst
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst
+		map textures/evil2_misc/barrel_rst
 	}
 	{
 		map $lightmap
@@ -48,11 +48,11 @@ textures/evil2_metals/barrel_rst
     }
 }
 
-textures/evil2_metals/barrel_rst_sign
+textures/evil2_misc/barrel_rst_sign
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_sign
+		map textures/evil2_misc/barrel_rst_sign
 	}
 	{
 		map $lightmap
@@ -61,11 +61,11 @@ textures/evil2_metals/barrel_rst_sign
     }
 }
 
-textures/evil2_metals/barrel_rst_sign2
+textures/evil2_misc/barrel_rst_sign2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_sign2
+		map textures/evil2_misc/barrel_rst_sign2
 	}
 	{
 		map $lightmap
@@ -74,11 +74,11 @@ textures/evil2_metals/barrel_rst_sign2
     }
 }
 
-textures/evil2_metals/barrel_rst_sign3
+textures/evil2_misc/barrel_rst_sign3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_sign3
+		map textures/evil2_misc/barrel_rst_sign3
 	}
 	{
 		map $lightmap
@@ -87,11 +87,11 @@ textures/evil2_metals/barrel_rst_sign3
     }
 }
 
-textures/evil2_metals/barrel_rst_top
+textures/evil2_misc/barrel_rst_top
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_top
+		map textures/evil2_misc/barrel_rst_top
 	}
 	{
 		map $lightmap
@@ -100,11 +100,11 @@ textures/evil2_metals/barrel_rst_top
     }
 }
 
-textures/evil2_metals/barrel_rst_top2
+textures/evil2_misc/barrel_rst_top2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/barrel_rst_top2
+		map textures/evil2_misc/barrel_rst_top2
 	}
 	{
 		map $lightmap
@@ -113,11 +113,11 @@ textures/evil2_metals/barrel_rst_top2
     }
 }
 
-textures/evil2_metals/mtl_grtx
+textures/evil2_misc/mtl_grtx
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_grtx
+		map textures/evil2_misc/mtl_grtx
 	}
 	{
 		map $lightmap
@@ -126,11 +126,11 @@ textures/evil2_metals/mtl_grtx
     }
 }
 
-textures/evil2_metals/mtl_meshplate
+textures/evil2_misc/mtl_meshplate
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtl_meshplate
+		map textures/evil2_misc/mtl_meshplate
 	}
 	{
 		map $lightmap
@@ -139,11 +139,11 @@ textures/evil2_metals/mtl_meshplate
     }
 }
 
-textures/evil2_metals/mtlrail
+textures/evil2_misc/mtlrail
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtlrail
+		map textures/evil2_misc/mtlrail
 	}
 	{
 		map $lightmap
@@ -152,11 +152,11 @@ textures/evil2_metals/mtlrail
     }
 }
 
-textures/evil2_metals/mtlrail_rst
+textures/evil2_misc/mtlrail_rst
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtlrail_rst
+		map textures/evil2_misc/mtlrail_rst
 	}
 	{
 		map $lightmap
@@ -165,11 +165,11 @@ textures/evil2_metals/mtlrail_rst
     }
 }
 
-textures/evil2_metals/mtlrail_rst2
+textures/evil2_misc/mtlrail_rst2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/mtlrail_rst2
+		map textures/evil2_misc/mtlrail_rst2
 	}
 	{
 		map $lightmap
@@ -178,11 +178,11 @@ textures/evil2_metals/mtlrail_rst2
     }
 }
 
-textures/evil2_metals/smll_pipes
+textures/evil2_misc/smll_pipes
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/smll_pipes
+		map textures/evil2_misc/smll_pipes
 	}
 	{
 		map $lightmap
@@ -191,11 +191,11 @@ textures/evil2_metals/smll_pipes
     }
 }
 
-textures/evil2_metals/support_grate
+textures/evil2_misc/support_grate
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/support_grate
+		map textures/evil2_misc/support_grate
 	}
 	{
 		map $lightmap
@@ -204,11 +204,11 @@ textures/evil2_metals/support_grate
     }
 }
 
-textures/evil2_metals/support_grate2
+textures/evil2_misc/support_grate2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/support_grate2
+		map textures/evil2_misc/support_grate2
 	}
 	{
 		map $lightmap
@@ -217,11 +217,11 @@ textures/evil2_metals/support_grate2
     }
 }
 
-textures/evil2_metals/support_grate3
+textures/evil2_misc/support_grate3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/support_grate3
+		map textures/evil2_misc/support_grate3
 	}
 	{
 		map $lightmap
@@ -230,11 +230,11 @@ textures/evil2_metals/support_grate3
     }
 }
 
-textures/evil2_metals/support_grate3
+textures/evil2_misc/support_grate3
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/support_grate3
+		map textures/evil2_misc/support_grate3
 	}
 	{
 		map $lightmap
diff --git a/data/scripts/evil2_trim.shader b/data/scripts/evil2_trim.shader
index c50ab251..40806124 100644
--- a/data/scripts/evil2_trim.shader
+++ b/data/scripts/evil2_trim.shader
@@ -1,8 +1,8 @@
-textures/evil2_metals/trim_odd
+textures/evil2_trim/trim_odd
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/trim_odd
+		map textures/evil2_trim/trim_odd
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil2_metals/trim_odd
     }
 }
 
-textures/evil2_metals/trim_wrnodd_reflect
+textures/evil2_trim/trim_wrnodd_reflect
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil2_metals/trim_wrnodd_reflect
+		map textures/evil2_trim/trim_wrnodd_reflect
 	}
 	{
 		map $lightmap