Merge remote-tracking branch 'origin/maejong'

3 files changed, 58 insertions, 0 deletions

diff --git a/scripts/analmango.shader b/scripts/analmango.shader
index 1841a53..56b50dd 100644
--- a/scripts/analmango.shader
+++ b/scripts/analmango.shader
@@ -422,3 +422,41 @@ models/mapobjects/analmango/railing_lamp
 		map models/mapobjects/analmango/railing_lamp_glow.jpg
 	}
 }
+
+models/mapobjects/analmango/plant_palmtree
+{
+	surfaceparm alphashadow
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	cull disable
+	{
+		map models/mapobjects/analmango/plant_palmtree.tga
+		alphafunc GE128
+		rgbGen vertex
+	}
+}
+
+models/mapobjects/analmango/plant_bush
+{
+	surfaceparm alphashadow
+	surfaceparm nonsolid
+	surfaceparm nomarks
+	cull disable
+	{
+		map models/mapobjects/analmango/plant_bush.tga
+		alphafunc GE128
+		rgbGen vertex
+	}
+}
+
+textures/analmango/crystal
+{
+	surfaceparm nolightmap
+	surfaceparm solid
+	cull twosided
+	{
+		map textures/analmango/crystal.tga
+		tcGen environment
+		blendfunc blend
+    }
+}
diff --git a/scripts/analmango_pre.shader b/scripts/analmango_pre.shader
new file mode 100644
index 0000000..4910d2b
--- /dev/null
+++ b/scripts/analmango_pre.shader
@@ -0,0 +1,8 @@
+textures/analmango/transparent_red
+{
+	surfaceparm lightfilter
+	{
+		map textures/analmango/transparent_red.tga
+		blendfunc filter
+    }
+}
\ No newline at end of file
diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index 535cf2b..4cdddaa 100644
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -1 +1,13 @@
+common
+common-trem
+atcs
+uncreation
+nexus6
+arachnid2
+niveus
+karith
+transit
+tremor
+titan
 analmango
+analmango_pre
\ No newline at end of file