Updated p8/p1... depression induced slacking too strong

2 files changed, 14 insertions, 319 deletions

diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index dfccf5e..e12d21f 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -104,7 +104,7 @@ textures/analmango/dretchpwner
 
 textures/analmango/e6bsegrtflr256_slick
 {
-	qer_editorimage textures/analmango_pre/e6bsegrtflr256_slick.jpg
+	qer_editorimage textures/analmango/e6bsegrtflr256_slick.jpg
 	surfaceparm alphashadow
 	surfaceparm trans
 	surfaceparm nomarks
@@ -370,59 +370,6 @@ textures/analmango/dretchpwner_wait
 	}
 }
 
-textures/analmango/wtf_5_cd
-{
-	surfaceparm trans
-	cull none
-
-	{
-		map textures/analmango/wtf_5_cd.tga
-		alphaFunc GE128
-		depthWrite
-	}
-	{
-		map $lightmap
-		blendFunc filter
-		depthFunc equal
-	}
-}
-
-textures/analmango/wtf_5_cd_nonsolid
-{
-	qer_editorimage textures/analmango/wtf_5_cd.tga
-	surfaceparm trans
-	surfaceparm nonsolid
-	cull none
-
-	{
-		map textures/analmango/wtf_5_cd.tga
-		alphaFunc GE128
-		depthWrite
-	}
-	{
-		map $lightmap
-		blendFunc filter
-		depthFunc equal
-	}
-}
-
-models/mapobjects/analmango/railing_lamp
-{
-	q3map_surfaceLight 2500
-	q3map_lightImage models/mapobjects/analmango/railing_lamp_glow.jpg
-
-	{
-		map models/mapobjects/analmango/railing_lamp.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map models/mapobjects/analmango/railing_lamp_glow.jpg
-	}
-}
-
 models/mapobjects/analmango/plant_palmtree
 {
 	surfaceparm alphashadow
@@ -452,289 +399,37 @@ models/mapobjects/analmango/plant_bush
 textures/analmango/crystal
 {
 	surfaceparm nolightmap
-	surfaceparm solid
 	cull twosided
 	{
 		map textures/analmango/crystal.tga
 		tcGen environment
 		blendfunc blend
-	}
-}
-
-textures/analmango/acid
-{
-	qer_trans .5
-	q3map_globaltexture
-
-	surfaceparm noimpact
-	surfaceparm slime
-	surfaceparm nolightmap
-	surfaceparm trans
-
-	tessSize 32
-	cull disable
-
-	sort 8
-
-	deformVertexes wave 100 sin 0 1 .5 .5
-
-	{
-		map textures/analmango/acid.jpg
-		rgbGen const ( 0.5 0.5 0.5 )
-		blendfunc filter
-		tcMod turb .3 .2 1 .05
-		tcMod scroll .01 .01
-	}
+    }
 }
 
-textures/analmango/reactor_light
-{
-	qer_editorimage textures/common/white.tga
-
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nomarks
-
-	q3map_surfaceLight 200
-
-	{
-		map $whiteimage
-	}
-}
-
-textures/analmango/reactor_light_trim
-{
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nomarks
-	surfaceparm nonsolid
-	surfaceparm trans
-
-	polygonOffset
-
-	{
-		map textures/analmango/reactor_light_trim
-		blendFunc add
-	}
-}
-
-textures/analmango/reactor_beam
-{
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nomarks
-	surfaceparm nonsolid
-	surfaceparm trans
-	cull none
-
-	{
-		map textures/analmango/reactor_beam.jpg
-		blendFunc add
-		tcMod scroll 0 6.275479
-	}
-	{
-		map textures/analmango/reactor_beam.jpg
-		blendFunc add
-		tcMod scroll 0 2.275479
-	}
-}
-
-textures/analmango/reactor_beam_start
-{
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nomarks
-	surfaceparm nonsolid
-	surfaceparm trans
-	cull none
-
-	{
-		map textures/analmango/reactor_beam_start.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/reactor_blob
+textures/analmango/enferderubis
 {
-	surfaceparm noimpact
 	surfaceparm nolightmap
-	surfaceparm nomarks
-	surfaceparm nonsolid
-	surfaceparm trans
-
-	polygonOffset
-
-	{
-		map textures/analmango/reactor_blob.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel01a_d
-{
-	q3map_lightImage textures/analmango/pk01_panel01a_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel01a_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel01a_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel01b_d
-{
-	q3map_lightImage textures/analmango/pk01_panel01b_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel01b_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel01b_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel02_d
-{
-	q3map_lightImage textures/analmango/pk01_panel02a_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel02_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel02a_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel03a_d
-{
-	q3map_lightImage textures/analmango/pk01_panel03a_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel03a_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel03a_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel03b_d
-{
-	q3map_lightImage textures/analmango/pk01_panel03b_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel03b_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel03b_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel_small01_d
-{
-	q3map_lightImage textures/analmango/pk01_panel_small01_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel_small01_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
-	{
-		map textures/analmango/pk01_panel_small01_add.jpg
-		blendFunc add
-	}
-}
-
-textures/analmango/pk01_panel_small01red_d
-{
-	q3map_lightImage textures/analmango/pk01_panel_small01red_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel_small01red_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
+	deformVertexes wave 6 sin 2.3 1.7 0.3 0.3
 	{
-		map textures/analmango/pk01_panel_small01red_add.jpg
-		blendFunc add
+		map textures/analmango/enferderubis.jpg
+		rgbGen vertex
 	}
 }
 
-textures/analmango/pk01_panel_small02_d
+textures/analmango/SOSANTILIFE
 {
-	q3map_lightImage textures/analmango/pk01_panel_small02_add.jpg
-	q3map_surfaceLight 200
-
-	{
-		map textures/analmango/pk01_panel_small02_d.jpg
-	}
-	{
-		map $lightmap
-		blendFunc filter
-	}
+	q3map_surfacelight 750
 	{
-		map textures/analmango/pk01_panel_small02_add.jpg
-		blendFunc add
+		map textures/analmango/SOSANTILIFE.jpg
 	}
 }
 
-textures/analmango/reactor_blueprints
+textures/analmango/theparty
 {
-	qer_trans .5
-	surfaceparm noimpact
-	surfaceparm nolightmap
-	surfaceparm nomarks
 	surfaceparm nonsolid
-	surfaceparm trans
-	polygonOffset
-
+	q3map_surfacelight 1
 	{
-		map textures/analmango/reactor_blueprints.jpg
-		blendFunc add
+		map textures/analmango/theparty.jpg
 	}
 }
-
-textures/analmango/enferderubis
-{
-	surfaceparm solid
-	deformVertexes wave 6 sin 2.3 1.7 0.3 0.3
-	{
-		map textures/analmango/enferderubis.jpg
-	}
-}
\ No newline at end of file
diff --git a/scripts/analmango_pre.shader b/scripts/analmango_pre.shader
index 726bfec..6e48e8e 100644
--- a/scripts/analmango_pre.shader
+++ b/scripts/analmango_pre.shader
@@ -2,7 +2,7 @@ textures/analmango_pre/transparent_red
 {
 	surfaceparm lightfilter
 	{
-		map textures/analmango_pre/transparent_red.jpg
+		map textures/analmango_pre/transparent_red.tga
 		blendfunc filter
     }
-}
+}
\ No newline at end of file