Merge branch 'martin-t/okc' into martin-t/okc2

[xonotic/xonotic-data.pk3dir.git] / scripts / relics.shader

diff --git a/scripts/relics.shader b/scripts/relics.shader
index dd8372f1a36855217c82a79418fd57137df46af2..e070ea2b6c8bd673cb316aa5650370394264cdc1 100644 (file)
--- a/scripts/relics.shader
+++ b/scripts/relics.shader
@@ -1,160 +1,193 @@
 models/relics/relic
 {
        dpreflectcube cubemaps/default/sky
-       {
-               map models/relics/relic.tga
+       {
+               map models/relics/relic
                rgbgen lightingDiffuse
        }
 }
+
 models/relics/relic_ring
 {
-       {
-               map models/relics/relic_ring.tga
-               blendfunc add
+       {
+               map models/relics/relic_ring
+               blendfunc GL_SRC_ALPHA GL_ONE
                rgbgen lightingDiffuse
        }
 }
-models/relics/sign_resistance
+
+models/relics/sign_ammo
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_resistance.tga
+       nopicmip
+       {
+               map models/relics/sign_ammo
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_regeneration
+
+models/relics/sign_bash
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_regeneration.tga
+       nopicmip
+       {
+               map models/relics/sign_bash
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_vampire
+
+models/relics/sign_blessed
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_vampire.tga
+       nopicmip
+       {
+               map models/relics/sign_blessed
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_ammo
+
+models/relics/sign_disability
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_ammo.tga
+       nopicmip
+       {
+               map models/relics/sign_disability
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_damage
+
+models/relics/sign_flight
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_damage.tga
+       nopicmip
+       {
+               map models/relics/sign_flight
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_splashdamage
+
+models/relics/sign_inferno
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_splashdamage.tga
+       nopicmip
+       {
+               map models/relics/sign_inferno
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_firingspeed
+
+models/relics/sign_invisible
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_firingspeed.tga
+       nopicmip
+       {
+               map models/relics/sign_invisible
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_disability
+
+models/relics/sign_jump
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_disability.tga
+       nopicmip
+       {
+               map models/relics/sign_jump
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_teamboost
+
+models/relics/sign_magnet
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_teamboost.tga
+       nopicmip
+       {
+               map models/relics/sign_magnet
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_speed
+
+models/relics/sign_medic
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_speed.tga
+       nopicmip
+       {
+               map models/relics/sign_medic
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_jump
+
+models/relics/sign_resistance
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_jump.tga
+       nopicmip
+       {
+               map models/relics/sign_resistance
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_flight
+
+models/relics/sign_speed
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_flight.tga
+       nopicmip
+       {
+               map models/relics/sign_speed
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_invisible
+
+models/relics/sign_swapper
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_invisible.tga
+       nopicmip
+       {
+               map models/relics/sign_swapper
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_radioactive
+
+models/relics/sign_vampire
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_radioactive.tga
+       nopicmip
+       {
+               map models/relics/sign_vampire
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_resurrection
+
+models/relics/sign_vengeance
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_resurrection.tga
+       nopicmip
+       {
+               map models/relics/sign_vengeance
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }
-models/relics/sign_vengeance
+
+models/relics/sign_luck
 {
+       deformVertexes autosprite
        cull none
-       {
-               map models/relics/sign_vengeance.tga
+       nopicmip
+       {
+               map models/relics/sign_luck
                blendfunc add
-               rgbgen lightingDiffuse
        }
 }