X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=scripts%2Fnexcompat-tree.shader;fp=scripts%2Fnexcompat-tree.shader;h=f047b4440205029fe1c640f2d0356269e131b245;hb=61fd531ba1a501fb13cc93296337c96e20283d80;hp=174ca150fe05b6cfbfdfec32a34412cdef83004e;hpb=dd682ea18d21df4e0ba4ac5e300505a88f9144a9;p=xonotic%2Fxonotic-nexcompat.pk3dir.git

diff --git a/scripts/nexcompat-tree.shader b/scripts/nexcompat-tree.shader
index 174ca15..f047b44 100644
--- a/scripts/nexcompat-tree.shader
+++ b/scripts/nexcompat-tree.shader
@@ -1,7 +1,7 @@
 
 leaves2
 {
-	qer_editorimage leaves2.tga
+	qer_editorimage textures/leaves2.tga
 	qer_trans 0.6
 	deformVertexes autosprite
 	surfaceparm trans
@@ -10,7 +10,25 @@ leaves2
 	q3map_vertexScale 1
 	deformVertexes wave 128 sin 0 1 0 0.4 
 	{
-		map leaves2.tga
+		map textures/leaves2.tga
+		alphaFunc GT0
+		rgbGen vertex
+	}
+}
+
+textures/morph/leaves3
+{
+cull none
+	qer_editorimage textures/leaves6.tga
+	qer_trans 0.6
+	surfaceparm trans
+//	surfaceparm nolightmap
+	surfaceparm alphashadow
+	deformVertexes autosprite
+	q3map_vertexScale 1
+	deformVertexes wave 128 sin 0 1 0 0.4 
+	{
+		map textures/leaves6.tga
 		alphaFunc GT0
 		rgbGen vertex
 	}
@@ -19,7 +37,7 @@ leaves2
 grass01
 {
 cull none
-	qer_editorimage grass.tga
+	qer_editorimage textures/grass.tga
 	qer_trans 0.2
 	deformVertexes autosprite
 	surfaceparm nolightmap
@@ -27,7 +45,42 @@ cull none
 	surfaceparm trans
 	deformVertexes wave 128 sin 0 1 0 0.2
 	{
-		map grass.tga
+		map textures/grass.tga
+		alphaFunc GT0
+		rgbGen vertex
+	}
+}
+
+grass02
+{
+	distancecull 256 1024 0.4
+	cull none
+	qer_editorimage textures/grass2.tga
+	qer_trans 0.2
+	surfaceparm nolightmap
+	surfaceparm trans
+	q3map_vertexScale 1
+	deformVertexes autosprite
+	deformVertexes wave 128 sin 0 1 0 0.1 
+	{
+		map textures/grass2.tga
+		alphaFunc GT0
+		rgbGen vertex
+	}
+}
+
+leaves4
+{
+cull none
+	qer_editorimage textures/leaves7.tga
+	qer_trans 0.6
+	deformVertexes autosprite
+	surfaceparm nolightmap
+	surfaceparm trans
+	q3map_vertexScale 1
+	deformVertexes wave 128 sin 0 1 0 0.5
+	{
+		map textures/leaves7.tga
 		alphaFunc GT0
 		rgbGen vertex
 	}
@@ -36,19 +89,19 @@ cull none
 grass03
 {
 cull none
-	qer_editorimage grass03.tga
+	qer_editorimage textures/grass03.tga
 	qer_trans 0.8
 	surfaceparm trans
 	surfaceparm nolightmap
 	q3map_vertexScale 1
 	deformVertexes wave 128 sin 0 1 0 0.1 
 	{
-		map grass03.tga
+		map textures/grass03.tga
 		rgbGen vertex
 	}
 }
 
-morphed/skyhigh
+textures/morphed/skyhigh
 {
 	qer_editorimage env/med-troubadour-gray/med-troubadour-gray_up.tga
 	q3map_noTJunc
@@ -62,7 +115,7 @@ morphed/skyhigh
 	skyparms env/med-troubadour-gray/med-troubadour-gray - -
 }
 
-morphed/flagred
+textures/morphed/flagred
 	{
 	surfaceparm nonsolid
 	surfaceparm nomarks
@@ -71,11 +124,11 @@ morphed/flagred
 	tessSize 64
 	deformVertexes wave 194 sin 0 3 0 .4
 	{
-	map morphed/flagred.tga
+	map textures/morphed/flagred.tga
 	rgbGen vertex
 	}
 	}
-morphed/flagblue
+textures/morphed/flagblue
 	{
 	surfaceparm nonsolid
 	surfaceparm nomarks
@@ -84,17 +137,27 @@ morphed/flagblue
 	tessSize 64
 	deformVertexes wave 194 sin 0 3 0 .4
 	{
-	map morphed/flagblue.tga
+	map textures/morphed/flagblue.tga
 	rgbGen vertex
 	}
 	}
+
+e8teamcolor
+	{
+	qer_editorimage textures/morphed/e8support02c_shirt.jpg
+	map textures/morphed/e8support02c.tga
+		{
+		map $lightmap
+		rgbGen identity
+		}
+	}
 	
 thrust
 {
 	{
 		surfaceparam nolightmap
 		surfaceparam pointlight
-		map thrust.tga
+		map textures/thrust.tga
 		tcMod scroll 0 5
 	}
 }