Merge branch 'bones_was_here/lightsettings' into 'master'

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

diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index 69376e86091a684c6030bd717b500f57bdfac6cf..76edd6dd30246f13657ace02dde5b708617b9ce5 100644 (file)
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -7,7 +7,7 @@ a_cells_simple // cells
        cull none
        nopicmip
 
-       {
+       {
                map models/items/a_cells_simple
                blendfunc blend
        }
@@ -19,7 +19,7 @@ a_rockets_simple // rockets
        cull none
        nopicmip
 
-       {
+       {
                map models/items/a_rockets_simple
                blendfunc blend
        }
@@ -31,10 +31,9 @@ a_bullets_simple // bullets
        cull none
        nopicmip
 
-       {
+       {
                map models/items/a_bullets_simple
                blendfunc blend
-
        }
 }
 
@@ -44,25 +43,35 @@ a_shells_simple // shells
        cull none
        nopicmip
 
-       {
+       {
                map models/items/a_shells_simple
                blendfunc blend
-
        }
 }
 
 ////////// 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
+       nopicmip
 
        {
                map models/weapons/g_crylink_simple
                blendfunc blend
-
        }
 }
 
@@ -72,23 +81,21 @@ g_electro_simple // electro
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_electro_simple
                blendfunc blend
-
        }
 }
 
-g_nex_simple // nex
+g_nex_simple // vortex
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_nex_simple
                blendfunc blend
-
        }
 }
 
@@ -98,10 +105,9 @@ g_hagar_simple // hagar
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_hagar_simple
                blendfunc blend
-
        }
 }
 
@@ -111,23 +117,21 @@ g_gl_simple // mortar
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_gl_simple
                blendfunc blend
-
        }
 }
 
-g_rl_simple // rocket launcher
+g_rl_simple // devastator
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_rl_simple
                blendfunc blend
-
        }
 }
 
@@ -137,23 +141,9 @@ g_shotgun_simple // shotgun
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_shotgun_simple
                blendfunc blend
-
-       }
-}
-
-g_uzi_simple // machine gun
-{
-       deformVertexes autosprite
-       cull none
-       nopicmip
-
-       {
-               map models/weapons/g_uzi_simple
-               blendfunc blend
-
        }
 }
 
@@ -163,10 +153,9 @@ g_uzi_simple // machine gun
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_uzi_simple
                blendfunc blend
-
        }
 }
 
@@ -176,10 +165,9 @@ g_campingrifle_simple // sniper rifle
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_campingrifle_simple
                blendfunc blend
-
        }
 }
 
@@ -189,10 +177,9 @@ g_fireball_simple // fireball
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_fireball_simple
                blendfunc blend
-
        }
 }
 
@@ -202,10 +189,9 @@ g_hlac_simple // HLAC
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_hlac_simple
                blendfunc blend
-
        }
 }
 
@@ -215,23 +201,21 @@ g_hookgun_simple // hook gun
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_hookgun_simple
                blendfunc blend
-
        }
 }
 
-g_laser_simple // laser
+g_laser_simple // blaster
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_laser_simple
                blendfunc blend
-
        }
 }
 
@@ -241,23 +225,21 @@ g_minelayer_simple // minelayer
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_minelayer_simple
                blendfunc blend
-
        }
 }
 
-g_minstanex_simple // minstanex
+g_minstanex_simple // vaporizer
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_minstanex_simple
                blendfunc blend
-
        }
 }
 
@@ -267,10 +249,9 @@ g_porto_simple // portolauncher
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_porto_simple
                blendfunc blend
-
        }
 }
 
@@ -280,10 +261,9 @@ g_seeker_simple // tag seeker
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_seeker_simple
                blendfunc blend
-
        }
 }
 
@@ -293,10 +273,33 @@ g_tuba_simple // tuba
        cull none
        nopicmip
 
-       {
+       {
                map models/weapons/g_tuba_simple
                blendfunc blend
+       }
+}
 
+g_ok_hmg_simple // heavy machinegun
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+
+       {
+               map models/weapons/g_ok_hmg_simple
+               blendfunc blend
+       }
+}
+
+g_ok_rl_simple // rocket propelled chainsaw
+{
+       deformVertexes autosprite
+       cull none
+       nopicmip
+
+       {
+               map models/weapons/g_ok_rl_simple
+               blendfunc blend
        }
 }
 
@@ -310,10 +313,9 @@ item_armor_small_simple // 5a
        cull none
        nopicmip
 
-       {
+       {
                map models/items/item_armor_small_simple
                blendfunc blend
-
        }
 }
 
@@ -323,10 +325,9 @@ item_armor_medium_simple // 25a
        cull none
        nopicmip
 
-       {
+       {
                map models/items/item_armor_medium_simple
                blendfunc blend
-
        }
 }
 
@@ -336,23 +337,21 @@ item_armor_big_simple // 50a
        cull none
        nopicmip
 
-       {
+       {
                map models/items/item_armor_big_simple
                blendfunc blend
-
        }
 }
 
-item_armor_large_simple  // 100a
+item_armor_large_simple // 100a
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
-       {
+       {
                map models/items/item_armor_large_simple
                blendfunc blend
-
        }
 }
 
@@ -364,10 +363,9 @@ g_h1_simple // 5hp
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_h1_simple
                blendfunc blend
-
        }
 }
 
@@ -377,10 +375,9 @@ g_h25_simple // 25hp
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_h25_simple
                blendfunc blend
-
        }
 }
 
@@ -390,10 +387,9 @@ g_h50_simple // 50hp
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_h50_simple
                blendfunc blend
-
        }
 }
 
@@ -403,10 +399,9 @@ g_h100_simple // 100hp
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_h100_simple
                blendfunc blend
-
        }
 }
 
@@ -418,10 +413,9 @@ g_strength_simple // strength
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_strength_simple
                blendfunc blend
-
        }
 }
 
@@ -431,10 +425,9 @@ g_invincible_simple // shield
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_invincible_simple
                blendfunc blend
-
        }
 }
 
@@ -444,10 +437,9 @@ g_jetpack_simple // jetpack
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_jetpack_simple
                blendfunc blend
-
        }
 }
 
@@ -457,10 +449,9 @@ g_fuel_simple // fuel for jetpack
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_fuel_simple
                blendfunc blend
-
        }
 }
 
@@ -470,9 +461,8 @@ g_fuelregen_simple // fuel regen powerup
        cull none
        nopicmip
 
-       {
+       {
                map models/items/g_fuelregen_simple
                blendfunc blend
-
        }
-}
\ No newline at end of file
+}