X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fturrets.shader;h=f407aba1536818066149dd82d120ce4ecdb073bb;hb=ea48961feb50159e05ef56f38b7fd0ebc15cc64e;hp=c0d223c56689b93ab9c2eed0e84dbb3c8b7218e2;hpb=477b7b3e324bdb74aee19bfee925d708c7cf9758;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/scripts/turrets.shader b/scripts/turrets.shader
index c0d223c56..f407aba15 100644
--- a/scripts/turrets.shader
+++ b/scripts/turrets.shader
@@ -1,57 +1,65 @@
-models/turrets/tesla_chrome
-{
-
-	qer_editorimage models/turrets/chrome.tga
-
-	//dp_reflect 0 0.75 0.75 1 0.5	
-	{
-		map models/turrets/chrome.tga	
-		rgbGen vertex
-		tcGen environment 
-		tcMod scale 2 2
-		
-	}
-}
-
-models/turrets/phaser_beam
-{
-	surfaceparm trans
-	cull none
-	nopicmip
-
-	qer_editorimage models/turrets/phaser_beam
-	{		
-		map models/turrets/phaser_beam
-		blendFunc add
-	}
-
-}
-
-models/turrets/reactor_beams
-{
-	surfaceparm trans
-	cull none
-
-	qer_editorimage models/turrets/reactor
-	{		
-		map models/turrets/reactor
-		blendFunc add
-	}
-}
-
-models/turrets/r_fx1
-{
-	surfaceparm nomarks
-	surfaceparm trans
-	surfaceparm pointlight
-	surfaceparm nolightmap	
-	nopicmip
-	qer_editorimage models/turrets/r_fx1_1
-
-	{
-		animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 
-	}
-
-}
-
-
+evil_basewall/mtl_gray
+{
+	{		
+		map textures/exx/base/base_metal01
+		rgbgen lightingDiffuse
+	}
+}
+
+models/turrets/tesla_chrome
+{
+
+	qer_editorimage models/turrets/chrome.tga
+
+	//dp_reflect 0 0.75 0.75 1 0.5	
+	{
+		map models/turrets/chrome.tga	
+		rgbGen vertex
+		tcGen environment 
+		tcMod scale 2 2
+		
+	}
+}
+
+models/turrets/phaser_beam
+{
+	surfaceparm trans
+	cull none
+	nopicmip
+
+	qer_editorimage models/turrets/phaser_beam
+	{		
+		map models/turrets/phaser_beam
+		blendFunc GL_SRC_ALPHA GL_ONE
+	}
+
+}
+
+models/turrets/reactor_beams
+{
+	surfaceparm trans
+	cull none
+
+	qer_editorimage models/turrets/reactor
+	{		
+		map models/turrets/reactor
+		blendFunc add
+	}
+}
+
+models/turrets/r_fx1
+{
+	surfaceparm nomarks
+	surfaceparm trans
+	surfaceparm pointlight
+	surfaceparm nolightmap	
+	nopicmip
+	qer_editorimage models/turrets/r_fx1_1
+
+	{
+		animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 
+	}
+
+}
+
+