X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=blobdiff_plain;f=scripts%2Feffects_forcefield.shader;h=7728ffc87f626d96414bdc1052252e7c5c3abe41;hp=bdcd81157dc1a2351144ff48c41c6c492ec11631;hb=3fdeff0fc4ab67a00e6425d00f25734a22975dff;hpb=5cdb2c654251adce8d712bf770926a5d04a40ba6

diff --git a/scripts/effects_forcefield.shader b/scripts/effects_forcefield.shader
index bdcd8115..7728ffc8 100644
--- a/scripts/effects_forcefield.shader
+++ b/scripts/effects_forcefield.shader
@@ -1,8 +1,8 @@
 //Shader file for fx
 //Forcefield1 red
-textures/fx/forcefield1-a
+textures/effects_forcefield/forcefield1_a
 {
-	qer_editorimage textures/fx/forcefields/forcefield1_a.tga
+	qer_editorimage textures/effects_forcefield/forcefield1_a.tga
 	nopicmip
 	surfaceparm nolightmap
 	surfaceparm trans
@@ -11,17 +11,41 @@ textures/fx/forcefield1-a
 	qer_trans 0.8
 	
 	{
-		map textures/fx/forcefields/forcefield1_a.tga
+		map textures/effects_forcefield/forcefield1_a.tga
 		tcGen environment
 		blendfunc GL_ONE GL_ONE
 		tcMod turb 0 0.25 0 0.5
 		tcMod scroll -.5 -.3
 	}
 }
+
+//Forcefield1 red glowy, less turb
+textures/effects_forcefield/forcefield1_a_surflight
+{
+	qer_editorimage textures/effects_forcefield/forcefield1_a.tga
+	nopicmip
+	surfaceparm nolightmap
+	surfaceparm trans
+	cull none
+	surfaceparm nomarks
+	q3map_surfacelight 250
+	qer_trans 0.8
+	
+	{
+		map textures/effects_forcefield/forcefield1_a.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ONE
+		tcMod turb 0 0.25 0 0.25
+		tcMod scroll -.5 -.3
+	}
+}
+
+
+
 //Forcefield1 blue
-textures/fx/forcefield1-b
+textures/effects_forcefield/forcefield1_b
 {
-	qer_editorimage textures/fx/forcefields/forcefield1_b.tga
+	qer_editorimage textures/effects_forcefield/forcefield1_b.tga
 	nopicmip
 	surfaceparm nolightmap
 	surfaceparm trans
@@ -30,17 +54,39 @@ textures/fx/forcefield1-b
 	qer_trans 0.8
 	
 	{
-		map textures/fx/forcefields/forcefield1_b.tga
+		map textures/effects_forcefield/forcefield1_b.tga
 		tcGen environment
 		blendfunc GL_ONE GL_ONE
 		tcMod turb 0 0.25 0 0.5
 		tcMod scroll -.5 -.3
 	}
 }
+
+//Forcefield1 blue glowy, less turb
+textures/effects_forcefield/forcefield1_b_surflight
+{
+	qer_editorimage textures/effects_forcefield/forcefield1_b.tga
+	nopicmip
+	surfaceparm nolightmap
+	surfaceparm trans
+	cull none
+	surfaceparm nomarks
+	q3map_surfacelight 250
+	qer_trans 0.8
+	
+	{
+		map textures/effects_forcefield/forcefield1_b.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ONE
+		tcMod turb 0 0.25 0 0.25
+		tcMod scroll -.5 -.3
+	}
+}
+
 //Forcefield1 yellow
-textures/fx/forcefield2-c
+textures/effects_forcefield/forcefield1_c
 {
-	qer_editorimage textures/fx/forcefields/forcefield1_c.tga
+	qer_editorimage textures/effects_forcefield/forcefield1_c.tga
 	nopicmip
 	surfaceparm nolightmap
 	surfaceparm trans
@@ -49,17 +95,40 @@ textures/fx/forcefield2-c
 	qer_trans 0.8
 	
 	{
-		map textures/fx/forcefields/forcefield1_c.tga
+		map textures/effects_forcefield/forcefield1_c.tga
 		tcGen environment
 		blendfunc GL_ONE GL_ONE
 		tcMod turb 0 0.25 0 0.5
 		tcMod scroll -.5 -.3
 	}
 }
+
+//Forcefield1 yellow less turb, glowy
+textures/effects_forcefield/forcefield1_c_surflight
+{
+	qer_editorimage textures/effects_forcefield/forcefield1_c.tga
+	nopicmip
+	surfaceparm nolightmap
+	surfaceparm trans
+	cull none
+	surfaceparm nomarks
+	q3map_surfacelight 250
+	qer_trans 0.8
+	
+	{
+		map textures/effects_forcefield/forcefield1_c.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ONE
+		tcMod turb 0 0.25 0 0.25
+		tcMod scroll -.5 -.3
+	}
+}
+
+
 //Forcefield1 green
-textures/fx/forcefield1-d
+textures/effects_forcefield/forcefield1_d
 {
-	qer_editorimage textures/fx/forcefields/forcefield1_d.tga
+	qer_editorimage textures/effects_forcefield/forcefield1_d.tga
 	nopicmip
 	surfaceparm nolightmap
 	surfaceparm trans
@@ -68,10 +137,31 @@ textures/fx/forcefield1-d
 	qer_trans 0.8
 	
 	{
-		map textures/fx/forcefields/forcefield1_d.tga
+		map textures/effects_forcefield/forcefield1_d.tga
 		tcGen environment
 		blendfunc GL_ONE GL_ONE
 		tcMod turb 0 0.25 0 0.5
 		tcMod scroll -.5 -.3
 	}
 }
+
+//Forcefield1 green glowy, less turb
+textures/effects_forcefield/forcefield1_d_surflight
+{
+	qer_editorimage textures/effects_forcefield/forcefield1_d.tga
+	nopicmip
+	surfaceparm nolightmap
+	surfaceparm trans
+	cull none
+	surfaceparm nomarks
+	q3map_surfacelight 250
+	qer_trans 0.8
+	
+	{
+		map textures/effects_forcefield/forcefield1_d.tga
+		tcGen environment
+		blendfunc GL_ONE GL_ONE
+		tcMod turb 0 0.25 0 0.25
+		tcMod scroll -.5 -.3
+	}
+}
\ No newline at end of file