From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 28 Jan 2012 14:02:05 +0000 (+0200)
Subject: Fix the final shader typos for the evil set
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=92aa05a03c92bd717f39d3002fda615964a98c34;p=voretournament%2Fvoretournament.git

Fix the final shader typos for the evil set
---

diff --git a/data/scripts/evil1_misc.shader b/data/scripts/evil1_misc.shader
index 8a66b8dc..6f803e0b 100644
--- a/data/scripts/evil1_misc.shader
+++ b/data/scripts/evil1_misc.shader
@@ -1,8 +1,8 @@
-textures/evil1_metals/mtl_support
+textures/evil1_misc/mtl_support
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/mtl_support
+		map textures/evil1_misc/mtl_support
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil1_metals/mtl_support
     }
 }
 
-textures/evil1_metals/mtl_support_wrn
+textures/evil1_misc/mtl_support_wrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/mtl_support_wrn
+		map textures/evil1_misc/mtl_support_wrn
 	}
 	{
 		map $lightmap
@@ -24,11 +24,11 @@ textures/evil1_metals/mtl_support_wrn
     }
 }
 
-textures/evil1_metals/pipemetal
+textures/evil1_misc/pipemetal
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/pipemetal
+		map textures/evil1_misc/pipemetal
 	}
 	{
 		map $lightmap
@@ -37,11 +37,11 @@ textures/evil1_metals/pipemetal
     }
 }
 
-textures/evil1_metals/pipes
+textures/evil1_misc/pipes
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/pipes
+		map textures/evil1_misc/pipes
 	}
 	{
 		map $lightmap
@@ -50,11 +50,11 @@ textures/evil1_metals/pipes
     }
 }
 
-textures/evil1_metals/pipes2
+textures/evil1_misc/pipes2
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/pipes2
+		map textures/evil1_misc/pipes2
 	}
 	{
 		map $lightmap
@@ -63,11 +63,11 @@ textures/evil1_metals/pipes2
     }
 }
 
-textures/evil1_metals/rstpipes_lum
+textures/evil1_misc/rstpipes_lum
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/rstpipes_lum
+		map textures/evil1_misc/rstpipes_lum
 	}
 	{
 		map $lightmap
@@ -76,11 +76,11 @@ textures/evil1_metals/rstpipes_lum
     }
 }
 
-textures/evil1_metals/rstpipes_misc
+textures/evil1_misc/rstpipes_misc
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/rstpipes_misc
+		map textures/evil1_misc/rstpipes_misc
 	}
 	{
 		map $lightmap
@@ -89,11 +89,11 @@ textures/evil1_metals/rstpipes_misc
     }
 }
 
-textures/evil1_metals/ta_wrnsign
+textures/evil1_misc/ta_wrnsign
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/ta_wrnsign
+		map textures/evil1_misc/ta_wrnsign
 	}
 	{
 		map $lightmap
diff --git a/data/scripts/evil1_trims.shader b/data/scripts/evil1_trims.shader
index 3bd218d7..de14afb0 100644
--- a/data/scripts/evil1_trims.shader
+++ b/data/scripts/evil1_trims.shader
@@ -1,8 +1,8 @@
-textures/evil1_metals/brdmtl_rst
+textures/evil1_trims/brdmtl_rst
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/brdmtl_rst
+		map textures/evil1_trims/brdmtl_rst
 	}
 	{
 		map $lightmap
@@ -11,11 +11,11 @@ textures/evil1_metals/brdmtl_rst
     }
 }
 
-textures/evil1_metals/grllkinda0
+textures/evil1_trims/grllkinda0
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/grllkinda0
+		map textures/evil1_trims/grllkinda0
 	}
 	{
 		map $lightmap
@@ -24,11 +24,11 @@ textures/evil1_metals/grllkinda0
     }
 }
 
-textures/evil1_metals/trim_mtl
+textures/evil1_trims/trim_mtl
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_mtl
+		map textures/evil1_trims/trim_mtl
 	}
 	{
 		map $lightmap
@@ -37,11 +37,11 @@ textures/evil1_metals/trim_mtl
     }
 }
 
-textures/evil1_metals/trim_mtlb
+textures/evil1_trims/trim_mtlb
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_mtlb
+		map textures/evil1_trims/trim_mtlb
 	}
 	{
 		map $lightmap
@@ -50,11 +50,11 @@ textures/evil1_metals/trim_mtlb
     }
 }
 
-textures/evil1_metals/trim_mtlc
+textures/evil1_trims/trim_mtlc
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_mtlc
+		map textures/evil1_trims/trim_mtlc
 	}
 	{
 		map $lightmap
@@ -63,11 +63,11 @@ textures/evil1_metals/trim_mtlc
     }
 }
 
-textures/evil1_metals/trim_mtlwrn
+textures/evil1_trims/trim_mtlwrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_mtlwrn
+		map textures/evil1_trims/trim_mtlwrn
 	}
 	{
 		map $lightmap
@@ -76,11 +76,11 @@ textures/evil1_metals/trim_mtlwrn
     }
 }
 
-textures/evil1_metals/trim_wallpaper_drty
+textures/evil1_trims/trim_wallpaper_drty
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_wallpaper_drty
+		map textures/evil1_trims/trim_wallpaper_drty
 	}
 	{
 		map $lightmap
@@ -89,11 +89,11 @@ textures/evil1_metals/trim_wallpaper_drty
     }
 }
 
-textures/evil1_metals/trim_wallpaper
+textures/evil1_trims/trim_wallpaper
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_wallpaper
+		map textures/evil1_trims/trim_wallpaper
 	}
 	{
 		map $lightmap
@@ -102,11 +102,11 @@ textures/evil1_metals/trim_wallpaper
     }
 }
 
-textures/evil1_metals/trim_wlpr_drtyckred
+textures/evil1_trims/trim_wlpr_drtyckred
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trim_wlpr_drtyckred
+		map textures/evil1_trims/trim_wlpr_drtyckred
 	}
 	{
 		map $lightmap
@@ -115,11 +115,11 @@ textures/evil1_metals/trim_wlpr_drtyckred
     }
 }
 
-textures/evil1_metals/trm_rivetmtl
+textures/evil1_trims/trm_rivetmtl
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trm_rivetmtl
+		map textures/evil1_trims/trm_rivetmtl
 	}
 	{
 		map $lightmap
@@ -128,11 +128,11 @@ textures/evil1_metals/trm_rivetmtl
     }
 }
 
-textures/evil1_metals/trm_rivetmtl0
+textures/evil1_trims/trm_rivetmtl0
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trm_rivetmtl0
+		map textures/evil1_trims/trm_rivetmtl0
 	}
 	{
 		map $lightmap
@@ -141,11 +141,11 @@ textures/evil1_metals/trm_rivetmtl0
     }
 }
 
-textures/evil1_metals/trm_rivetmtlgrt
+textures/evil1_trims/trm_rivetmtlgrt
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trm_rivetmtlgrt
+		map textures/evil1_trims/trm_rivetmtlgrt
 	}
 	{
 		map $lightmap
@@ -154,11 +154,11 @@ textures/evil1_metals/trm_rivetmtlgrt
     }
 }
 
-textures/evil1_metals/trm_rivetmtlpipes
+textures/evil1_trims/trm_rivetmtlpipes
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trm_rivetmtlpipes
+		map textures/evil1_trims/trm_rivetmtlpipes
 	}
 	{
 		map $lightmap
@@ -167,11 +167,11 @@ textures/evil1_metals/trm_rivetmtlpipes
     }
 }
 
-textures/evil1_metals/trm_rivetmtlwrn
+textures/evil1_trims/trm_rivetmtlwrn
 {
 	dpreflectcube cubemaps/exomorph/exomorph
  	{
-		map textures/evil1_metals/trm_rivetmtlwrn
+		map textures/evil1_trims/trm_rivetmtlwrn
 	}
 	{
 		map $lightmap