Change names in the scripts and hud pictures

diff --git a/gfx/hud/default/weaponblaster.tga b/gfx/hud/default/weaponblaster.tga
new file mode 100644 (file)
index 0000000..f384a2c
Binary files /dev/null and b/gfx/hud/default/weaponblaster.tga differ

diff --git a/gfx/hud/default/weapondevastator.tga b/gfx/hud/default/weapondevastator.tga
new file mode 100644 (file)
index 0000000..0fea766
Binary files /dev/null and b/gfx/hud/default/weapondevastator.tga differ

diff --git a/gfx/hud/default/weapongrenadelauncher.tga b/gfx/hud/default/weapongrenadelauncher.tga
deleted file mode 100644 (file)
index 24135f3..0000000
Binary files a/gfx/hud/default/weapongrenadelauncher.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponlaser.tga b/gfx/hud/default/weaponlaser.tga
deleted file mode 100644 (file)
index f384a2c..0000000
Binary files a/gfx/hud/default/weaponlaser.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponmachinegun.tga b/gfx/hud/default/weaponmachinegun.tga
new file mode 100644 (file)
index 0000000..4c03732
Binary files /dev/null and b/gfx/hud/default/weaponmachinegun.tga differ

diff --git a/gfx/hud/default/weaponminstanex.tga b/gfx/hud/default/weaponminstanex.tga
deleted file mode 100644 (file)
index 3bd2ae2..0000000
Binary files a/gfx/hud/default/weaponminstanex.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponmortar.tga b/gfx/hud/default/weaponmortar.tga
new file mode 100644 (file)
index 0000000..24135f3
Binary files /dev/null and b/gfx/hud/default/weaponmortar.tga differ

diff --git a/gfx/hud/default/weaponnex.tga b/gfx/hud/default/weaponnex.tga
deleted file mode 100644 (file)
index e98e318..0000000
Binary files a/gfx/hud/default/weaponnex.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponrocketlauncher.tga b/gfx/hud/default/weaponrocketlauncher.tga
deleted file mode 100644 (file)
index 0fea766..0000000
Binary files a/gfx/hud/default/weaponrocketlauncher.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponuzi.tga b/gfx/hud/default/weaponuzi.tga
deleted file mode 100644 (file)
index 4c03732..0000000
Binary files a/gfx/hud/default/weaponuzi.tga and /dev/null differ

diff --git a/gfx/hud/default/weaponvaporizer.tga b/gfx/hud/default/weaponvaporizer.tga
new file mode 100644 (file)
index 0000000..3bd2ae2
Binary files /dev/null and b/gfx/hud/default/weaponvaporizer.tga differ

diff --git a/gfx/hud/default/weaponvortex.tga b/gfx/hud/default/weaponvortex.tga
new file mode 100644 (file)
index 0000000..e98e318
Binary files /dev/null and b/gfx/hud/default/weaponvortex.tga differ

diff --git a/gfx/hud/luma/weaponblaster.tga b/gfx/hud/luma/weaponblaster.tga
new file mode 100644 (file)
index 0000000..2e77781
Binary files /dev/null and b/gfx/hud/luma/weaponblaster.tga differ

diff --git a/gfx/hud/luma/weapondevastator.tga b/gfx/hud/luma/weapondevastator.tga
new file mode 100644 (file)
index 0000000..174d86e
Binary files /dev/null and b/gfx/hud/luma/weapondevastator.tga differ

diff --git a/gfx/hud/luma/weapongrenadelauncher.tga b/gfx/hud/luma/weapongrenadelauncher.tga
deleted file mode 100644 (file)
index 9cb3228..0000000
Binary files a/gfx/hud/luma/weapongrenadelauncher.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponlaser.tga b/gfx/hud/luma/weaponlaser.tga
deleted file mode 100644 (file)
index 2e77781..0000000
Binary files a/gfx/hud/luma/weaponlaser.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponmachinegun.tga b/gfx/hud/luma/weaponmachinegun.tga
new file mode 100644 (file)
index 0000000..5aee32a
Binary files /dev/null and b/gfx/hud/luma/weaponmachinegun.tga differ

diff --git a/gfx/hud/luma/weaponminstanex.tga b/gfx/hud/luma/weaponminstanex.tga
deleted file mode 100644 (file)
index 81c37e8..0000000
Binary files a/gfx/hud/luma/weaponminstanex.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponmortar.tga b/gfx/hud/luma/weaponmortar.tga
new file mode 100644 (file)
index 0000000..9cb3228
Binary files /dev/null and b/gfx/hud/luma/weaponmortar.tga differ

diff --git a/gfx/hud/luma/weaponnex.tga b/gfx/hud/luma/weaponnex.tga
deleted file mode 100644 (file)
index e2e83ae..0000000
Binary files a/gfx/hud/luma/weaponnex.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponrocketlauncher.tga b/gfx/hud/luma/weaponrocketlauncher.tga
deleted file mode 100644 (file)
index 174d86e..0000000
Binary files a/gfx/hud/luma/weaponrocketlauncher.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponuzi.tga b/gfx/hud/luma/weaponuzi.tga
deleted file mode 100644 (file)
index 5aee32a..0000000
Binary files a/gfx/hud/luma/weaponuzi.tga and /dev/null differ

diff --git a/gfx/hud/luma/weaponvaporizer.tga b/gfx/hud/luma/weaponvaporizer.tga
new file mode 100644 (file)
index 0000000..81c37e8
Binary files /dev/null and b/gfx/hud/luma/weaponvaporizer.tga differ

diff --git a/gfx/hud/luma/weaponvortex.tga b/gfx/hud/luma/weaponvortex.tga
new file mode 100644 (file)
index 0000000..e2e83ae
Binary files /dev/null and b/gfx/hud/luma/weaponvortex.tga differ

diff --git a/gfx/hud/luminos/weaponblaster.tga b/gfx/hud/luminos/weaponblaster.tga
new file mode 100644 (file)
index 0000000..f384a2c
Binary files /dev/null and b/gfx/hud/luminos/weaponblaster.tga differ

diff --git a/gfx/hud/luminos/weapondevastator.tga b/gfx/hud/luminos/weapondevastator.tga
new file mode 100644 (file)
index 0000000..0fea766
Binary files /dev/null and b/gfx/hud/luminos/weapondevastator.tga differ

diff --git a/gfx/hud/luminos/weapongrenadelauncher.tga b/gfx/hud/luminos/weapongrenadelauncher.tga
deleted file mode 100644 (file)
index 24135f3..0000000
Binary files a/gfx/hud/luminos/weapongrenadelauncher.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponlaser.tga b/gfx/hud/luminos/weaponlaser.tga
deleted file mode 100644 (file)
index f384a2c..0000000
Binary files a/gfx/hud/luminos/weaponlaser.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponmachinegun.tga b/gfx/hud/luminos/weaponmachinegun.tga
new file mode 100644 (file)
index 0000000..4c03732
Binary files /dev/null and b/gfx/hud/luminos/weaponmachinegun.tga differ

diff --git a/gfx/hud/luminos/weaponminstanex.tga b/gfx/hud/luminos/weaponminstanex.tga
deleted file mode 100644 (file)
index 3bd2ae2..0000000
Binary files a/gfx/hud/luminos/weaponminstanex.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponmortar.tga b/gfx/hud/luminos/weaponmortar.tga
new file mode 100644 (file)
index 0000000..24135f3
Binary files /dev/null and b/gfx/hud/luminos/weaponmortar.tga differ

diff --git a/gfx/hud/luminos/weaponnex.tga b/gfx/hud/luminos/weaponnex.tga
deleted file mode 100644 (file)
index e98e318..0000000
Binary files a/gfx/hud/luminos/weaponnex.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponrocketlauncher.tga b/gfx/hud/luminos/weaponrocketlauncher.tga
deleted file mode 100644 (file)
index 0fea766..0000000
Binary files a/gfx/hud/luminos/weaponrocketlauncher.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponuzi.tga b/gfx/hud/luminos/weaponuzi.tga
deleted file mode 100644 (file)
index 4c03732..0000000
Binary files a/gfx/hud/luminos/weaponuzi.tga and /dev/null differ

diff --git a/gfx/hud/luminos/weaponvaporizer.tga b/gfx/hud/luminos/weaponvaporizer.tga
new file mode 100644 (file)
index 0000000..3bd2ae2
Binary files /dev/null and b/gfx/hud/luminos/weaponvaporizer.tga differ

diff --git a/gfx/hud/luminos/weaponvortex.tga b/gfx/hud/luminos/weaponvortex.tga
new file mode 100644 (file)
index 0000000..e98e318
Binary files /dev/null and b/gfx/hud/luminos/weaponvortex.tga differ

diff --git a/scripts/luma.shader b/scripts/luma.shader
index b6ee3cd8ae597e31e38b5141b03724a036edb188..880fa146096fcad16a1fdc16c21a9a72bafb23aa 100644 (file)
--- a/scripts/luma.shader
+++ b/scripts/luma.shader
@@ -215,13 +215,13 @@ g_arc_luma
        }
 }
 
-g_campingrifle_luma
+g_rifle_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_campingrifle_luma
+               map models/weapons/g_rifle_luma
                blendfunc blend
        }
 }
@@ -259,13 +259,13 @@ g_fireball_luma
        }
 }
 
-g_gl_luma
+g_mortar_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_gl_luma
+               map models/weapons/g_mortar_luma
                blendfunc blend
        }
 }
@@ -292,24 +292,24 @@ g_hlac_luma
        }
 }
 
-g_hookgun_luma
+g_hook_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_hookgun_luma
+               map models/weapons/g_hook_luma
                blendfunc blend
        }
 }
 
-g_laser_luma
+g_blaster_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_laser_luma
+               map models/weapons/g_blaster_luma
                blendfunc blend
        }
 }
@@ -325,24 +325,24 @@ g_minelayer_luma
        }
 }
 
-g_minstanex_luma
+g_vaporizer_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_minstanex_luma
+               map models/weapons/g_vaporizer_luma
                blendfunc blend
        }
 }
 
-g_nex_luma
+g_vortex_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_nex_luma
+               map models/weapons/g_vortex_luma
                blendfunc blend
        }
 }
@@ -358,13 +358,13 @@ g_porto_luma
        }
 }
 
-g_rl_luma
+g_devastator_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_rl_luma
+               map models/weapons/g_devastator_luma
                blendfunc blend
        }
 }
@@ -413,13 +413,13 @@ g_tuba_luma
        }
 }
 
-g_uzi_luma
+g_machinegun_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_uzi_luma
+               map models/weapons/g_machinegun_luma
                blendfunc blend
        }
 }
@@ -435,13 +435,13 @@ g_ok_hmg_luma
        }
 }
 
-g_ok_rl_luma
+g_ok_rpc_luma
 {
        deformVertexes autosprite
        cull none
        nopicmip
        {
-               map models/weapons/g_ok_rl_luma
+               map models/weapons/g_ok_rpc_luma
                blendfunc blend
        }
 }

diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader
index 76edd6dd30246f13657ace02dde5b708617b9ce5..4ec64fe4312c28ca4865895f839017a4dc428d9d 100644 (file)
--- a/scripts/simpleitems.shader
+++ b/scripts/simpleitems.shader
@@ -87,14 +87,14 @@ g_electro_simple // electro
        }
 }
 
-g_nex_simple // vortex
+g_vortex_simple // vortex
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_nex_simple
+               map models/weapons/g_vortex_simple
                blendfunc blend
        }
 }
@@ -111,26 +111,26 @@ g_hagar_simple // hagar
        }
 }
 
-g_gl_simple // mortar
+g_mortar_simple // mortar
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_gl_simple
+               map models/weapons/g_mortar_simple
                blendfunc blend
        }
 }
 
-g_rl_simple // devastator
+g_devastator_simple // devastator
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_rl_simple
+               map models/weapons/g_devastator_simple
                blendfunc blend
        }
 }
@@ -147,26 +147,26 @@ g_shotgun_simple // shotgun
        }
 }
 
-g_uzi_simple // machine gun
+g_machinegun_simple // machine gun
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_uzi_simple
+               map models/weapons/g_machinegun_simple
                blendfunc blend
        }
 }
 
-g_campingrifle_simple // sniper rifle
+g_rifle_simple // sniper rifle
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_campingrifle_simple
+               map models/weapons/g_rifle_simple
                blendfunc blend
        }
 }
@@ -195,26 +195,26 @@ g_hlac_simple // HLAC
        }
 }
 
-g_hookgun_simple // hook gun
+g_hook_simple // grappling hook
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_hookgun_simple
+               map models/weapons/g_hook_simple
                blendfunc blend
        }
 }
 
-g_laser_simple // blaster
+g_blaster_simple // blaster
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_laser_simple
+               map models/weapons/g_blaster_simple
                blendfunc blend
        }
 }
@@ -231,14 +231,14 @@ g_minelayer_simple // minelayer
        }
 }
 
-g_minstanex_simple // vaporizer
+g_vaporizer_simple // vaporizer
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_minstanex_simple
+               map models/weapons/g_vaporizer_simple
                blendfunc blend
        }
 }
@@ -291,14 +291,14 @@ g_ok_hmg_simple // heavy machinegun
        }
 }
 
-g_ok_rl_simple // rocket propelled chainsaw
+g_ok_rpc_simple // rocket propelled chainsaw
 {
        deformVertexes autosprite
        cull none
        nopicmip
 
        {
-               map models/weapons/g_ok_rl_simple
+               map models/weapons/g_ok_rpc_simple
                blendfunc blend
        }
 }