From: TimePath Date: Thu, 27 Nov 2014 01:03:09 +0000 (+1100) Subject: Regenerate simple items textures X-Git-Tag: xonotic-v0.8.0~138^2 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=bd175788317e5fdaa33e82f97d1678c24627ea04 Regenerate simple items textures Add models for new toys and arc --- diff --git a/models/weapons/g_arc_simple.iqm b/models/weapons/g_arc_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_arc_simple.iqm differ diff --git a/models/weapons/g_arc_simple.iqm_0.skin b/models/weapons/g_arc_simple.iqm_0.skin new file mode 100644 index 0000000000..df43c619ff --- /dev/null +++ b/models/weapons/g_arc_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_arc_simple \ No newline at end of file diff --git a/models/weapons/g_arc_simple.tga b/models/weapons/g_arc_simple.tga new file mode 100644 index 0000000000..2e94008032 Binary files /dev/null and b/models/weapons/g_arc_simple.tga differ diff --git a/models/weapons/g_campingrifle_simple.iqm b/models/weapons/g_campingrifle_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_campingrifle_simple.iqm differ diff --git a/models/weapons/g_campingrifle_simple.iqm_0.skin b/models/weapons/g_campingrifle_simple.iqm_0.skin new file mode 100644 index 0000000000..6b2726f498 --- /dev/null +++ b/models/weapons/g_campingrifle_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_campingrifle_simple \ No newline at end of file diff --git a/models/weapons/g_campingrifle_simple.tga b/models/weapons/g_campingrifle_simple.tga new file mode 100644 index 0000000000..2a9c449695 Binary files /dev/null and b/models/weapons/g_campingrifle_simple.tga differ diff --git a/models/weapons/g_crylink_simple.tga b/models/weapons/g_crylink_simple.tga index f4054b7bec..0bbdbc7bfa 100644 Binary files a/models/weapons/g_crylink_simple.tga and b/models/weapons/g_crylink_simple.tga differ diff --git a/models/weapons/g_electro_simple.tga b/models/weapons/g_electro_simple.tga index b523c722e3..02c67de755 100644 Binary files a/models/weapons/g_electro_simple.tga and b/models/weapons/g_electro_simple.tga differ diff --git a/models/weapons/g_fireball_simple.iqm b/models/weapons/g_fireball_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_fireball_simple.iqm differ diff --git a/models/weapons/g_fireball_simple.iqm_0.skin b/models/weapons/g_fireball_simple.iqm_0.skin new file mode 100644 index 0000000000..cceb6a697f --- /dev/null +++ b/models/weapons/g_fireball_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_fireball_simple \ No newline at end of file diff --git a/models/weapons/g_fireball_simple.tga b/models/weapons/g_fireball_simple.tga new file mode 100644 index 0000000000..2632b76405 Binary files /dev/null and b/models/weapons/g_fireball_simple.tga differ diff --git a/models/weapons/g_gl_simple.tga b/models/weapons/g_gl_simple.tga index e138aa42e7..114c6f25f5 100644 Binary files a/models/weapons/g_gl_simple.tga and b/models/weapons/g_gl_simple.tga differ diff --git a/models/weapons/g_hagar_simple.tga b/models/weapons/g_hagar_simple.tga index 4c82e4beee..fb99dea739 100644 Binary files a/models/weapons/g_hagar_simple.tga and b/models/weapons/g_hagar_simple.tga differ diff --git a/models/weapons/g_hlac_simple.iqm b/models/weapons/g_hlac_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_hlac_simple.iqm differ diff --git a/models/weapons/g_hlac_simple.iqm_0.skin b/models/weapons/g_hlac_simple.iqm_0.skin new file mode 100644 index 0000000000..020dcc12a0 --- /dev/null +++ b/models/weapons/g_hlac_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_hlac_simple \ No newline at end of file diff --git a/models/weapons/g_hlac_simple.tga b/models/weapons/g_hlac_simple.tga new file mode 100644 index 0000000000..6d2302c214 Binary files /dev/null and b/models/weapons/g_hlac_simple.tga differ diff --git a/models/weapons/g_hookgun_simple.iqm b/models/weapons/g_hookgun_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_hookgun_simple.iqm differ diff --git a/models/weapons/g_hookgun_simple.iqm_0.skin b/models/weapons/g_hookgun_simple.iqm_0.skin new file mode 100644 index 0000000000..2c8bd5fffa --- /dev/null +++ b/models/weapons/g_hookgun_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_hookgun_simple \ No newline at end of file diff --git a/models/weapons/g_hookgun_simple.tga b/models/weapons/g_hookgun_simple.tga new file mode 100644 index 0000000000..be44b817fb Binary files /dev/null and b/models/weapons/g_hookgun_simple.tga differ diff --git a/models/weapons/g_laser_simple.iqm b/models/weapons/g_laser_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_laser_simple.iqm differ diff --git a/models/weapons/g_laser_simple.iqm_0.skin b/models/weapons/g_laser_simple.iqm_0.skin new file mode 100644 index 0000000000..02e24bc1ec --- /dev/null +++ b/models/weapons/g_laser_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_laser_simple \ No newline at end of file diff --git a/models/weapons/g_laser_simple.tga b/models/weapons/g_laser_simple.tga new file mode 100644 index 0000000000..66223a342f Binary files /dev/null and b/models/weapons/g_laser_simple.tga differ diff --git a/models/weapons/g_minelayer_simple.iqm b/models/weapons/g_minelayer_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_minelayer_simple.iqm differ diff --git a/models/weapons/g_minelayer_simple.iqm_0.skin b/models/weapons/g_minelayer_simple.iqm_0.skin new file mode 100644 index 0000000000..f9d4b61a7f --- /dev/null +++ b/models/weapons/g_minelayer_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_minelayer_simple \ No newline at end of file diff --git a/models/weapons/g_minelayer_simple.tga b/models/weapons/g_minelayer_simple.tga new file mode 100644 index 0000000000..dfba264e49 Binary files /dev/null and b/models/weapons/g_minelayer_simple.tga differ diff --git a/models/weapons/g_minstanex_simple.iqm b/models/weapons/g_minstanex_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_minstanex_simple.iqm differ diff --git a/models/weapons/g_minstanex_simple.iqm_0.skin b/models/weapons/g_minstanex_simple.iqm_0.skin new file mode 100644 index 0000000000..3a255b4aa1 --- /dev/null +++ b/models/weapons/g_minstanex_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_minstanex_simple \ No newline at end of file diff --git a/models/weapons/g_minstanex_simple.tga b/models/weapons/g_minstanex_simple.tga new file mode 100644 index 0000000000..68bf311574 Binary files /dev/null and b/models/weapons/g_minstanex_simple.tga differ diff --git a/models/weapons/g_nex_simple.tga b/models/weapons/g_nex_simple.tga index 27c984f8a1..a254e962d8 100644 Binary files a/models/weapons/g_nex_simple.tga and b/models/weapons/g_nex_simple.tga differ diff --git a/models/weapons/g_porto_simple.iqm b/models/weapons/g_porto_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_porto_simple.iqm differ diff --git a/models/weapons/g_porto_simple.iqm_0.skin b/models/weapons/g_porto_simple.iqm_0.skin new file mode 100644 index 0000000000..944e14a950 --- /dev/null +++ b/models/weapons/g_porto_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_porto_simple \ No newline at end of file diff --git a/models/weapons/g_porto_simple.tga b/models/weapons/g_porto_simple.tga new file mode 100644 index 0000000000..aa6f6cd9bc Binary files /dev/null and b/models/weapons/g_porto_simple.tga differ diff --git a/models/weapons/g_rl_simple.tga b/models/weapons/g_rl_simple.tga index d65fa8788b..2ac19c8f53 100644 Binary files a/models/weapons/g_rl_simple.tga and b/models/weapons/g_rl_simple.tga differ diff --git a/models/weapons/g_seeker_simple.iqm b/models/weapons/g_seeker_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_seeker_simple.iqm differ diff --git a/models/weapons/g_seeker_simple.iqm_0.skin b/models/weapons/g_seeker_simple.iqm_0.skin new file mode 100644 index 0000000000..5123515ae0 --- /dev/null +++ b/models/weapons/g_seeker_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_seeker_simple \ No newline at end of file diff --git a/models/weapons/g_seeker_simple.tga b/models/weapons/g_seeker_simple.tga new file mode 100644 index 0000000000..322ee53fe6 Binary files /dev/null and b/models/weapons/g_seeker_simple.tga differ diff --git a/models/weapons/g_shotgun_simple.tga b/models/weapons/g_shotgun_simple.tga index 37da2f8629..3c120c89ae 100644 Binary files a/models/weapons/g_shotgun_simple.tga and b/models/weapons/g_shotgun_simple.tga differ diff --git a/models/weapons/g_tuba_simple.iqm b/models/weapons/g_tuba_simple.iqm new file mode 100644 index 0000000000..a5cc3e602c Binary files /dev/null and b/models/weapons/g_tuba_simple.iqm differ diff --git a/models/weapons/g_tuba_simple.iqm_0.skin b/models/weapons/g_tuba_simple.iqm_0.skin new file mode 100644 index 0000000000..3fd8bd8dea --- /dev/null +++ b/models/weapons/g_tuba_simple.iqm_0.skin @@ -0,0 +1 @@ +Plane,g_tuba_simple \ No newline at end of file diff --git a/models/weapons/g_tuba_simple.tga b/models/weapons/g_tuba_simple.tga new file mode 100644 index 0000000000..8af65e06ff Binary files /dev/null and b/models/weapons/g_tuba_simple.tga differ diff --git a/models/weapons/g_uzi_simple.tga b/models/weapons/g_uzi_simple.tga index d9b5df404a..55d68cd930 100644 Binary files a/models/weapons/g_uzi_simple.tga and b/models/weapons/g_uzi_simple.tga differ diff --git a/models/weapons/make-sprites.sh b/models/weapons/make-sprites.sh new file mode 100755 index 0000000000..50f3fc6728 --- /dev/null +++ b/models/weapons/make-sprites.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +baseline=20 + +sprite() +{ + name=$1 + text=$(echo $2) # Handle newlines + color=$3 + + echo $name + + # Text + exec {FD}< <(convert \ + -size 185x120 \ + -background transparent \ + -fill "#$color" \ + -font BigNoodleTitling \ + -interline-spacing -15 \ + -gravity south \ + label:"$text" \ + -trim \ + png:-) + itext=$FD + + # Rectangles + + # Thick + xa1=34 + xa2=$((xa1+185-1)) + ya1=174 + ya2=$((ya1+37-1)) + + # Thin + xb1=34 + xb2=$((xb1+185-1)) + yb1=224 + yb2=$((yb1+15-1)) + + exec {FD}< <(convert \ + -size 256x256 \ + -background transparent \ + -fill "#$color" \ + xc:none \ + -draw "rectangle $xa1,$ya1 $xa2,$ya2" \ + -draw "rectangle $xb1,$yb1 $xb2,$yb2" \ + png:-) + irects=$FD + + # Join + + composite \ + -gravity south \ + -geometry -2+$((82+$baseline)) \ + -compress RLE \ + png:fd:$itext png:fd:$irects g_${name}_simple.tga +} + +# grep '* color' ../../qcsrc/common/weapons/w_*.qc | awk '{ print $1 " \t" $4 " " $5 " " $6 }' +# def h(r,g,b): return '#{:02x}{:02x}{:02x}'.format(int(round(r*255)),int(round(g*255)),int(round(b*255))) +sprite arc "Arc" ffffff # White +sprite laser "Blaster" ff8080 # Vivid Tangerine +sprite crylink "Crylink" ff80ff # Blush Pink +sprite rl "Devastator" ffff00 # Yellow +sprite electro "Electro" 0080ff # Azure Radiance +sprite fireball "Fireball" ff8000 # Flush Orange +sprite hagar "Hagar" ffff80 # Dolly +sprite hlac "HLAC" 00ff00 # Green +sprite hookgun "Grappling\nHook" 008000 # Japanese Laurel +sprite uzi "Machine\nGun" ffff00 # Yellow +sprite minelayer "Mine\nLayer" bfff00 # Lime +sprite gl "Mortar" ff0000 # Red +sprite porto "Port-O-Launch" 808080 # Gray +sprite campingrifle "Rifle" 80ff00 # Chartreuse +sprite seeker "T.A.G.\nSeeker" 80ff00 # Chartreuse +#sprite shockwave "Shockwave" 804000 # Cinnamon +sprite shotgun "Shotgun" 804000 # Cinnamon +sprite tuba "Tuba" 00ff00 # Green +sprite minstanex "Vaporizer" 80ffff # Anakiwa +sprite nex "Vortex" 80ffff # Anakiwa diff --git a/scripts/simpleitems.shader b/scripts/simpleitems.shader index 69376e8609..92e9e5affd 100644 --- a/scripts/simpleitems.shader +++ b/scripts/simpleitems.shader @@ -53,6 +53,19 @@ a_shells_simple // shells ////////// WEAPONS ////////// +g_arc_simple // arc +{ + deformVertexes autosprite + cull none + nopicmip + + { + map models/weapons/g_arc_simple + blendfunc blend + + } +} + g_crylink_simple // crylink { deformVertexes autosprite @@ -79,7 +92,7 @@ g_electro_simple // electro } } -g_nex_simple // nex +g_nex_simple // vortex { deformVertexes autosprite cull none @@ -118,7 +131,7 @@ g_gl_simple // mortar } } -g_rl_simple // rocket launcher +g_rl_simple // devastator { deformVertexes autosprite cull none @@ -157,19 +170,6 @@ g_uzi_simple // machine gun } } -g_uzi_simple // machine gun -{ - deformVertexes autosprite - cull none - nopicmip - - { - map models/weapons/g_uzi_simple - blendfunc blend - - } -} - g_campingrifle_simple // sniper rifle { deformVertexes autosprite @@ -222,7 +222,7 @@ g_hookgun_simple // hook gun } } -g_laser_simple // laser +g_laser_simple // blaster { deformVertexes autosprite cull none @@ -248,7 +248,7 @@ g_minelayer_simple // minelayer } } -g_minstanex_simple // minstanex +g_minstanex_simple // vaporizer { deformVertexes autosprite cull none @@ -475,4 +475,4 @@ g_fuelregen_simple // fuel regen powerup blendfunc blend } -} \ No newline at end of file +}