From 7527d4ccf38f310b9cf2a6d137cf798e552e98a9 Mon Sep 17 00:00:00 2001
From: savagex <savagex@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 27 May 2007 11:33:07 +0000
Subject: [PATCH] add warping _warp versions of Morphed's slime

git-svn-id: svn://svn.icculus.org/nexuiz/branches/nexuiz-2.0@2702 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/scripts/morphed.shader | 75 ++++++++++++++++++++++++++++++++++---
 1 file changed, 70 insertions(+), 5 deletions(-)

diff --git a/data/scripts/morphed.shader b/data/scripts/morphed.shader
index 6a2195baa..5c55d86ae 100644
--- a/data/scripts/morphed.shader
+++ b/data/scripts/morphed.shader
@@ -7,7 +7,6 @@ textures/morphed/slimem
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 250
-	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -16,7 +15,26 @@ textures/morphed/slimem
 		rgbGen identity
 	}
 }
-
+
+textures/morphed/slimem_warp
+{
+	qer_editorimage textures/morphed/slimem.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 250
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/slimem.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
 textures/morphed/gelslime
 {
 	qer_editorimage textures/morphed/gelslime.tga
@@ -27,7 +45,6 @@ textures/morphed/gelslime
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 280
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
@@ -43,8 +60,37 @@ textures/morphed/gelslime
 		tcGen lightmap
 		depthFunc equal
 	}
-}
+}
 
+textures/morphed/gelslime_warp
+{
+	qer_editorimage textures/morphed/gelslime.tga
+	q3map_lightimage textures/morphed/gelslime_glow.tga
+	qer_trans 0.75
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 280
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime.tga
+		rgbGen identity
+		depthWrite
+		blendfunc blend
+	}
+	{
+		map $lightmap
+		blendfunc blend
+		rgbGen identity
+		tcGen lightmap
+		depthFunc equal
+	}
+}
+
+
 textures/morphed/gelslime_bright
 {
 	qer_editorimage textures/morphed/gelslime_bright.tga
@@ -54,7 +100,26 @@ textures/morphed/gelslime_bright
 	surfaceparm nonsolid
 	surfaceparm slime
 	q3map_surfacelight 300
-	//deformVertexes wave 150.0 sin 2 5 0.25 0.1
+	Q3map_TessSize 128
+	cull none
+	{
+		map textures/morphed/gelslime_bright.tga
+		blendFunc add
+		rgbGen identity
+	}
+}
+
+
+textures/morphed/gelslime_bright_warp
+{
+	qer_editorimage textures/morphed/gelslime_bright.tga
+	qer_trans 0.5
+	surfaceparm noimpact
+	surfaceparm trans
+	surfaceparm nonsolid
+	surfaceparm slime
+	q3map_surfacelight 300
+	deformVertexes wave 150.0 sin 2 5 0.25 0.1
 	Q3map_TessSize 128
 	cull none
 	{
-- 
2.39.2