From: MirceaKitsune Date: Wed, 20 Jul 2011 21:27:02 +0000 (+0300) Subject: Strength radar, and a shader the map uses. Also update the maplists X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=71b85c30f75b02637e782406426676b7a05e02ba;p=voretournament%2Fvoretournament.git Strength radar, and a shader the map uses. Also update the maplists --- diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg index 466a0739..d9728fe7 100644 --- a/data/defaultVT.cfg +++ b/data/defaultVT.cfg @@ -417,7 +417,7 @@ set g_casings 1 "enable casings" set g_norecoil 0 "if set to 1 shooting weapons won't make you crosshair to move upwards (recoil)" set g_maplist_mostrecent "" "contains the name of the maps that were most recently played" seta g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again" -seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace" +seta g_maplist "voretemple gasolinepowered reslimed skycastle greatwall_overloaded basementctf brokenworld arahia stormkeep basement farewell greatwall_revisited soylent warfare ruiner desertfactory evilspace strength" seta g_maplist_index 0 "this is used internally for saving position in maplist cycle" seta g_maplist_selectrandom 0 "if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle" seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list" diff --git a/data/gfx/radar/strength_radar.tga b/data/gfx/radar/strength_radar.tga new file mode 100644 index 00000000..89e78762 Binary files /dev/null and b/data/gfx/radar/strength_radar.tga differ diff --git a/data/scripts/shaderlist.txt b/data/scripts/shaderlist.txt index 0eb56682..beee549e 100644 --- a/data/scripts/shaderlist.txt +++ b/data/scripts/shaderlist.txt @@ -53,6 +53,7 @@ terrain_alphafade terrain_dotproduct2projected terrain_dotproduct2 test3 +toxic trak4 trak5 tree diff --git a/data/scripts/toxic.shader b/data/scripts/toxic.shader new file mode 100644 index 00000000..f56996dd --- /dev/null +++ b/data/scripts/toxic.shader @@ -0,0 +1,78 @@ +textures/toxic/toxic_sky +{ + qer_editorimage env/green_dark/green_dark_lf.tga + q3map_lightimage env/green_dark/green_dark_lf.tga + skyParms env/green_dark/green_dark 128 - + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + q3map_surfacelight 200 +// q3map_sunExt red green blue intensity degrees elevation deviance samples + q3map_sunExt 0.55 0.55 0.55 100 215 40 4 4 +} + +textures/toxic/toxic_grate +{ + qer_editorimage textures/kaznexctf2/grate.tga + surfaceparm nomarks + surfaceparm trans + cull none + nopicmip + { + map textures/kaznexctf2/grate.tga + rgbGen identity + depthWrite + //alphaFunc GE128 + blendfunc blend + } + { + map $lightmap + blendfunc filter + rgbGen identity + tcGen lightmap + depthFunc equal + } +} + +textures/toxic/toxic_slime +{ + qer_editorimage textures/liquids/slime2.tga + surfaceparm noimpact + surfaceparm nonsolid + surfaceparm slime + surfaceparm trans + cull disable + deformVertexes wave 150 sin 2 5 0.25 0.1 + tessSize 128 + qer_trans 0.5 + q3map_surfacelight 1200 + { + map textures/liquids/slime2.tga + blendfunc add + rgbGen identity + tcMod turb 0 0.2 0 0.04 + } +} + +textures/toxic/toxic_slime_tube +{ + qer_editorimage textures/liquids/slime2.tga + surfaceparm noimpact + surfaceparm nonsolid + surfaceparm slime + surfaceparm trans + cull disable + //deformVertexes wave 150 sin 2 5 0.25 0.1 + tessSize 128 + qer_trans 0.5 + q3map_surfacelight 1200 + { + map textures/liquids/slime2.tga + blendfunc add + rgbGen identity + tcMod scroll 0 -0.2 + } +}