Merge branch 'master' into Mario/multiplayer_snake

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

diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index abaab423eca0e0a447afb2645df4e445e646e6ea..92e9e5affd847cbdc578d8d41239ff7d3ba9c4d0 100644 (file)
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -1,13 +1,15 @@
 ////////// AMMO //////////
 
+
 a_cells_simple // cells
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/a_cells_simple
                blendfunc blend
-               nopicmip
        }
 }
 
@@ -15,10 +17,11 @@ a_rockets_simple // rockets
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/a_rockets_simple
                blendfunc blend
-               nopicmip
        }
 }
 
@@ -26,10 +29,12 @@ a_bullets_simple // bullets
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/a_bullets_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -37,23 +42,40 @@ a_shells_simple // shells
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/a_shells_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
 ////////// WEAPONS //////////
 
+g_arc_simple // arc
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+
+       {
+               map models/weapons/g_arc_simple
+               blendfunc blend
+
+       }
+}
+
 g_crylink_simple // crylink
 {
        deformVertexes autosprite
        cull none
-       {
+       nopicmip
+
+       {
                map models/weapons/g_crylink_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -61,21 +83,25 @@ g_electro_simple // electro
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_electro_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
-g_nex_simple // nex
+g_nex_simple // vortex
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_nex_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -83,10 +109,12 @@ g_hagar_simple // hagar
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_hagar_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -94,21 +122,25 @@ g_gl_simple // mortar
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_gl_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
-g_rl_simple // rocket launcher
+g_rl_simple // devastator
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_rl_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -116,21 +148,12 @@ g_shotgun_simple // shotgun
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_shotgun_simple
                blendfunc blend
-               nopicmip
-       }
-}
 
-g_uzi_simple // machine gun
-{
-       deformVertexes autosprite
-       cull none
-       {
-               map models/weapons/g_uzi_simple
-               blendfunc blend
-               nopicmip
        }
 }
 
@@ -138,10 +161,12 @@ g_uzi_simple // machine gun
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_uzi_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -149,10 +174,12 @@ g_campingrifle_simple // sniper rifle
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_campingrifle_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -160,10 +187,12 @@ g_fireball_simple // fireball
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_fireball_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -171,10 +200,12 @@ g_hlac_simple // HLAC
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_hlac_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -182,21 +213,25 @@ g_hookgun_simple // hook gun
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_hookgun_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
-g_laser_simple // laser
+g_laser_simple // blaster
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_laser_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -204,21 +239,25 @@ g_minelayer_simple // minelayer
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_minelayer_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
-g_minstanex_simple // minstanex
+g_minstanex_simple // vaporizer
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_minstanex_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -226,10 +265,12 @@ g_porto_simple // portolauncher
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_porto_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -237,10 +278,12 @@ g_seeker_simple // tag seeker
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_seeker_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -248,10 +291,12 @@ g_tuba_simple // tuba
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/weapons/g_tuba_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -263,10 +308,12 @@ item_armor_small_simple // 5a
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/item_armor_small_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -274,10 +321,12 @@ item_armor_medium_simple // 25a
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/item_armor_medium_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -285,10 +334,12 @@ item_armor_big_simple // 50a
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/item_armor_big_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -296,10 +347,12 @@ item_armor_large_simple  // 100a
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/item_armor_large_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -309,10 +362,12 @@ g_h1_simple // 5hp
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_h1_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -320,10 +375,12 @@ g_h25_simple // 25hp
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_h25_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -331,10 +388,12 @@ g_h50_simple // 50hp
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_h50_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -342,10 +401,12 @@ g_h100_simple // 100hp
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_h100_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -355,10 +416,12 @@ g_strength_simple // strength
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_strength_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -366,10 +429,12 @@ g_invincible_simple // shield
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_invincible_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -377,10 +442,12 @@ g_jetpack_simple // jetpack
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_jetpack_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -388,10 +455,12 @@ g_fuel_simple // fuel for jetpack
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_fuel_simple
                blendfunc blend
-               nopicmip
+
        }
 }
 
@@ -399,9 +468,11 @@ g_fuelregen_simple // fuel regen powerup
 {
        deformVertexes autosprite
        cull none
+       nopicmip
+
        {
                map models/items/g_fuelregen_simple
                blendfunc blend
-               nopicmip
+
        }
-}
\ No newline at end of file
+}