Merge branch 'master' into cbrutail/shaders_fx_xonotic2

[xonotic/xonotic-maps.pk3dir.git] / scripts / xonotic-fx.shader

diff --git a/scripts/xonotic-fx.shader b/scripts/xonotic-fx.shader
index 320207f073871bb5b1b36d14e216317731b6a84f..7308d98a68f1b7805b5a9448dfe4a91de248a383 100644 (file)
--- a/scripts/xonotic-fx.shader
+++ b/scripts/xonotic-fx.shader
@@ -75,10 +75,27 @@ textures/fx/forcefield1-d
                tcMod scroll -.5 -.3
        }
 }
+//Healpod1 green
+//For best effect apply to a rotating cylinder
+textures/fx/healpod1-d
+{
+       qer_editorimage textures/fx/forcefields/healpod1_d.tga
+       surfaceparm nolightmap
+       surfaceparm nomarks
+       surfaceparm nonsolid
+       surfaceparm trans
+       cull none
+       qer_trans 0.6
+       {
+               map textures/fx/forcefields/healpod1_d.tga
+               blendfunc add
+               tcMod scroll 0 2
+       }
+}
 //Jumppad1 blue
 textures/fx/jumppadfx1-a
 {
-       qer_editorimage textures/fx/jumppad/jumppadfx1_a
+       qer_editorimage textures/fx/jumppad/jumppadfx1_a.tga
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
@@ -86,7 +103,7 @@ textures/fx/jumppadfx1-a
        cull none
        qer_trans 0.6
        {
-               map textures/fx/juppad/jumppadfx1_a
+               map textures/fx/jumppad/jumppadfx1_a.tga
                blendfunc add
                tcMod scroll 0 2
        }
@@ -94,7 +111,7 @@ textures/fx/jumppadfx1-a
 //Jumppad1 red
 textures/fx/jumppadfx1-b
 {
-       qer_editorimage textures/fx/jumppad/jumppadfx1_b
+       qer_editorimage textures/fx/jumppad/jumppadfx1_b.tga
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
@@ -102,7 +119,7 @@ textures/fx/jumppadfx1-b
        cull none
        qer_trans 0.6
        {
-               map textures/fx/juppad/jumppadfx1_b
+               map textures/fx/jumppad/jumppadfx1_b.tga
                blendfunc add
                tcMod scroll 0 2
        }
@@ -110,7 +127,7 @@ textures/fx/jumppadfx1-b
 //Jumppad1 yellow
 textures/fx/jumppadfx1-c
 {
-       qer_editorimage textures/fx/jumppad/jumppadfx1_c
+       qer_editorimage textures/fx/jumppad/jumppadfx1_c.tga
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
@@ -118,7 +135,7 @@ textures/fx/jumppadfx1-c
        cull none
        qer_trans 0.6
        {
-               map textures/fx/juppad/jumppadfx1_c
+               map textures/fx/jumppad/jumppadfx1_c.tga
                blendfunc add
                tcMod scroll 0 2
        }
@@ -126,7 +143,7 @@ textures/fx/jumppadfx1-c
 //Jumppad1 green
 textures/fx/jumppadfx1-d
 {
-       qer_editorimage textures/fx/jumppad/jumppadfx1_d
+       qer_editorimage textures/fx/jumppad/jumppadfx1_d.tga
        surfaceparm nolightmap
        surfaceparm nomarks
        surfaceparm nonsolid
@@ -134,8 +151,72 @@ textures/fx/jumppadfx1-d
        cull none
        qer_trans 0.6
        {
-               map textures/fx/juppad/jumppadfx1_d
+               map textures/fx/jumppad/jumppadfx1_d.tga
                blendfunc add
                tcMod scroll 0 2
        }
+}
+//Lightning1-a
+textures/fx/lightning1-a
+{
+       qer_editorimage textures/fx/lightnings/lightning1_1.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga
+               blendfunc add
+       }
+}
+//Lightning1-b
+textures/fx/lightning1-b
+{
+       qer_editorimage textures/fx/lightnings/lightning1_4.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga
+               blendfunc add
+       }
+}
+//Lightning1-c
+textures/fx/lightning1-c
+{
+       qer_editorimage textures/fx/lightnings/lightning1_6.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga
+               blendfunc add
+       }
+}
+//Lightning1-d
+textures/fx/lightning1-d
+{
+       qer_editorimage textures/fx/lightnings/lightning1_8.tga
+       surfaceparm nolightmap
+       surfaceparm nodlight
+       surfaceparm trans
+       surfaceparm nomarks
+       surfaceparm noimpact
+       cull none
+       deformVertexes autosprite2
+       {
+               animMap 15 textures/fx/lightnings/lightning1_8.tga textures/fx/lightnings/lightning1_9.tga textures/fx/lightnings/lightning1_10.tga textures/fx/lightnings/lightning1_11.tga textures/fx/lightnings/lightning1_1.tga textures/fx/lightnings/lightning1_2.tga textures/fx/lightnings/lightning1_3.tga textures/fx/lightnings/lightning1_4.tga textures/fx/lightnings/lightning1_5.tga textures/fx/lightnings/lightning1_6.tga textures/fx/lightnings/lightning1_7.tga
+               blendfunc add
+       }
 }
\ No newline at end of file