Few more changes, please do not compile...

author: xolatile 2025-08-05 10:40:01 +0200
committer: xolatile 2025-08-05 10:40:01 +0200
commit: a2a16b85572b1d28b0cd4901ea7348750732a740 (patch)
tree: 6287cdf8331e821f9fe1e0adadc664a59634a812 /data
parent: 6762e292d02e37a69a807e01493d4e14319cca33 (diff)
download: xolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.xz
xolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.zst
7 files changed, 73 insertions, 2447 deletions
diff --git a/data/default_map.cfg b/data/default_map.cfg
index 840e59a..96ca77c 100644
--- a/data/default_map.cfg
+++ b/data/default_map.cfg
@@ -1,21 +1,5 @@
 // Default settings for maps, executed each time the map is loaded.
 
-if (strcmp $skybox "") [
-    skybox "skyboxes/black"
-]
-
-materialreset
-
-texture water "materials/water.png"          0 0 0 0.5
-texture 1     "materials/waterfall.png"      0 0 0 0.5
-texture 1     "materials/water_n.png"        0 0 0 0.5
-texture 1     "materials/water_dudv.png"     0 0 0 0.5
-texture 1     "materials/waterfall_n.png"    0 0 0 0.5
-texture 1     "materials/waterfall_dudv.png" 0 0 0 0.5
-
-texture lava "materials/lava.png" 0 0 0 0.5
-texture 1    "materials/lava.png" 0 0 0 0.5
-
 texturereset
 
     setshader "stdworld"
diff --git a/data/defaults.cfg b/data/defaults.cfg
index def87ff..35bdf19 100644
--- a/data/defaults.cfg
+++ b/data/defaults.cfg
@@ -1,7 +1,7 @@
 // these default settings get executed whenever "config.cfg" is not available
 // do not modify anything below, instead change settings in game, or add to autoexec.cfg
 
-name "unnamed"
+name "Anonymous"
 
 invmouse 0         // 1 for flightsim mode
 sensitivity 3      // similar number to quake
@@ -127,7 +127,6 @@ editbind N        [ selentfindall ]
 
 editbind    LSHIFT  [ editcut ]
 editbindmod LCTRL   [ passthrough ]
-editbindmod LALT    [ hmapedit ]
 editbind DELETE     [ editdel ]
 
 editbind T [ saycommand ]
@@ -137,7 +136,6 @@ editbind V [ editpaste ]
 editbind Z [ undo; passthroughsel 0]
 editbind U [ undo; passthroughsel 0]
 editbind I [ redo ]
-editbind H [ if $hmapedit [ editface 1 -1 ] [ hmapedit 1 ] ]
 
 editbind O [ domodifier 15 ] // vSlot: offset H
 editbind P [ domodifier 16 ] // vSlot: offset V
@@ -199,7 +197,6 @@ delta_edit_3 = [ editfacewentpush $arg1 2 ] // push corner pointed at by cursor
 delta_edit_4 = [ if $blendpaintmode [rotateblendbrush $arg1] [editrotate $arg1] ] // rotate 90 degrees
 delta_edit_5 = [ entproperty 0 $arg1 ]  // and the others
 delta_edit_6 = [ edittex $arg1 ] // change textures
-delta_edit_9 = [ selectbrush $arg1 ] // change heightmap brushes
 delta_edit_10 = [ entautoview $arg1 ]
 
 editbind 1 [ domodifier 11 ]
diff --git a/data/game.cfg b/data/game.cfg
index 1720ccc..2276ca6 100644
--- a/data/game.cfg
+++ b/data/game.cfg
@@ -1,31 +1,35 @@
 // fps specific cfg stuff goes here
 
 togglezoom = [ zoom (if (= $zoom 1) -1 1) ]
+
 sayteamcommand = [inputcommand (if (>= $numargs 1) [result $arg1] [result ""]) [sayteam $commandbuf] "[team]"]
 
 mapcomplete = [ complete $arg1 packages/maps ogz ]
+
 mapcomplete map
 
 modenames = "ffa coop teamplay insta instateam effic efficteam"
+
 loop i (listlen $modenames) [
-    mname = (at $modenames $i)
-    alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
-    mapcomplete $mname
+	mname = (at $modenames $i)
+	alias $mname [ if (mode @i) [if (> $numargs 0) [map $arg1] [map]] ]
+	mapcomplete $mname
 ]
 
 demo = [ stopdemo; if (mode -1) [if (> $numargs 0) [map $arg1] [map]] ]
+
 varcomplete demo demodir dmo
 
 playermodelnum = 1
 
-playermodeldir0 = "mrfixit"
-playermodelicon0 = "mrfixit"
-playermodelname0 = "Mr. Fixit"
+playermodeldir0   = "mrfixit"
+playermodelicon0  = "mrfixit"
+playermodelname0  = "Mr. Fixit"
 playermodelstory0 = [Which orc do you choose when the mission calls for an all-purpose wrecking machine? Who do you call when the odds are stacked against you? Mr. Fixit, that's who. Gifted with the ability to perform deconstructive surgery with any weapon, this orc gets the job done fast and with extreme prejudice.]
 
-playermodeldir = [getalias (concatword "playermodeldir" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelicon = [getalias (concatword "playermodelicon" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
-playermodelname = [getalias (concatword "playermodelname" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodeldir   = [getalias (concatword "playermodeldir"   (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelicon  = [getalias (concatword "playermodelicon"  (if (> $numargs 0) [result $arg1] [result $playermodel]))]
+playermodelname  = [getalias (concatword "playermodelname"  (if (> $numargs 0) [result $arg1] [result $playermodel]))]
 playermodelstory = [getalias (concatword "playermodelstory" (if (> $numargs 0) [result $arg1] [result $playermodel]))]
 
 playsong = [ music (concatword "music/1.ogg") playsong ]
diff --git a/data/glsl.cfg b/data/glsl.cfg
index 5726392..d2495eb 100644
--- a/data/glsl.cfg
+++ b/data/glsl.cfg
@@ -11,11 +11,11 @@ lmcoordscale = (divf 1 32767)
 shader 0 "null" [
     attribute vec4 vvertex;
     void main(void)
-    { 
+    {
         gl_Position = vvertex;
     }
 ] [
-    void main(void) 
+    void main(void)
     {
         gl_FragColor = vec4(1.0, 0.0, 1.0, 1.0);
     }
@@ -164,69 +164,6 @@ shader 0 "cubemap" [
 
 //////////////////////////////////////////////////////////////////////
 //
-// fogged variants of default shaders
-//
-//////////////////////////////////////////////////////////////////////
-
-shader 0 "fogged" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec2 vtexcoord0;
-    uniform mat4 camprojmatrix;
-    varying vec2 texcoord0;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        texcoord0 = vtexcoord0;
-        color = vcolor;
-    }
-] [
-    varying vec2 texcoord0;
-    varying vec4 color;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        gl_FragColor = color * texture2D(tex0, texcoord0);
-    }
-]
-
-shader 0 "foggednotexture" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    uniform mat4 camprojmatrix;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-    }
-] [
-    varying vec4 color;
-    void main(void)
-    {
-        gl_FragColor = color;
-    }
-]
-
-shader 0 "fogoverlay" [
-    attribute vec4 vvertex, vcolor;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        color = vcolor;
-    }
-] [
-    varying vec4 color;
-    void main(void)
-    {
-        gl_FragColor = color;
-    }
-]
-
-//////////////////////////////////////////////////////////////////////
-//
 // for filling the z-buffer only (i.e. multi-pass rendering, OQ)
 //
 //////////////////////////////////////////////////////////////////////
@@ -234,7 +171,7 @@ shader 0 "fogoverlay" [
 shader 0 "nocolor" [
     attribute vec4 vvertex;
     uniform mat4 camprojmatrix;
-    void main() { gl_Position = camprojmatrix * vvertex; } 
+    void main() { gl_Position = camprojmatrix * vvertex; }
 ] [
     void main() {}
 ]
@@ -291,7 +228,7 @@ worldshader = [
                 diffuse.rgb *= diffuse.a;
                 //:fog fogcolor * diffuse.a
             ] [
-                vec4 diffuse = vec4(texture2D(diffusemap, texcoord0).rgb, 1.0);   
+                vec4 diffuse = vec4(texture2D(diffusemap, texcoord0).rgb, 1.0);
             ])
             vec4 lm = texture2D(lightmap, texcoord1);
 
@@ -306,36 +243,6 @@ worldshader = [
     ]
 ]
 
-glareworldshader = [
-    variantshader (if (< (strstr $arg1 "env") 0) 4 6) $arg1 4 [
-        //:fog
-        @(if (>= $numargs 4) [result $arg4])
-        attribute vec4 vvertex;
-        attribute vec3 vnormal;
-        attribute vec2 vtexcoord0, vtexcoord1;
-        uniform mat4 camprojmatrix;
-        uniform vec2 texgenscroll;
-        varying vec2 texcoord0, texcoord1;
-        void main(void)
-        {
-            gl_Position = camprojmatrix * vvertex;
-            texcoord0 = vtexcoord0 + texgenscroll;
-            texcoord1 = vtexcoord1 * @lmcoordscale;
-
-            @arg2
-        }
-    ] [
-        @(if (>= $numargs 4) [result $arg4])
-        @(if (>= $numargs 5) [result $arg5])
-        uniform vec4 colorparams;
-        varying vec2 texcoord0, texcoord1;
-        void main(void)
-        {
-            @arg3
-        }
-    ]
-]
-
 worldshader "stdworld" [] []
 worldshader "alphaworld" [] []
 
@@ -357,14 +264,14 @@ glowshader = [
     glareworldshader @arg1 [] [
       vec3 glow = texture2D(glowmap, texcoord0).rgb;
       glow *= glowcolor.rgb;
-      float k = max(glow.r, max(glow.g, glow.b)); 
+      float k = max(glow.r, max(glow.g, glow.b));
       gl_FragColor.rgb = min(k*k*32.0, 1.0) * glow;
-      gl_FragColor.a = 
+      gl_FragColor.a =
           //:variantoverride texture2D(lightmap, texcoord1).a
           colorparams.a
           ;
     ] [] [
-      uniform sampler2D glowmap; 
+      uniform sampler2D glowmap;
       //:variant uniform sampler2D lightmap;
     ]
   ]
@@ -375,9 +282,9 @@ glowshader "glowalphaworld"
 defershader 0 "pulseworld" [
   defuniformparam "pulsespeed" 1 // pulse frequency (Hz)
   worldshader "pulseworld" [
-    pulse = abs(fract(millis * pulsespeed.x)*2.0 - 1.0); 
+    pulse = abs(fract(millis * pulsespeed.x)*2.0 - 1.0);
   ] [
-    vec3 diffuse2 = texture2D(decal, texcoord0).rgb; 
+    vec3 diffuse2 = texture2D(decal, texcoord0).rgb;
     diffuse.rgb = mix(diffuse.rgb, diffuse2, pulse);
   ] [] [uniform float millis; varying float pulse;] [uniform sampler2D decal;]
 ]
@@ -398,14 +305,14 @@ pulseglowshader = [
     ] [
       vec3 glow = texture2D(glowmap, texcoord0).rgb;
       glow *= pulse;
-      float k = max(glow.r, max(glow.g, glow.b)); 
+      float k = max(glow.r, max(glow.g, glow.b));
       gl_FragColor.rgb = min(k*k*32.0, 1.0) * glow;
-      gl_FragColor.a = 
+      gl_FragColor.a =
           //:variantoverride texture2D(lightmap, texcoord1).a
           colorparams.a
           ;
     ] [uniform float millis; varying vec3 pulse;] [
-      uniform sampler2D glowmap; 
+      uniform sampler2D glowmap;
       //:variant uniform sampler2D lightmap;
     ]
   ]
@@ -413,22 +320,6 @@ pulseglowshader = [
 pulseglowshader "pulseglowworld"
 pulseglowshader "pulseglowalphaworld"
 
-shader 0 "fogworld" [
-    //:water
-    attribute vec4 vvertex;
-    uniform mat4 camprojmatrix;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-    }
-] [
-    uniform vec3 fogcolor;
-    void main(void)
-    {
-        gl_FragColor = vec4(fogcolor, 1.0);
-    }
-]
-
 shader 0 "noglareworld" [
     attribute vec4 vvertex;
     uniform mat4 camprojmatrix;
@@ -479,39 +370,6 @@ shader 0 "noglarealphaworld" [
         gl_FragColor.a = colorparams.a;
     }
 ]
- 
-defershader 2 "envworld" [
-  defuniformparam "envscale" 0.2 0.2 0.2 // reflectivity 
-  worldshader "envworld" [
-    normal = vnormal;
-    camvec = camera - vvertex.xyz; 
-  ] [
-    vec3 reflect = textureCube(envmap, 2.0*normal*dot(camvec, normal) - camvec).rgb;
-  ] [
-    diffuse *= lm;
-    gl_FragColor.rgb = mix(diffuse.rgb, reflect, envscale.rgb);
-    gl_FragColor.a = diffuse.a; 
-  ] [uniform vec3 camera; varying vec3 normal, camvec;] [uniform samplerCube envmap;]
-
-  defuniformparam "envscale" 0.2 0.2 0.2 // reflectivity 
-  worldshader "envworldfast" [
-    vec3 camvec = camera - vvertex.xyz;
-    rvec = 2.0*vnormal*dot(camvec, vnormal) - camvec;
-  ] [
-    vec3 reflect = textureCube(envmap, rvec).rgb;
-  ] [
-    diffuse *= lm;
-    gl_FragColor.rgb = mix(diffuse.rgb, reflect, envscale.rgb);
-    gl_FragColor.a = diffuse.a; 
-  ] [uniform vec3 camera; varying vec3 rvec;] [uniform samplerCube envmap;]
-
-  defuniformparam "envscale" 0.2 0.2 0.2 // reflectivity 
-  worldshader "envworldalt" [] []
-
-  altshader envworld envworldalt
-  fastshader envworld envworldfast 2
-  fastshader envworld envworldalt 1
-]
 
 shader 0 "depthfxworld" [
     attribute vec4 vvertex;
@@ -552,18 +410,13 @@ shader 0 depthfxsplitworld [
 ]
 
 // bumptype:
-//    e -> reserve envmap texture slot
 //    o -> orthonormalize
 //    t -> tangent space cam
-//    r -> envmap reflection
-//    R -> modulate envmap reflection with spec map
 //    s -> spec
 //    S -> spec map
 //    p -> parallax
-//    P -> steep parallax (7 steps)
 //    g -> glow
 //    G -> pulse glow
-//    i -> glare intensity
 //    a -> alpha map
 
 btopt = [ >= (strstr $bumptype $arg1) 0 ]
@@ -590,7 +443,7 @@ bumpvariantshader = [
         if (btopt "R") [
             defuniformparam "envscale" 1 1 1 // reflectivity map multiplier
         ] [if (btopt "r") [
-            defuniformparam "envscale" 0.2 0.2 0.2 // reflectivity 
+            defuniformparam "envscale" 0.2 0.2 0.2 // reflectivity
         ]]
     ] [
         if (btopt "s") [stype = (+ $stype 8)]
@@ -606,7 +459,7 @@ bumpvariantshader = [
         varying vec2 texcoord0, texcoord1;
         @(if (|| (btopt "t") (btopt "r")) [result [uniform vec3 camera; varying vec3 camvec;]])
         @(if (btopt "G") [result [uniform float millis; varying float pulse;]])
-        @(if (btopt "r") [result [varying mat3 world;]]) 
+        @(if (btopt "r") [result [varying mat3 world;]])
         void main(void)
         {
             gl_Position = camprojmatrix * vvertex;
@@ -627,8 +480,8 @@ bumpvariantshader = [
                     // calculate tangent -> world transform
                     world = mat3(vtangent.xyz, bitangent, vnormal);
                 ]])
-            ]]) 
-        
+            ]])
+
             @(if (btopt "G") [result [
                 pulse = abs(fract(millis*pulseglowspeed.x)*2.0 - 1.0);
             ]])
@@ -673,7 +526,7 @@ bumpvariantshader = [
                     height = texture2D(normalmap, htc.xy);
                 ]])
                 #define dtc htc.xy
-                #define bump height.xyz    
+                #define bump height.xyz
             ]])
             @(if (|| (btopt "p") (btopt "P")) [] [result [#define dtc texcoord0]])
 
@@ -691,7 +544,7 @@ bumpvariantshader = [
                     if (&& (btopt "a") (btopt "S")) [result [
                         vec4 normal = texture2D(normalmap, dtc);
                         #define alpha normal.a
-                        #define bump normal.rgb 
+                        #define bump normal.rgb
                     ]] [result [
                         vec3 bump = texture2D(normalmap, dtc).rgb;
                     ]]
@@ -702,7 +555,7 @@ bumpvariantshader = [
             @(if (btopt "s") [result [
                 vec3 halfangle = normalize(camdir + lmlv);
                 float spec = pow(clamp(dot(halfangle, bump), 0.0, 1.0), @(? (btopt "i") "128.0" "32.0"));
-                @(if (btopt "i") [result [spec = min(spec*64.0, 1.0);]]) 
+                @(if (btopt "i") [result [spec = min(spec*64.0, 1.0);]])
                 @(if (btopt "S") [result [spec *= diffuse.a;]])
                 @(if (btopt "i") [result [
                     @(? (btopt "S") "diffuse.rgb" "vec3 diffuse") = specscale.xyz*spec;
@@ -724,7 +577,7 @@ bumpvariantshader = [
                     @(? (|| (btopt "g") (btopt "r")) "diffuse.rgb" "gl_FragColor.rgb") = diffuse.rgb * lmc.rgb;
                 ]])
             ]])
-               
+
             @(if (btopt "r") [result [
                 vec3 rvec;
                 @(if (btopt "t") [result [
@@ -746,7 +599,7 @@ bumpvariantshader = [
             @(if (btopt "a") [result [
                 @(? (btopt "g") "diffuse.rgb" "gl_FragColor.rgb") *= alpha;
             ]])
-                
+
             @(if (btopt "g") [result [
                 vec3 glow = texture2D(glowmap, dtc).rgb;
                 @@(if (btopt "G") [result [
@@ -760,7 +613,7 @@ bumpvariantshader = [
                         gl_FragColor.rgb = glow*k + diffuse.rgb;
                     ]] [result [
                         gl_FragColor.rgb = glow*k;
-                        gl_FragColor.a = 
+                        gl_FragColor.a =
                             //:variantoverride texture2D(lmcolor, texcoord1).a
                             colorparams.a
                             ;
@@ -931,8 +784,6 @@ altshader bumpenvspecmapparallaxpulseglowworld bumpenvparallaxpulseglowworldalt
 fastshader bumpenvspecmapparallaxpulseglowworld bumpenvparallaxpulseglowworldalt 2
 fastshader bumpenvspecmapparallaxpulseglowworld bumpenvpulseglowworldalt 1
 
-//bumpshader "steepworld" "Pot"
-
 ////////////////////////////////////////////////
 //
 // model shaders
@@ -956,7 +807,7 @@ qtangentdecode = [
 skelanimdefs = [
     skelanimlength = (min (- $maxvsuniforms (+ $reservevpparams 10)) $maxskelanimdata)
     result [
-        attribute vec4 vboneweight; 
+        attribute vec4 vboneweight;
         attribute vec4 vboneindex;
         //:uniform animdata
         uniform vec4 animdata[@@skelanimlength];
@@ -1040,7 +891,7 @@ shader 0 "shadowmapreceiver" [
     void main(void)
     {
         gl_Position = shadowmatrix * vvertex;
-        shadowmapvals = vec4(0.0, 0.0, shadowmapbias.y - gl_Position.z, 0.0); 
+        shadowmapvals = vec4(0.0, 0.0, shadowmapbias.y - gl_Position.z, 0.0);
     }
 ] [
     varying vec4 shadowmapvals;
@@ -1082,14 +933,12 @@ loop i 4 [
 ]
 
 // mdltype:
-//    e -> envmap
 //    n -> normalmap
 //    s -> spec
 //    m -> masks
 //    b -> dual-quat skeletal animation
 //    a -> alpha-tested
 //    q -> qtangents
-//    i -> glare intensity
 
 mdlopt = [ >= (strstr $modeltype $arg1) 0 ]
 
@@ -1105,7 +954,7 @@ modelvertexshader = [
         ]] [result [
             attribute vec3 vnormal;
         ]])
-        uniform mat4 modelmatrix; 
+        uniform mat4 modelmatrix;
         uniform vec3 modelcamera, lightdir, lightscale;
         uniform vec2 texscroll;
         varying vec2 texcoord0;
@@ -1136,7 +985,7 @@ modelvertexshader = [
             ]] [result [
                 #define mpos vvertex
                 @(if (mdlopt "q") [result [
-                    #define mquat vtangent 
+                    #define mquat vtangent
                     @(qtangentdecode (mdlopt "n"))
                 ]] [result [
                     #define mnormal vnormal
@@ -1149,7 +998,7 @@ modelvertexshader = [
                 color = vcolor;
             ]])
             texcoord0 = vtexcoord0 + texscroll;
-      
+
             @(if (|| (mdlopt "e") (mdlopt "s")) [result [
                 vec3 camdir = normalize(modelcamera - mpos.xyz);
             ]])
@@ -1167,13 +1016,13 @@ modelvertexshader = [
                     vec3 mbitangent = cross(mnormal, mtangent) * (vtangent.w < 0.0 ? -1.0 : 1.0);
                     lightvec = vec3(dot(lightdir, mtangent), dot(lightdir, mbitangent), dot(lightdir, mnormal));
                     @(if (mdlopt "s") [result [
-                        vec3 halfdir = lightdir + camdir; 
+                        vec3 halfdir = lightdir + camdir;
                         halfangle = vec3(dot(halfdir, mtangent), dot(halfdir, mbitangent), dot(halfdir, mnormal));
                     ]])
                 ]]
             ] [result [
                 @(if (mdlopt "s") [result [
-                    nvec = mnormal; 
+                    nvec = mnormal;
                     halfangle = lightdir + camdir;
                 ]] [if (! (mdlopt "i")) [result [
                     float intensity = dot(mnormal, lightdir);
@@ -1182,11 +1031,11 @@ modelvertexshader = [
                 @(if (mdlopt "e") [result [
                     float invfresnel = dot(camdir, mnormal);
                     rvec = modelworld * (2.0*invfresnel*mnormal - camdir);
-                    rmod = envmapscale.x*max(invfresnel, 0.0) + envmapscale.y;    
+                    rmod = envmapscale.x*max(invfresnel, 0.0) + envmapscale.y;
                 ]])
             ]])
         }
-    ] 
+    ]
 ]
 
 modelfragmentshader = [
@@ -1366,7 +1215,7 @@ blurshader = [
                 texcoordp@(+ $i 2) = tcp;
                 texcoordn@(+ $i 2) = tcn;
             ]])
-        } 
+        }
     ] [
         uniform float weights[8];
         uniform float offsets[8];
@@ -1407,133 +1256,8 @@ loop i 7 [
     ]
 ]
 
-////////////////////////////////////////////////
-//
-// full screen shaders: 
-//
-////////////////////////////////////////////////
-
-fsvs = [result [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    uniform vec2 postfxscale;
-    varying vec2 texcoord0;
-    @arg2
-    void main(void)
-    {
-        gl_Position = vvertex;   // woohoo, no mvp :) 
-        texcoord0 = vtexcoord0;
-        @arg1
-    }
-]]
-
-fsps = [result [
-    uniform sampler2D tex0; 
-    varying vec2 texcoord0;
-    @arg2
-    void main(void)
-    {
-        vec4 color = texture2D(tex0, texcoord0);
-        @arg1
-    }
-]]
-
-fsvs4 = [
-    fsvs [
-        texcoord1 = vtexcoord0 + vec2(-1.5, -1.5)*postfxscale;
-        texcoord2 = vtexcoord0 + vec2( 1.5, -1.5)*postfxscale;
-        texcoord3 = vtexcoord0 + vec2(-1.5,  1.5)*postfxscale;
-        texcoord4 = vtexcoord0 + vec2( 1.5,  1.5)*postfxscale;
-        @arg1
-    ] [
-        varying vec2 texcoord1, texcoord2, texcoord3, texcoord4;
-    ]
-]
-
-fsps4 = [
-    fsps [
-        vec4 s00 = texture2D(tex0, texcoord1);
-        vec4 s02 = texture2D(tex0, texcoord2);
-        vec4 s20 = texture2D(tex0, texcoord3);
-        vec4 s22 = texture2D(tex0, texcoord4);
-        @arg1
-    ] [
-        varying vec2 texcoord1, texcoord2, texcoord3, texcoord4;
-    ]
-]
-
-// some simple ones that just do an effect on the RGB value...
-
-lazyshader 0 "invert" (fsvs) (fsps [gl_FragColor = 1.0 - color;])
-lazyshader 0 "gbr"    (fsvs) (fsps [gl_FragColor = color.yzxw;])
-lazyshader 0 "bw"     (fsvs) (fsps [gl_FragColor = vec4(dot(color.xyz, vec3(0.333)));])
-
-// sobel
-
-lazyshader 0 "sobel" (fsvs4) (fsps4 [
-    vec4 t = s00 + s20 - s02 - s22;
-    vec4 u = s00 + s02 - s20 - s22;
-    gl_FragColor = color + t*t + u*u;
-])
-
-// rotoscope
-
-lazyshader 0 "rotoscope" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    uniform vec2 postfxscale;
-    uniform vec4 params;
-    varying vec2 t11, t00, t12, t01, t20, t02, t21, t10, t22;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        t11 = vtexcoord0;
-        vec2 scale = postfxscale*params.x;
-        t00 = vec2(-1.0, -1.0)*scale + vtexcoord0;
-        t12 = vec2( 0.0,  1.0)*scale + vtexcoord0;
-        t01 = vec2(-1.0,  0.0)*scale + vtexcoord0;
-        t20 = vec2( 1.0, -1.0)*scale + vtexcoord0;
-        t02 = vec2(-1.0,  1.0)*scale + vtexcoord0;
-        t21 = vec2( 1.0,  0.0)*scale + vtexcoord0;
-        t10 = vec2( 0.0, -1.0)*scale + vtexcoord0;
-        t22 = vec2( 1.0,  1.0)*scale + vtexcoord0;
-    }
-] [
-    uniform sampler2D tex0; 
-    varying vec2 t11, t00, t12, t01, t20, t02, t21, t10, t22;
-    void main(void)
-    {
-        vec4 c00 = texture2D(tex0, t00);
-        vec4 c01 = texture2D(tex0, t01);
-        vec4 c02 = texture2D(tex0, t02);
-        vec4 c10 = texture2D(tex0, t10);
-        vec4 c11 = texture2D(tex0, t11);
-        vec4 c12 = texture2D(tex0, t12);
-        vec4 c20 = texture2D(tex0, t20);
-        vec4 c21 = texture2D(tex0, t21);
-        vec4 c22 = texture2D(tex0, t22);
-
-        vec4 diag1 = c00 - c22;
-        vec4 diag2 = c02 - c20;
-        vec4 xedge = (c01 - c21)*2.0 + diag1 + diag2;
-        vec4 yedge = (c10 - c12)*2.0 + diag1 - diag2;
-        xedge *= xedge;
-        yedge *= yedge;
-
-        vec4 xyedge = xedge + yedge;
-        float sobel = step(max(xyedge.x, max(xyedge.y, xyedge.z)), 0.1);
-
-        float hue = dot(c11.xyz, vec3(1.0));
-        c11 /= hue;
-        vec3 cc = step(vec3(0.2, 0.8, 1.5), vec3(hue));
-        c11 *= dot(cc, vec3(0.5, 0.5, 1.5)); 
-
-        gl_FragColor = c11 * max(cc.z, sobel);
-    }
-]
-
 blur3shader = [
-    lazyshader 0 $arg1 [ 
+    lazyshader 0 $arg1 [
         attribute vec4 vvertex;
         @(screentexcoord 0)
         uniform vec2 postfxscale;
@@ -1546,7 +1270,7 @@ blur3shader = [
         }
     ] [
         varying vec2 texcoord0, texcoord1;
-        uniform sampler2D tex0; 
+        uniform sampler2D tex0;
         void main(void)
         {
             gl_FragColor = 0.5*(texture2D(tex0, texcoord0) + texture2D(tex0, texcoord1));
@@ -1570,115 +1294,25 @@ blur5shader = [
             texcoord2 = vtexcoord0 + vec2(@(? $arg2  1.333 0.0), @(? $arg3  1.333 0.0))*postfxscale;
         }
     ] [
-        uniform sampler2D tex0; 
+        uniform sampler2D tex0;
         varying vec2 texcoord0, texcoord1, texcoord2;
         void main(void)
         {
             gl_FragColor = 0.4*texture2D(tex0, texcoord0) + 0.3*(texture2D(tex0, texcoord1) + texture2D(tex0, texcoord2));
-        } 
+        }
     ]
 ]
 blur5shader hblur5 1 0
 blur5shader vblur5 0 1
 
-rotoscope = [
-    clearpostfx
-    if (>= $numargs 1) [addpostfx rotoscope 0 0 0 $arg1]
-    if (>= $numargs 2) [
-        if (= $arg2 1) [addpostfx hblur3; addpostfx vblur3]
-        if (= $arg2 2) [addpostfx hblur5; addpostfx vblur5]
-    ]
-]
-
-shader 0 "screenrect" [
-    attribute vec4 vvertex, vcolor;
-    @(screentexcoord 0)
-    varying vec2 texcoord0;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0;
-        color = vcolor;
-    }
-] [
-    varying vec2 texcoord0;
-    varying vec4 color;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        gl_FragColor = color * texture2D(tex0, texcoord0);
-    }
-]
-
-// bloom-ish
-
-lazyshader 0 "bloom_scale" (fsvs4) (fsps4 [
-    gl_FragColor = 0.2 * (s02 + s00 + s22 + s20 + color);
-])
-
-lazyshader 0 "bloom_init" (fsvs) (fsps [
-    float t = max(color.r, max(color.g, color.b));
-    gl_FragColor = t*t*color;
-])
-
-bloomshader = [
-  defershader 0 $arg1 [
-    forceshader "bloom_scale"
-    forceshader "bloom_init"
-    shader 0 @arg1 [
-        attribute vec4 vvertex;
-        @(screentexcoord 0)
-        varying vec2 texcoord0;
-        void main(void)
-        {
-            gl_Position = vvertex;
-            texcoord0 = vtexcoord0;
-        }
-    ] [
-        uniform vec4 params;
-        varying vec2 texcoord0;
-        uniform sampler2D tex0 @@(loopconcat i $arg2 [result [, tex@(+ $i 1)]]); 
-        void main(void)
-        {
-            vec4 sample = texture2D(tex0, texcoord0);
-            @@(loopconcat i $arg2 [result [
-                @(? $i "bloom +=" "vec4 bloom =") texture2D(tex@(+ $i 1), texcoord0);
-            ]])
-            gl_FragColor = bloom*params.x + sample;
-        }
-    ]
-  ]
-]
-
-bloomshader bloom1 1
-bloomshader bloom2 2
-bloomshader bloom3 3
-bloomshader bloom4 4
-bloomshader bloom5 5
-bloomshader bloom6 6
-
-setupbloom = [
-    addpostfx bloom_init 1 1 "+0"
-    loop i (- $arg1 1) [
-        addpostfx bloom_scale (+ $i 2) (+ $i 2) (concatword "+" (+ $i 1))
-    ]
-    addpostfx (concatword bloom $arg1) 0 0 (loopconcat i (+ $arg1 1) [result $i]) $arg2
-]
-
-bloom = [
-    clearpostfx
-    if (>= $numargs 1) [setupbloom 6 $arg1]
-]
-
 ////////////////////////////////////////////////
 //
-// miscellaneous effect shaders: 
+// miscellaneous effect shaders:
 //
 ////////////////////////////////////////////////
 
 // wobbles the vertices of an explosion sphere
-// and generates all texcoords 
+// and generates all texcoords
 // and blends the edge color
 // and modulates the texture
 explosionshader = [
@@ -1705,13 +1339,13 @@ explosionshader = [
             ]])
 
             color = vcolor;
-       
+
             texcoord0 = vtexcoord0;
             vec2 texgen = vec2(dot(texgenS, vvertex.xyz), dot(texgenT, vvertex.xyz));
             texcoord1 = texgen;
             texcoord2 = 0.5*texgen - millis*0.5;
-        } 
-    ] [ 
+        }
+    ] [
         @(if (>= (strstr $arg1 "soft") 0) [result [
             uniform sampler2D tex2;
         ]])
@@ -1719,7 +1353,7 @@ explosionshader = [
         uniform vec2 blendparams;
         varying vec4 color;
         varying vec2 texcoord0, texcoord1, texcoord2;
-        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec4 texcoord3; ]]) 
+        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec4 texcoord3; ]])
         @(if (>= (strstr $arg1 "soft8") 0) [result [uniform vec4 depthfxselect;]])
         void main(void)
         {
@@ -1733,7 +1367,7 @@ explosionshader = [
                 diffuse.b += k*k;
             ]] [result [
                 diffuse *= blend*4.0; // dup alpha into RGB channels + intensify and over saturate
-                diffuse.b += 0.5 - blend*0.5; // blue tint 
+                diffuse.b += 0.5 - blend*0.5; // blue tint
             ]])
 
             @(if (>= (strstr $arg1 "soft") 0) [result [
@@ -1767,7 +1401,7 @@ shader 0 "particlenotexture" [
     {
         gl_Position = camprojmatrix * vvertex;
         color = vcolor * colorscale;
-    } 
+    }
 ] [
     varying vec4 color;
     void main(void)
@@ -1785,12 +1419,12 @@ particleshader = [
         uniform vec4 colorscale;
         varying vec2 texcoord0;
         varying vec4 color;
-        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec3 texcoord1, surface; ]]) 
+        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec3 texcoord1, surface; ]])
         void main(void)
         {
             gl_Position = camprojmatrix * vvertex;
             texcoord0 = vtexcoord0;
-            color = vcolor * colorscale; 
+            color = vcolor * colorscale;
 
             @(if (>= (strstr $arg1 "soft") 0) [result [
                 texcoord1 = vec3(0.5*(gl_Position.xy + gl_Position.w), gl_Position.w);
@@ -1806,7 +1440,7 @@ particleshader = [
         uniform sampler2D tex0;
         varying vec2 texcoord0;
         varying vec4 color;
-        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec3 texcoord1, surface;]]) 
+        @(if (>= (strstr $arg1 "soft") 0) [result [uniform vec4 depthfxparams; varying vec3 texcoord1, surface;]])
         @(if (>= (strstr $arg1 "soft8") 0) [result [uniform vec4 depthfxselect;]])
         void main(void)
         {
@@ -1824,41 +1458,19 @@ particleshader = [
 
             gl_FragColor = diffuse * color;
         }
-    ]     
+    ]
 ]
 
 looplist i ["" "soft" "soft8"] [
     particleshader [particle@i]
 ]
 
-shader 0 "blendbrush" [
-    attribute vec4 vvertex, vcolor;
-    uniform mat4 camprojmatrix;
-    uniform vec4 texgenS, texgenT;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        texcoord0 = vec2(dot(texgenS, vvertex), dot(texgenT, vvertex));
-    }
-] [
-    varying vec4 color;
-    varying vec2 texcoord0;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        gl_FragColor = texture2D(tex0, texcoord0).r * color;
-    }
-]
-
 lazyshader 0 "prefab" [
     attribute vec4 vvertex, vcolor;
     attribute vec3 vnormal;
     uniform mat4 prefabmatrix;
     uniform mat3 prefabworld;
-    varying vec4 color; 
+    varying vec4 color;
 
     void main(void)
     {
@@ -1867,756 +1479,10 @@ lazyshader 0 "prefab" [
         color.rgb *= dot(prefabworld * vnormal, vec3(0.0, -0.447213595, 0.894427191));
     }
 ] [
-    varying vec4 color; 
-    void main(void)
-    {
-        gl_FragColor = color;
-    }
-]
-
-lazyshader 0 "moviergb" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0;
-    }
-] [
-    varying vec2 texcoord0;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        gl_FragColor = texture2D(tex0, texcoord0);
-    }
-]
-
-lazyshader 0 "movieyuv" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0;
-    }
-] [
-    varying vec2 texcoord0;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        vec3 sample = texture2D(tex0, texcoord0).rgb;
-        gl_FragColor = vec4(dot(sample, vec3(0.439216, -0.367788, -0.071427)) + 0.501961,
-                            dot(sample, vec3(-0.148224, -0.290992, 0.439216)) + 0.501961,
-                            dot(sample, vec3(0.256788, 0.504125, 0.097905)) + 0.062745,
-                            0.0);
-    }
-]
-
-lazyshader 0 "moviey" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    uniform vec2 moviescale;
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0 + vec2(-1.5, 0.0)*moviescale;
-        texcoord1 = vtexcoord0 + vec2(-0.5, 0.0)*moviescale;
-        texcoord2 = vtexcoord0 + vec2( 0.5, 0.0)*moviescale;
-        texcoord3 = vtexcoord0 + vec2( 1.5, 0.0)*moviescale;
-    }
-] [
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        vec3 sample1 = texture2D(tex0, texcoord0).rgb;
-        vec3 sample2 = texture2D(tex0, texcoord1).rgb;
-        vec3 sample3 = texture2D(tex0, texcoord2).rgb;
-        vec3 sample4 = texture2D(tex0, texcoord3).rgb;
-        gl_FragColor = vec4(dot(sample3, vec3(0.256788, 0.504125, 0.097905)) + 0.062745,
-                            dot(sample2, vec3(0.256788, 0.504125, 0.097905)) + 0.062745,
-                            dot(sample1, vec3(0.256788, 0.504125, 0.097905)) + 0.062745,
-                            dot(sample4, vec3(0.256788, 0.504125, 0.097905)) + 0.062745);
-    }
-]
-
-lazyshader 0 "movieu" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    uniform vec2 moviescale;
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0 + vec2(-3.0, 0.0)*moviescale;
-        texcoord1 = vtexcoord0 + vec2(-1.0, 0.0)*moviescale;
-        texcoord2 = vtexcoord0 + vec2( 1.0, 0.0)*moviescale;
-        texcoord3 = vtexcoord0 + vec2( 3.0, 0.0)*moviescale;
-    }
-] [
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        vec3 sample1 = texture2D(tex0, texcoord0).rgb;
-        vec3 sample2 = texture2D(tex0, texcoord1).rgb;
-        vec3 sample3 = texture2D(tex0, texcoord2).rgb;
-        vec3 sample4 = texture2D(tex0, texcoord3).rgb;
-        gl_FragColor = vec4(dot(sample3, vec3(-0.148224, -0.290992, 0.43921)) + 0.501961,
-                            dot(sample2, vec3(-0.148224, -0.290992, 0.43921)) + 0.501961,
-                            dot(sample1, vec3(-0.148224, -0.290992, 0.43921)) + 0.501961,
-                            dot(sample4, vec3(-0.148224, -0.290992, 0.43921)) + 0.501961);
-    }
-]
-
-lazyshader 0 "moviev" [
-    attribute vec4 vvertex;
-    @(screentexcoord 0)
-    uniform vec2 moviescale;
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    void main(void)
-    {
-        gl_Position = vvertex;
-        texcoord0 = vtexcoord0 + vec2(-3.0, 0.0)*moviescale;
-        texcoord1 = vtexcoord0 + vec2(-1.0, 0.0)*moviescale;
-        texcoord2 = vtexcoord0 + vec2( 1.0, 0.0)*moviescale;
-        texcoord3 = vtexcoord0 + vec2( 3.0, 0.0)*moviescale;
-    }
-] [
-    varying vec2 texcoord0, texcoord1, texcoord2, texcoord3;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        vec3 sample1 = texture2D(tex0, texcoord0).rgb;
-        vec3 sample2 = texture2D(tex0, texcoord1).rgb;
-        vec3 sample3 = texture2D(tex0, texcoord2).rgb;
-        vec3 sample4 = texture2D(tex0, texcoord3).rgb;
-        gl_FragColor = vec4(dot(sample3, vec3(0.439216, -0.367788, -0.071427)) + 0.501961,
-                            dot(sample2, vec3(0.439216, -0.367788, -0.071427)) + 0.501961,
-                            dot(sample1, vec3(0.439216, -0.367788, -0.071427)) + 0.501961,
-                            dot(sample4, vec3(0.439216, -0.367788, -0.071427)) + 0.501961);
-    }
-]
-
-///////////////////////////////////////////////////
-//
-// reflective/refractive water shaders:
-//
-///////////////////////////////////////////////////
-
-watershader = [
-    specular = $arg2
-    rgbfog = $arg3
-    distort = $arg4
-    combine = $arg5
-    lazyshader 0 $arg1 [
-        attribute vec4 vvertex;
-        attribute vec3 vcolor;
-        uniform mat4 camprojmatrix;
-        uniform vec3 camera;
-        uniform mat4 watermatrix;
-        uniform float waterheight;
-        uniform float millis;
-        @(if $specular [result [uniform vec3 lightpos; varying vec3 lightdir;]])
-        varying vec3 camdir, color;
-        varying vec4 texcoord0;
-        varying vec2 texcoord1, texcoord2;
-        void main(void)
-        {
-            gl_Position = camprojmatrix * vvertex;
-            color = vcolor;
-            texcoord0 = watermatrix * vvertex;
-            @(if (>= (strstr $arg1 "underwater") 0) [result [
-                texcoord0.z = waterheight - vvertex.z;
-            ]] [result [
-                texcoord0.z = vvertex.z - waterheight;
-            ]])
-            vec2 tc = vvertex.xy * 0.02;
-            texcoord1 = tc + millis*0.05;
-            texcoord2 = tc - millis*0.03;
-            camdir = camera - vvertex.xyz;
-            @(if $specular [result [
-                lightdir = lightpos - vvertex.xyz;
-            ]])
-        }
-    ] [
-        @(if $rgbfog [result [
-            //:fog
-        ]] [result [
-            //:fogrgba vec4(vec3(0.0), 1.0)
-        ]])
-        uniform vec2 depth;
-        @(if $specular [result [uniform vec3 lightcolor; uniform float lightradius; varying vec3 lightdir;]])
-        varying vec3 camdir, color;
-        varying vec4 texcoord0;
-        varying vec2 texcoord1, texcoord2;
-        @(if (>= (strstr $arg1 "env") 0) [result [
-            uniform samplerCube tex0;
-        ]] [result [
-            uniform sampler2D tex0;
-        ]]) 
-        uniform sampler2D tex1, tex2, tex3;
-        void main(void)
-        {
-            vec3 camvec = normalize(camdir);
-            @(if $specular [result [
-                vec3 lightvec = normalize(lightdir);
-                vec3 halfangle = normalize(camvec + lightvec);
-            ]])
-                
-            vec2 dudv = texture2D(tex2, texcoord1).xy*2.0 - 1.0;
-        
-            @distort
-            
-            @(if $specular [result [
-                float spec = pow(clamp(dot(halfangle, bump), 0.0, 1.0), 96.0);
-                vec3 light = lightcolor * (1.0 - clamp(length(lightdir)/lightradius, 0.0, 1.0));
-            ]])
-
-            @combine
-        }
-    ]
-]
-
-watershader "waterglare" 1 1 [
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [
-    gl_FragColor = vec4(light*spec*spec*32.0, 0.0);
-]
-lazyshader 0 "waterglarefast" [
-    //:fog
-    attribute vec4 vvertex;
-    uniform mat4 camprojmatrix;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-    }
-] [
-    void main(void)
-    {
-        gl_FragColor = vec4(0.0);
-    }
-]
-fastshader waterglare waterglarefast 2
-altshader waterglare waterglarefast
-
-lazyshader 0 "underwater" [
-    attribute vec4 vvertex;
-    attribute vec3 vcolor;
-    uniform mat4 camprojmatrix;
-    varying vec3 color;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-    }
-] [
-    //:fogrgba vec4(vec3(0.0), 1.0)
-    uniform vec2 depth;
-    varying vec3 color;
-    void main(void)
-    {    
-        gl_FragColor.rgb = 0.8*depth.x*color;
-        gl_FragColor.a = 0.5*depth.y; 
-    }
-]
-
-watershader "underwaterrefract" 0 1 [
-    dudv = texture2D(tex2, texcoord2 + 0.025*dudv).xy*2.0 - 1.0;
-
-    gl_FragColor = texture2D(tex3, texcoord0.xy/texcoord0.w + 0.007*dudv);
-] []
-watershader "underwaterrefractfast" 0 1 [
-    gl_FragColor = texture2DProj(tex3, texcoord0 + vec4(0.3*dudv, 0.0, 0.0));
-] []
-fastshader underwaterrefract underwaterrefractfast 2
-altshader underwaterrefract underwaterrefractfast
-
-watershader "underwaterfade" 0 1 [
-    dudv = texture2D(tex2, texcoord2 + 0.025*dudv).xy*2.0 - 1.0;
-
-    vec2 projtc = texcoord0.xy/texcoord0.w;
-    float fade = texcoord0.z + 4.0*texture2D(tex3, projtc).a;
-    gl_FragColor.a = fade * clamp(gl_FragCoord.z, 0.0, 1.0);
-    gl_FragColor.rgb = texture2D(tex3, projtc + 0.007*dudv).rgb; 
-] []
-watershader "underwaterfadefast" 0 1 [
-    gl_FragColor.rgb = texture2DProj(tex3, texcoord0 + vec4(0.3*dudv, 0.0, 0.0)).rgb;
-    gl_FragColor.a = texcoord0.z + 4.0*texture2DProj(tex3, texcoord0).a;
-] []
-fastshader underwaterfade underwaterfadefast 2
-altshader underwaterfade underwaterfadefast
-
-watershader "water" 1 0 [
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = color*depth.x*mix(0.6, 1.0, invfresnel*0.5+0.5) + spec*light;
-    gl_FragColor.a = invfresnel*depth.y;
-]
-watershader "waterfast" 0 0 [
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [    
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = color*depth.x*mix(0.6, 1.0, invfresnel*0.5+0.5);
-    gl_FragColor.a = invfresnel*depth.y;
-]
-fastshader water waterfast 1
-altshader water waterfast
-
-watershader "waterreflect" 1 0 [
-    vec3 reflect = texture2DProj(tex0, texcoord0 + vec4(0.3*dudv, 0.0, 0.0)).rgb;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = mix(reflect, color*depth.x, invfresnel*0.5+0.5) + spec*light;
-    gl_FragColor.a = invfresnel*depth.y;
-]
-watershader "waterreflectfast" 0 0 [
-    vec3 reflect = texture2DProj(tex0, texcoord0 + vec4(0.3*dudv, 0.0, 0.0)).rgb;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = mix(reflect, color*depth.x, invfresnel*0.5+0.5);
-    gl_FragColor.a = invfresnel*depth.y;
-]
-fastshader waterreflect waterreflectfast 2
-altshader waterreflect waterreflectfast
-
-watershader "waterrefract" 1 1 [
-    vec2 dtc = texcoord2 + 0.025*dudv;
-    vec3 bump = texture2D(tex1, dtc).rgb*2.0 - 1.0;
-    dudv = texture2D(tex2, dtc).xy*2.0 - 1.0;
-
-    vec2 rtc = texcoord0.xy/texcoord0.w + 0.007*dudv;
-    vec3 reflect = texture2D(tex0, rtc).rgb;
-    vec3 refract = texture2D(tex3, rtc).rgb;
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor = vec4(mix(reflect, refract, invfresnel*0.5+0.5) + spec*light, 0.0);
-]
-watershader "waterrefractfast" 0 1 [
-    vec4 rtc = texcoord0 + vec4(0.3*dudv, 0.0, 0.0);
-    vec3 reflect = texture2DProj(tex0, rtc).rgb;
-    vec3 refract = texture2DProj(tex3, rtc).rgb;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor = vec4(mix(reflect, refract, invfresnel*0.5+0.5), 0.0);
-]
-fastshader waterrefract waterrefractfast 2
-altshader waterrefract waterrefractfast
-
-watershader "waterfade" 1 1 [
-    vec2 dtc = texcoord2 + 0.025*dudv;
-    vec3 bump = texture2D(tex1, dtc).rgb*2.0 - 1.0;
-    dudv = texture2D(tex2, dtc).xy*2.0 - 1.0;
-
-    vec2 projtc = texcoord0.xy/texcoord0.w;
-    vec2 rtc = projtc + 0.007*dudv;
-    vec3 reflect = texture2D(tex0, rtc).rgb;
-    vec3 refract = texture2D(tex3, rtc).rgb;
-    float fade = texcoord0.z + 4.0*texture2D(tex3, projtc).a;
-    gl_FragColor.a = fade * clamp(gl_FragCoord.z, 0.0, 1.0);
-] [
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = mix(reflect, refract, invfresnel*0.5+0.5) + spec*light;
-]   
-watershader "waterfadefast" 0 1 [
-    vec4 rtc = texcoord0 + vec4(0.3*dudv, 0.0, 0.0);
-    vec3 reflect = texture2DProj(tex0, rtc).rgb;
-    vec3 refract = texture2DProj(tex3, rtc).rgb;
-    gl_FragColor.a = texcoord0.z + 4.0*texture2DProj(tex3, texcoord0).a;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-] [ 
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0);
-    gl_FragColor.rgb = mix(reflect, refract, invfresnel*0.5+0.5);
-]
-fastshader waterfade waterfadefast 2
-altshader waterfade waterrefract
-
-watershader "waterenv" 1 0 [
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor.rgb = mix(reflect, color*depth.x, invfresnel*0.5+0.5) + spec*light;
-    gl_FragColor.a = invfresnel*depth.y; 
-]
-watershader "waterenvfast" 0 0 [
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor.rgb = mix(reflect, color*depth.x, invfresnel*0.5+0.5);
-    gl_FragColor.a = invfresnel*depth.y; 
-]
-fastshader waterenv waterenvfast 2
-altshader waterenv waterenvfast
-
-watershader "waterenvrefract" 1 1 [
-    vec2 dtc = texcoord2 + 0.025*dudv;
-    vec3 bump = texture2D(tex1, dtc).rgb*2.0 - 1.0;
-    dudv = texture2D(tex2, dtc).xy*2.0 - 1.0;
-
-    vec3 refract = texture2D(tex3, texcoord0.xy/texcoord0.w + 0.007*dudv).rgb;
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor = vec4(mix(reflect, refract, invfresnel*0.5+0.5) + spec*light, 0.0);
-]
-watershader "waterenvrefractfast" 0 1 [
-    vec3 refract = texture2DProj(tex3, texcoord0 + vec4(0.3*dudv, 0.0, 0.0)).rgb;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor = vec4(mix(reflect, refract, invfresnel*0.5+0.5), 0.0);
-]
-fastshader waterenvrefract waterenvrefractfast 2
-altshader waterenvrefract waterenvrefractfast
-
-watershader "waterenvfade" 1 1 [
-    vec2 dtc = texcoord2 + 0.025*dudv;
-    vec3 bump = texture2D(tex1, dtc).rgb*2.0 - 1.0;
-    dudv = texture2D(tex2, dtc).xy*2.0 - 1.0;
-
-    vec2 projtc = texcoord0.xy/texcoord0.w;
-    vec3 refract = texture2D(tex3, projtc + 0.007*dudv).rgb;
-    float fade = texcoord0.z + 4.0*texture2D(tex3, projtc).a;
-    gl_FragColor.a = fade * clamp(gl_FragCoord.z, 0.0, 1.0);
-
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor.rgb = mix(reflect, refract, invfresnel*0.5+0.5) + spec*light;
-]
-watershader "waterenvfadefast" 0 1 [
-    vec3 refract = texture2DProj(tex3, texcoord0 + vec4(0.3*dudv, 0.0, 0.0)).rgb;
-    gl_FragColor.a = texcoord0.z + 4.0*texture2DProj(tex3, texcoord0).a;
-    vec3 bump = texture2D(tex1, texcoord2 + 0.025*dudv).rgb*2.0 - 1.0;
-    float invfresnel = clamp(dot(camvec, bump), 0.0, 1.0); 
-    vec3 reflect = textureCube(tex0, camvec - 2.0*invfresnel*bump).rgb;
-] [
-    gl_FragColor.rgb = mix(reflect, refract, invfresnel*0.5+0.5);
-]
-fastshader waterenvfade waterenvfadefast 2
-altshader waterenvfade waterenvrefract
-
-causticshader = [
-    lazyshader 0 $arg1 [
-        attribute vec4 vvertex;
-        uniform mat4 camprojmatrix;
-        uniform vec3 texgenS, texgenT;
-        varying vec2 texcoord0;
-        void main(void)
-        {
-            gl_Position = camprojmatrix * vvertex;
-            texcoord0 = vec2(dot(texgenS, vvertex.xyz), dot(texgenT, vvertex.xyz)); 
-        }
-    ] [
-        //:fog vec3(1.0)
-        uniform vec4 frameblend;
-        varying vec2 texcoord0;
-        uniform sampler2D tex0, tex1;
-        void main(void)
-        {
-            @arg2
-        }
-    ]
-]
-causticshader caustic [
-    gl_FragColor = vec4(vec3(frameblend.x*texture2D(tex0, texcoord0).r + frameblend.y*texture2D(tex1, texcoord0).r + frameblend.w), 1.0);
-]
-
-lazyshader 0 "lava" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec3 vnormal;
-    uniform mat4 camprojmatrix;
-    varying vec4 color;
-    uniform vec4 lavatexgen;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        vec2 tc = mix(vvertex.xz, vvertex.yy, abs(vnormal.xz));
-        texcoord0 = (tc + lavatexgen.zw) * lavatexgen.xy;
-    }
-] [
-    uniform sampler2D tex0;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_FragColor = color * texture2D(tex0, texcoord0) * 2.0; 
-    }
-]
-
-lazyshader 0 "lavaglare" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec3 vnormal;
-    uniform mat4 camprojmatrix;
-    varying vec4 color;
-    uniform vec4 lavatexgen;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vec4(vcolor.rgb*2.0 - 1.0, vcolor.a);
-        vec2 tc = mix(vvertex.xz, vvertex.yy, abs(vnormal.xz));
-        texcoord0 = (tc + lavatexgen.zw) * lavatexgen.xy;
-    }
-] [
-    uniform sampler2D tex0;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        vec4 glow = texture2D(tex0, texcoord0) * color;
-        float k = max(glow.r, max(glow.g, glow.b));
-        gl_FragColor = glow*k*k*32.0;
-    }
-]
-
-lazyshader 0 "waterfall" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec3 vnormal;
-    uniform mat4 camprojmatrix;
-    varying vec4 color;
-    uniform vec4 waterfalltexgen;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        vec2 tc = mix(vvertex.xz, vvertex.yy, abs(vnormal.xz));
-        texcoord0 = (tc + waterfalltexgen.zw) * waterfalltexgen.xy;
-    }
-] [
-    uniform sampler2D tex0;
     varying vec4 color;
-    varying vec2 texcoord0;
     void main(void)
     {
-        gl_FragColor = color * texture2D(tex0, texcoord0); 
-    }
-]
-
-lazyshader 0 "waterfallrefract" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec3 vnormal;
-    uniform mat4 camprojmatrix;
-    uniform mat4 watermatrix;
-    varying vec4 color;
-    uniform vec4 waterfalltexgen;
-    varying vec2 texcoord0;
-    varying vec4 texcoord1;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        vec2 tc = mix(vvertex.xz, vvertex.yy, abs(vnormal.xz));
-        texcoord0 = (tc + waterfalltexgen.zw) * waterfalltexgen.xy;
-        texcoord1 = watermatrix * vvertex; 
-    }
-] [
-    uniform vec2 dudvoffset;
-    uniform sampler2D tex0, tex2, tex4;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    varying vec4 texcoord1;
-    void main(void)
-    {
-        vec4 diffuse = texture2D(tex0, texcoord0);
-        vec2 dudv = texture2D(tex2, texcoord0 + 0.2*diffuse.xy + dudvoffset).xy; 
-        vec4 refract = texture2DProj(tex4, texcoord1 + vec4(4.0*dudv, 0.0, 0.0));
-        gl_FragColor = mix(refract, color, diffuse);
-    }
-]
-
-lazyshader 0 "waterfallenvrefract" [
-    //:fog
-    attribute vec4 vvertex, vcolor;
-    attribute vec3 vnormal;
-    uniform mat4 camprojmatrix;
-    uniform mat4 watermatrix;
-    uniform vec3 camera;
-    varying vec4 color;
-    uniform vec4 waterfalltexgen;
-    varying vec2 texcoord0;
-    varying vec4 texcoord1;
-    varying vec3 camdir;
-    varying mat3 world; 
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        camdir = camera - vvertex.xyz;
-        vec3 absnorm = abs(vnormal);
-        world = mat3(absnorm.yzx, -absnorm.zxy, vnormal);
-        vec2 tc = mix(vvertex.xz, vvertex.yy, absnorm.xz);
-        texcoord0 = (tc + waterfalltexgen.zw) * waterfalltexgen.xy;
-        texcoord1 = watermatrix * vvertex;
-    }
-] [
-    uniform vec2 dudvoffset;
-    uniform sampler2D tex0, tex1, tex2, tex4;
-    uniform samplerCube tex3;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    varying vec4 texcoord1;
-    varying vec3 camdir;
-    varying mat3 world; 
-    void main(void)
-    {
-        vec4 diffuse = texture2D(tex0, texcoord0);
-        vec2 dudv = texture2D(tex2, texcoord0 + 0.2*diffuse.xy + dudvoffset).xy; 
-        vec3 normal = world * (texture2D(tex1, texcoord0 + 0.1*dudv).rgb*2.0 - 1.0);
-        vec4 refract = texture2DProj(tex4, texcoord1 + vec4(4.0*dudv, 0.0, 0.0));
-        vec3 camvec = normalize(camdir);
-        float invfresnel = dot(normal, camvec);
-        vec4 reflect = textureCube(tex3, 2.0*invfresnel*normal - camvec);
-        gl_FragColor = mix(mix(reflect, refract, 1.0 - 0.4*step(0.0, invfresnel)), color, diffuse); 
-    }
-]
-altshader waterfallenvrefract waterfallrefract
-
-lazyshader 0 "waterfallenv" [
-    //:fog
-    attribute vec4 vvertex;
-    attribute vec3 vcolor, vnormal;
-    uniform mat4 camprojmatrix;
-    uniform vec3 camera;
-    uniform vec4 waterfalltexgen;
-    varying vec2 texcoord0;
-    varying vec3 color, camdir;
-    varying mat3 world; 
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        camdir = camera - vvertex.xyz;
-        vec3 absnorm = abs(vnormal);
-        world = mat3(absnorm.yzx, -absnorm.zxy, vnormal);
-        vec2 tc = mix(vvertex.xz, vvertex.yy, absnorm.xz);
-        texcoord0 = (tc + waterfalltexgen.zw) * waterfalltexgen.xy;
-    }
-] [
-    uniform vec2 dudvoffset;
-    uniform sampler2D tex0, tex1, tex2;
-    uniform samplerCube tex3;
-    varying vec2 texcoord0;
-    varying vec3 color, camdir;
-    varying mat3 world; 
-    void main(void)
-    {
-        vec4 diffuse = texture2D(tex0, texcoord0);
-        vec2 dudv = texture2D(tex2, texcoord0 + 0.2*diffuse.xy + dudvoffset).xy; 
-        vec3 normal = world * (texture2D(tex1, texcoord0 + 0.1*dudv).rgb*2.0 - 1.0);
-        vec3 camvec = normalize(camdir);
-        vec4 reflect = textureCube(tex3, 2.0*dot(normal, camvec)*normal - camvec);
-        gl_FragColor.rgb = mix(reflect.rgb, color, diffuse.rgb);
-        gl_FragColor.a = 0.25 + 0.75*diffuse.r;    
-    }
-]
-
-lazyshader 0 "glass" [
-    attribute vec4 vvertex;
-    attribute vec3 vcolor, vnormal;
-    uniform mat4 camprojmatrix;
-    uniform vec3 camera;
-    varying vec3 color, rvec, camdir, normal;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        normal = vnormal;
-        camdir = camera - vvertex.xyz;
-        rvec = 2.0*dot(camdir, vnormal) * vnormal - camdir;
-    }
-] [ 
-    //:fogrgba vec4(vec3(0.0), 1.0)
-    uniform samplerCube tex0;
-    varying vec3 color, rvec, camdir, normal;
-    void main(void)
-    {
-        vec3 camvec = normalize(camdir);
-        vec3 reflect = textureCube(tex0, rvec).rgb;
-   
-        float invfresnel = max(dot(camvec, normal), 0.70); 
-        gl_FragColor.rgb = mix(reflect, color*0.05, invfresnel);
-        gl_FragColor.a = invfresnel * 0.95;
-    }
-]
-lazyshader 0 "glassfast" [
-    attribute vec4 vvertex;
-    attribute vec3 vcolor, vnormal;
-    uniform mat4 camprojmatrix;
-    uniform vec3 camera;
-    varying vec3 color, rvec;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        vec3 camdir = camera - vvertex.xyz;
-        rvec = 2.0*dot(camdir, vnormal) * vnormal - camdir;
-    }
-] [ 
-    //:fogrgba vec4(vec3(0.0), 1.0)
-    uniform samplerCube tex0;
-    varying vec3 color, rvec;
-    void main(void)
-    {
-        vec3 reflect = textureCube(tex0, rvec).rgb;
-        const float invfresnel = 0.75;
-        gl_FragColor.rgb = mix(reflect, color*0.05, invfresnel);
-        gl_FragColor.a = invfresnel * 0.95; 
-    }
-]
-fastshader glass glassfast 2
-altshader glass glassfast
-
-lazyshader 0 "grass" [
-    attribute vec4 vvertex, vcolor;
-    attribute vec2 vtexcoord0, vtexcoord1;
-    attribute vec4 vtangent;
-    uniform mat4 camprojmatrix;
-    uniform vec3 camera;
-    uniform vec3 grassmargin;
-    varying vec4 color;
-    varying vec2 texcoord0, texcoord1;
-    varying vec2 bounds;
-    void main(void)
-    {
-        gl_Position = camprojmatrix * vvertex;
-        color = vcolor;
-        texcoord0 = vtexcoord0;
-        texcoord1 = vtexcoord1 * @lmcoordscale;
-        vec2 camdir = (camera.xy - vvertex.xy) * grassmargin.y;
-        bounds = vec2(dot(camdir, vtangent.xy), dot(camdir, vtangent.zw)) + grassmargin.z;
-    }
-] [
-    //:fogrgba vec4(0.0)
-    varying vec4 color;
-    varying vec2 texcoord0, texcoord1;
-    varying vec2 bounds;
-    uniform sampler2D tex0, tex1;
-    void main(void)
-    {
-        vec4 diffuse = texture2D(tex0, texcoord0);
-        diffuse.rgb *= 2.0;
-        vec4 lm = texture2D(tex1, texcoord1) * color;
-        lm.rgb *= lm.a;
-        float margin = clamp(min(bounds.x, bounds.y), 0.0, 1.0);
-        gl_FragColor = diffuse * lm * margin;
+        gl_FragColor = color;
     }
 ]
 
@@ -2633,7 +1499,6 @@ shader 0 "overbrightdecal" [
         texcoord0 = vtexcoord0;
     }
 ] [
-    //:fog vec3(0.5)
     varying vec4 color;
     varying vec2 texcoord0;
     uniform sampler2D tex0;
@@ -2645,7 +1510,6 @@ shader 0 "overbrightdecal" [
 ]
 
 shader 0 "saturatedecal" [
-    //:fog
     attribute vec4 vvertex, vcolor;
     attribute vec2 vtexcoord0;
     uniform mat4 camprojmatrix;
@@ -2668,135 +1532,3 @@ shader 0 "saturatedecal" [
         gl_FragColor = diffuse * color;
     }
 ]
-
-shader 0 "skybox" [
-    attribute vec4 vvertex, vcolor;
-    attribute vec2 vtexcoord0;
-    uniform mat4 skymatrix;
-    varying vec2 texcoord0;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = skymatrix * vvertex;
-        texcoord0 = vtexcoord0;
-        color = vcolor;
-    }
-] [
-    varying vec2 texcoord0;
-    varying vec4 color;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        gl_FragColor = color * texture2D(tex0, texcoord0);
-    }
-]
-
-shader 0 "skyboxglare" [
-    attribute vec4 vvertex, vcolor;
-    attribute vec2 vtexcoord0;
-    uniform mat4 skymatrix;
-    varying vec4 color;
-    varying vec2 texcoord0;
-    void main(void)
-    {
-        gl_Position = skymatrix * vvertex;
-        color = vcolor;
-        texcoord0 = vtexcoord0;
-    }
-] [
-    varying vec4 color;
-    varying vec2 texcoord0;
-    uniform sampler2D tex0;
-    void main(void)
-    {
-        vec4 glare = texture2D(tex0, texcoord0) * color;
-        gl_FragColor.rgb = vec3(dot(glare.rgb, vec3(10.56, 10.88, 10.56)) - 30.4);
-        gl_FragColor.a = glare.a;
-    }
-]
-
-shader 0 "skyfog" [
-    attribute vec4 vvertex, vcolor;
-    uniform mat4 skymatrix;
-    varying vec4 color;
-    void main(void)
-    {
-        gl_Position = skymatrix * vvertex;
-        color = vcolor;
-    }
-] [
-    varying vec4 color;
-    void main(void)
-    {
-        gl_FragColor = color;
-    }
-]
-
-loop i 2 [
-  lazyshader 0 (? $i "atmosphereglare" "atmosphere") [
-    attribute vec4 vvertex;
-    uniform mat4 skymatrix;
-    varying vec3 camvec;
-    void main(void)
-    {
-        gl_Position = skymatrix * vvertex;
-
-        camvec = vvertex.xyz;
-    }
-  ] [
-    uniform vec4 sunlight;
-    uniform vec3 sundir;
-    uniform vec3 sunweight;
-    uniform vec3 sundiskcolor;
-    uniform vec2 sundiskparams;
-    uniform vec4 opticaldepthparams;
-    uniform vec3 mieparams;
-    uniform vec3 betarayleigh, betamie, betaozone;
-    varying vec3 camvec;
-
-    void main(void)
-    {
-        vec3 camdir = normalize(camvec);
-        float costheta = dot(camdir, sundir);
-
-        // sun disk
-        float edgeoffset = max(1.0 - (1.0 - max(costheta, 0.0)*costheta)*sundiskparams.x, 0.0);
-        // limb darken with distance to edge
-        float limbdarken = sqrt(edgeoffset);
-        // lighten edges for corona, but limit it to not interfere with limb darkening
-        float corona = min(edgeoffset * sundiskparams.y, 1.0);
-        corona = max(0.75 / (1.5 - corona * corona) - 0.5, 0.0);
-        // apply limb darkening and corona to clamped sunlight color
-        vec3 sundisk = sundiskcolor * limbdarken * corona;
-
-        // optical depth along view ray
-        float offset = camdir.z*opticaldepthparams.w;
-        vec3 depth = sqrt(offset*offset + opticaldepthparams.xyz) - offset;
-        vec3 rayleighweight = betarayleigh * depth.x;
-        vec3 mieweight = betamie * depth.y;
-        vec3 ozoneweight = betaozone * (depth.z - depth.x);
-
-        // extinction of light along view ray
-        vec3 viewweight = sunweight - (rayleighweight + mieweight + ozoneweight);
-        vec3 extinction = (exp2(viewweight) - 1.0) / viewweight;
-
-        @(? $i [
-            // only glare sundisk, excluding other scattering
-            // squared (by skipping gamma encode) to limit it
-            gl_FragColor = vec4(sundisk * extinction, sunlight.a);
-        ] [
-            // calculate in-scattering
-            float rphase = (1.5 + 0.5*costheta*costheta) * (3.0 / (16.0 * 3.14159265));
-            float mphase = inversesqrt(mieparams.x + mieparams.y*min(costheta, mieparams.z));
-            vec3 scatter = rayleighweight * rphase + mieweight * (mphase * mphase * mphase);
-
-            // combine scattering and extinction with sundisk
-            vec3 inscatter = (sunlight.rgb * scatter + sundisk) * extinction;
-
-            // gamma encode
-            gl_FragColor = vec4(sqrt(inscatter), sunlight.a);
-        ])
-    }
-  ]
-]
-
diff --git a/data/menus.cfg b/data/menus.cfg
index bdf9330..8bd1930 100644
--- a/data/menus.cfg
+++ b/data/menus.cfg
@@ -83,46 +83,6 @@ newgui about [
     guitext "http://sauerbraten.org/" 0
 ]
 
-genmapitems = [
-    looplist curmap $arg1 [
-        guibutton $curmap (concat map $curmap) "cube"
-    ]
-]
-//17
-
-ffamaps1 = "aard3c abyss academy access albatross akaritori akimiski alithia alloy antel anubis aod aqueducts arbana asenatra asthma averas"
-ffamaps2 = "awoken bvdm_01 carbide cartel castle_trap catacombs cavefire church51 clash collusion colony complex conflict corruption crypta curvedm curvy_castle"
-ffamaps3 = "darkdeath deathtek depot dirtndust dispute DM_BS1 dock dopamine douze duel5 duel7 duel8 dune elegy exist exo fallen"
-ffamaps4 = "fanatic_quake fdm6 ferguson force frag-lab frag2 fragplaza frostbyte frozen fubuki fury ghetto gorge gothic-df guacamole gubo hades"
-ffamaps5 = "hashi hator haze hdm3 headroom helligsted hektik hillfort hog2 horus idyll3 imhotep industry infernal injustice insipid island"
-ffamaps6 = "janela justice kalking1 kastro katrez_d kffa killfactory kmap5 konkuri-to ksauer1 legacy legazzo lost_soul lost_world lostinspace maple masdm"
-ffamaps7 = "mbt2 mbt9 mbt10 memento memoria metl2 metl3 metl4 mood moonlite neondevastation neonpanic nessus nmp8 nmp10 nucleus oasis"
-ffamaps8 = "oddworld ognjen ogrosupply oldschool orbe orion osiris ot outpost paradigm pariah park pgdm phosgene phrantic pitch_black powerplant"
-ffamaps9 = "purgatory refuge renegade rm1 rm5 roughinery ruby ruine saffier sandstorm sauerowalk sauerstruck sdm1 shadowed shindou shinmei1 shiva"
-ffamaps10 = "simplicity skrdm1 skycastle-r slingshot souls spcr2 stahlbox stemple stronghold suburb suisei tartech teahupoo tejen thetowers thor torment"
-ffamaps11 = "toxicity tumwalk turbine turmoil unworld unworld2 ventania waltz wake5 wdcd zamak zavial zdm2 ztn"
-capturemaps1 = "aastha abbey access akimiski akroseum alithia anubis aod arabic asenatra asgard asteroids averas bklyn c_egypt c_lone c_valley"
-capturemaps2 = "campo capture_night caribbean casa collide collusion core_refuge core_transfer corruption croma cwcastle damnation destiny dirtndust disc disruption donya"
-capturemaps3 = "duomo dust2 earthstation eris eternal_valley evilness face-capture fallen fb_capture fc3 fc4 fc5 forge fragnostic frostbyte fusion genesis"
-capturemaps4 = "ghetto gorge gothic-df hades hallo harbor haste hidden imhotep infamy infernal killcore3 kopenhagen laucin lostinspace luna mbt12"
-capturemaps5 = "mc-lab meltdown2 mercury metro monastery nevil_c new_energy nitro nmp4 nmp9 nucleus ogrosupply overdrive ow pandora paradigm pariah"
-capturemaps6 = "ph-capture pul1ctf reissen relic risk river_c river_keep ruby ruebli rust serenity skycastle-r snapper_rocks spcr stadium stronghold subterra"
-capturemaps7 = "suburb surge tempest tortuga triforts turbulence turmoil twinforts urban_c valhalla venice waltz xenon zamak"
-ctfmaps1 = "aastha abbey akimiski akroseum arbana asgard authentic autumn bad_moon berlin_wall bklyn breakout bt_falls campo capture_night casa catch22"
-ctfmaps2 = "collide core_refuge core_transfer croma ctf_suite daemex damnation desecration destiny disc disruption divine duomo dust2 earthsea earthstation enigma"
-ctfmaps3 = "eris eternal_valley europium evilness face-capture fire_keep flagstone forge forgotten fortress fragnostic fusion garden hallo harbor haste hidden"
-ctfmaps4 = "idris infamy kiryu kopenhagen l_ctf laucin luna mach2 mbt1 mbt4 mbt12 mc-lab meltdown2 mercury metro mill new_energy"
-ctfmaps5 = "nitro nucleus overdrive ow pandora pul1ctf ra recovery redemption regal reissen risk river_keep ruebli rust sacrifice shellshock2"
-ctfmaps6 = "shipwreck siberia snapper_rocks spcr stadium stronghold subterra suburb surge tatooine tectonic tejen tempest tortuga triforts tubes turbulence"
-ctfmaps7 = "twinforts unworld3 urban_c valhalla warlock wdcd xenon"
-conceptmaps = "box_demo canyon door_demo firstevermap ladder platform_demo sauerbraten secondevermap spiralz"
-spmaps = "mpsp6a mpsp6b mpsp6c mpsp9a mpsp9b mpsp9c mpsp10 lost level9 skrsp1 crnsp1"
-rpgmaps = "k_rpg1 rpg_01"
-allffamaps = (concat $ffamaps1 $ffamaps2 $ffamaps3 $ffamaps4 $ffamaps5 $ffamaps6 $ffamaps7 $ffamaps8 $ffamaps9 $ffamaps10 $ffamaps11)
-allcapturemaps = (concat $capturemaps1 $capturemaps2 $capturemaps3 $capturemaps4 $capturemaps5 $capturemaps6 $capturemaps7)
-allctfmaps = (concat $ctfmaps1 $ctfmaps2 $ctfmaps3 $ctfmaps4 $ctfmaps5 $ctfmaps6 $ctfmaps7)
-allmaps = (concat $allffamaps $allcapturemaps $allctfmaps $conceptmaps $spmaps $rpgmaps)
-
 guirollovername = ""
 guirolloveraction = ""
 guirolloverimgpath = ""
@@ -138,166 +98,6 @@ showmapshot = [
     ]
 ]
 
-newgui maps [
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $ffamaps1 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps2 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps3 ]
-      showmapshot
-    ]
-    guitab 2
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $ffamaps4 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps5 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps6 ]
-      showmapshot
-    ]
-    guitab 3
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $ffamaps7 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps8 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps9 ]
-      showmapshot
-    ]
-    guitab 4
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $ffamaps10 ]
-      guilist [ guistrut 15 1; genmapitems $ffamaps11 ]
-      guilist [ guistrut 15 1 ]
-      showmapshot
-    ]
-    guitab capture
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps1 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps2 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps3 ]
-      showmapshot
-    ]
-    guitab 2
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps4 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps5 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps6 ]
-      showmapshot
-    ]
-    guitab 3
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps7 ]
-      guilist [ guistrut 15 1 ]
-      guilist [ guistrut 15 1 ]
-      showmapshot
-    ]
-    guitab ctf
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps1 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps2 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps3 ]
-        showmapshot
-    ]
-    guitab 2
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps4 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps5 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps6 ]
-        showmapshot
-    ]
-    guitab 3
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps7 ]
-        guilist [ guistrut 15 1 ]
-        guilist [ guistrut 15 1 ]
-        showmapshot
-    ]
-
-    guitab concept
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $conceptmaps ]
-        guilist [ guistrut 15 1 ]
-        guilist [ guistrut 15 1 ]
-        showmapshot
-    ]
-]
-
-newgui capturemaps [
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps1 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps2 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps3 ]
-      showmapshot
-    ]
-    guitab 2
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps4 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps5 ]
-      guilist [ guistrut 15 1; genmapitems $capturemaps6 ]
-      showmapshot
-    ]
-    guitab 3
-    guilist [
-      guistrut 17 1
-      guilist [ guistrut 15 1; genmapitems $capturemaps7 ]
-      guilist [ guistrut 15 1 ]
-      guilist [ guistrut 15 1 ]
-      showmapshot
-    ]
-] "capture maps"
-
-newgui ctfmaps [
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps1 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps2 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps3 ]
-        showmapshot
-    ]
-    guitab 2
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps4 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps5 ]
-        guilist [ guistrut 15 1; genmapitems $ctfmaps6 ]
-        showmapshot
-    ]
-    guitab 3
-    guilist [
-        guistrut 17 1
-        guilist [ guistrut 15 1; genmapitems $ctfmaps7 ]
-        guilist [ guistrut 15 1 ]
-        guilist [ guistrut 15 1 ]
-        showmapshot
-    ]
-] "ctf maps"
-
-custommaps = ""
-newgui custommaps [
-    looplist curmap $custommaps [
-        guibutton $curmap (concat map $curmap) "cube"
-    ]
-] "custom maps"
-showcustommaps = [
-    custommaps = ""
-    loopfiles curmap "packages/maps" "ogz" [
-        if (< (indexof $allmaps $curmap) 0) [
-            custommaps = (concat $custommaps (escape $curmap))
-        ]
-    ]
-    custommaps = (sortlist $custommaps x y [naturalsort $x $y])
-    showgui custommaps
-]
-
 crosshairs = [
 "data/crosshair.png data/crosshair_hit.png"
 "packages/crosshairs/crosshair_0.png packages/crosshairs/crosshair_hit_0.png"
@@ -491,577 +291,9 @@ newgui pastebuffer [
 
 pastebuffer = [showgui pastebuffer]
 
-newgui scratchpad [
-    guinoautotab [
-        guieditor "#scratchpad" -80 20
-        guistayopen [
-            guilist [
-                guibutton "exec" [textfocus "#scratchpad"; textexec]
-                guibar
-                guibutton "copy" [textfocus "#scratchpad"; textcopy]
-                guibar
-                guibutton "paste" [textfocus "#scratchpad"; textpaste]
-                guibar
-                guibutton "select" [textfocus "#scratchpad"; textselectall]
-                guibar
-                guibutton "clear" [textfocus "#scratchpad"; textclear]
-            ]
-        ]
-    ]
-]
-
-scratchpad = [showgui scratchpad]
-
 newmapsize = 12
 savemap_name = temp
 
-newgui "editing" [ ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guikeeptab 1
-
-    guibutton "toggle edit mode^t^t^f2[E]"                "edittoggle"
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guitext "select^t^t^t^t^f2[mouse-left *drag]^t"
-            guitext "extend selection^t^t^f2[mouse-right]"
-            guitext "move selection^t^t^t^f2[mouse-right *drag]"
-            guitext "deselect^t^t^t^t^f2[SPACE]"
-            guitext "select all ents in box^t^f2[keypad-ENTER]"
-        ]
-        guilist [
-            guitext "select corners^t^t^t^f2[mouse-middle *drag]"
-            guitext "reorient^t^t^t^t^f2[mouse-right]"
-            guitext "passthrough^t^t^t^f2[LCTRL *hold]"
-            guitext "center view on ent^t^t^f2[COMMA + mousewheel]"
-            guitext "select all ents matching^t^f2[N]"
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guitext "push/pull selection^t^t^f2[mousewheel]^t^t"
-            guitext "change gridsize^t^t^f2[G + mousewheel]"
-            guitext "mirror on selected axis^t^f2[X]"
-        ]
-        guilist [
-            guitext "push cube face^t^t^f2[F + mousewheel]"
-            guitext "push corner with cursor^t^f2[Q + mousewheel]"
-            guitext "rotate^t^t^t^t^f2[R + mousewheel]"
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guitext "undo^t^t^t^t^t^f2[U] [Z]^t^t^t"
-            guitext "copy^t^t^t^t^t^f2[C]"
-            guitext "delete^t^t^t^t^f2[DELETE]"
-        ]
-        guilist [
-            guitext "redo^t^t^t^t^t^f2[I]"
-            guitext "paste^t^t^t^t^f2[V]"
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guitext "change textures^t^t^f2[Y + mousewheel]^t"
-            guicheckbox "texture all faces^t^t^f2[0]"          "allfaces"
-            guicheckbox "toggle outline^t^t^t^f2[7]"           "outline"
-        ]
-        guilist [
-            guibutton "texture palette..^t^t^f2[F2]"    "showtexgui"
-            guibutton "materials.."                     "showgui materials"
-            guicheckbox "toggle wireframe^t^t^f2[8]"    "wireframe"
-        ]
-    ]
-
-guitab "ents" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guilist [
-        guilist [
-            guibutton "edit selected ent..^t^t^f2[F3]^t^t^t"   "showentgui"
-            guicheckbox "entity snap-to-grid^t^t^f2[6]"        "entselsnap"
-        ]
-        guilist [
-            guibutton "edit selected entity in console^t^f2[PERIOD]"    "selentedit"
-            guicheckbox "entity selection"                              "entediting"
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guitext "drop entities"
-    guilist [
-        guilist [
-            guiradio "at selection^t^t^t^t^t^t"             entdrop 2
-            guiradio "at selection & to the floor"          entdrop 3
-        ]
-        guilist [
-            guiradio "at current position"                  entdrop 0
-            guiradio "at current position & to the floor"   entdrop 1
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guitext "newent *"
-    guilist [
-        guilist [
-            guibutton "light..^t^t^t^t^t"           "resetlight;showgui newlight"
-            guibutton "playerstart"                 "newent playerstart"
-        ]
-        guilist [
-            guibutton "mapmodel..^t^t^f2[F4]^t^t"   "showgui mapmodels"
-            guibutton "playerstart team-1"          "newent playerstart 1"
-        ]
-        guilist [
-            guibutton "teleport.."                  "showgui newteleport"
-        ]
-    ]
-    guitext "pickup entities:"
-    guilist [
-        guilist [
-            guibutton "shells^t^t^t^t^t^t^t"    "newent shells"
-            guibutton "bullets"                 "newent bullets"
-            guibutton "rockets"                 "newent rockets"
-            guibutton "riflerounds"             "newent riflerounds"
-            guibutton "grenades"                "newent grenades"
-            guibutton "cartridges"              "newent cartridges"
-        ]
-        guilist [
-            guibutton "tinyhealth"              "newent tinyhealth"
-            guibutton "tinyarmour"              "newent tinyarmour"
-            guibutton "health"                  "newent health"
-            guibutton "healthboost"             "newent healthboost"
-            guibutton "greenarmour"             "newent greenarmour"
-            guibutton "yellowarmour"            "newent yellowarmour"
-            guibutton "quaddamage"              "newent quaddamage"
-            guibutton "select all pickup ents ^f2/findpickupents" "findpickupents"
-        ]
-    ]
-
-guitab "lighting" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guibutton "maplighting..    ^f2/maplighting"    "showgui _maplighting"
-    guibar //-------------------------------------------------------------------------
-    lightingstuff
-
-guitab "skybox" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guilist [
-        guistayopen [
-            guilist [ genskyitems $skies1 ]
-            guilist [ genskyitems $skies2 ]
-            guilist [ genskyitems $skies3 ]
-            showskyshot
-        ]
-    ]
-
-guitab "sky" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    _skyboxcolour_r = (& (>> $skyboxcolour 16) 0xFF)
-    _skyboxcolour_g = (& (>> $skyboxcolour  8) 0xFF)
-    _skyboxcolour_b = (& (>> $skyboxcolour  0) 0xFF)
-    guilist [
-        guitext "skyboxcolour                                                              "
-        guicolor $skyboxcolour
-    ]
-    guislider _skyboxcolour_r 0 255 [skyboxcolour $_skyboxcolour_r $_skyboxcolour_g $_skyboxcolour_b]
-    guislider _skyboxcolour_g 0 255 [skyboxcolour $_skyboxcolour_r $_skyboxcolour_g $_skyboxcolour_b]
-    guislider _skyboxcolour_b 0 255 [skyboxcolour $_skyboxcolour_r $_skyboxcolour_g $_skyboxcolour_b]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guitext "spinsky   "
-        guifield spinsky 5
-        guistayopen [ guibutton "- " [spinsky (+fround $spinsky -0.1)] ]
-        guistayopen [ guibutton "+"  [spinsky (+fround $spinsky 0.1)] ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guitext "yawsky"
-    guislider yawsky
-
-
-guitab "cloudlayer" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guistayopen [
-        guilist [
-            guilist [
-                guitext "cloudlayer^t^t^t^t^t^t"
-                guibutton "clouds/clouds01.png"           [cloudlayer "clouds/clouds01.png"]
-                guibutton "clouds/clouds02.png"           [cloudlayer "clouds/clouds02.png"]
-                guibutton "clouds/clouds03.png"           [cloudlayer "clouds/clouds03.png"]
-            ]
-            guilist [
-                guibutton "*no clouds*"                   [cloudlayer ""]
-                guibutton "clouds/cloud_ring.png"         [cloudlayer "clouds/cloud_ring.png"]
-            ]
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    _cloudcolour_r = (& (>> $cloudcolour 16) 0xFF)
-    _cloudcolour_g = (& (>> $cloudcolour  8) 0xFF)
-    _cloudcolour_b = (& (>> $cloudcolour  0) 0xFF)
-    guilist [
-        guitext "cloudcolour                                                              "
-        guicolor $cloudcolour
-    ]
-    guislider _cloudcolour_r 0 255 [cloudcolour $_cloudcolour_r $_cloudcolour_g $_cloudcolour_b]
-    guislider _cloudcolour_g 0 255 [cloudcolour $_cloudcolour_r $_cloudcolour_g $_cloudcolour_b]
-    guislider _cloudcolour_b 0 255 [cloudcolour $_cloudcolour_r $_cloudcolour_g $_cloudcolour_b]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guilist [
-                guitext "cloudalpha^t"
-                guifield cloudalpha 5
-                guistayopen [ guibutton "- " [cloudalpha (+fround $cloudalpha -0.05)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudalpha (+fround $cloudalpha 0.05)] ]
-            ]
-
-            guilist [
-                guitext "cloudfade^t^t"
-                guifield cloudfade 5
-                guistayopen [ guibutton "- " [cloudfade (+fround $cloudfade -0.05)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudfade (+fround $cloudfade 0.05)] ]
-            ]
-        ]
-        guilist [
-            guilist [
-                guitext "cloudheight^t"
-                guifield cloudheight 5
-                guistayopen [ guibutton "- " [cloudheight (+fround $cloudheight -0.01)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudheight (+fround $cloudheight 0.01)] ]
-            ]
-
-            guilist [
-                guitext "cloudscale^t^t"
-                guifield cloudscale 5
-                guistayopen [ guibutton "- " [cloudscale (+fround $cloudscale -0.0625)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudscale (+fround $cloudscale 0.0625)] ]
-            ]
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guilist [
-        guilist [
-            guilist [
-                guitext "cloudoffsetx^t"
-                guifield cloudoffsetx 5
-                guistayopen [ guibutton "- " [cloudoffsetx (+fround $cloudoffsetx -0.01)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudoffsetx (+fround $cloudoffsetx 0.01)] ]
-            ]
-            guilist [
-                guitext "cloudoffsety^t"
-                guifield cloudoffsety 5
-                guistayopen [ guibutton "- " [cloudoffsety (+fround $cloudoffsety -0.01)] ]
-                guistayopen [ guibutton "+"  [cloudoffsety (+fround $cloudoffsety 0.01)] ]
-            ]
-        ]
-        guilist [
-            guilist [
-                guitext "cloudscrollx^t"
-                guifield cloudscrollx 5
-                guistayopen [ guibutton "- " [cloudscrollx (+fround $cloudscrollx -0.01)] ]
-                guistayopen [ guibutton "+^t^t"  [cloudscrollx (+fround $cloudscrollx 0.01)] ]
-            ]
-            guilist [
-                guitext "cloudscrolly^t"
-                guifield cloudscrolly 5
-                guistayopen [ guibutton "- " [cloudscrolly (+fround $cloudscrolly -0.01)] ]
-                guistayopen [ guibutton "+"  [cloudscrolly (+fround $cloudscrolly 0.01)] ]
-            ]
-            guilist [
-                guitext "spincloudlayer^t"
-                guifield spincloudlayer 5
-                guistayopen [ guibutton "- " [spincloudlayer (+fround $spincloudlayer -0.1)] ]
-                guistayopen [ guibutton "+"  [spincloudlayer (+fround $spincloudlayer 0.1)] ]
-            ]
-        ]
-    ]
-
-guitab "fog" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guitext "fog"
-    guislider fog 128 8192
-    _fogcolour_r = (& (>> $fogcolour 16) 0xFF)
-    _fogcolour_g = (& (>> $fogcolour  8) 0xFF)
-    _fogcolour_b = (& (>> $fogcolour  0) 0xFF)
-    guilist [
-        guitext "fogcolour                                                              "
-        guicolor $fogcolour
-    ]
-    guislider _fogcolour_r 0 255 [fogcolour $_fogcolour_r $_fogcolour_g $_fogcolour_b]
-    guislider _fogcolour_g 0 255 [fogcolour $_fogcolour_r $_fogcolour_g $_fogcolour_b]
-    guislider _fogcolour_b 0 255 [fogcolour $_fogcolour_r $_fogcolour_g $_fogcolour_b]
-    guibar //-------------------------------------------------------------------------
-    _fogdomecolour_r = (& (>> $fogdomecolour 16) 0xFF)
-    _fogdomecolour_g = (& (>> $fogdomecolour  8) 0xFF)
-    _fogdomecolour_b = (& (>> $fogdomecolour  0) 0xFF)
-    guilist [
-        guitext "fogdomecolour  (0 = use fogcolour)                                        "
-        guicolor $fogdomecolour
-    ]
-    guislider _fogdomecolour_r 0 255 [fogdomecolour $_fogdomecolour_r $_fogdomecolour_g $_fogdomecolour_b]
-    guislider _fogdomecolour_g 0 255 [fogdomecolour $_fogdomecolour_r $_fogdomecolour_g $_fogdomecolour_b]
-    guislider _fogdomecolour_b 0 255 [fogdomecolour $_fogdomecolour_r $_fogdomecolour_g $_fogdomecolour_b]
-    guilist [
-        guilist [
-            guilist [
-                guitext "fogdomemax^t"
-                guifield fogdomemax 5
-                guistayopen [ guibutton "- " [fogdomemax (+fround $fogdomemax -0.01)] ]
-                guistayopen [ guibutton "+^t^t"  [fogdomemax (+fround $fogdomemax 0.01)] ]
-            ]
-            guilist [
-                guitext "fogdomemin^t"
-                guifield fogdomemin 5
-                guistayopen [ guibutton "- " [fogdomemin (+fround $fogdomemin -0.01)] ]
-                guistayopen [ guibutton "+"  [fogdomemin (+fround $fogdomemin 0.01)] ]
-            ]
-        ]
-        guilist [
-            guilist [
-                guitext "fogdomeclip^t"
-                guifield fogdomeclip 5
-                guistayopen [ guibutton "- " [fogdomeclip (+fround $fogdomeclip -0.01)] ]
-                guistayopen [ guibutton "+"  [fogdomeclip (+fround $fogdomeclip 0.01)] ]
-            ]
-
-            guilist [
-                guitext "fogdomeheight^t"
-                guifield fogdomeheight 5
-                guistayopen [ guibutton "- " [fogdomeheight (+fround $fogdomeheight -0.01)] ]
-                guistayopen [ guibutton "+"  [fogdomeheight (+fround $fogdomeheight 0.01)] ]
-            ]
-        ]
-    ]
-    guilist [
-        guicheckbox "fogdomecap^t^t^t^t^t^t" "fogdomecap"
-        guicheckbox "fogdomeclouds"          "fogdomeclouds"
-    ]
-
-guitab "height&blendmap" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guilist [
-        guilist [
-            guitext "toggle heightmap mode^t^t^f2[H]^t^t^t"
-            guitext "push/pull heightmap^t^t^t^f2[mousewheel]"
-        ]
-        guilist [
-            guitext "select heightmap brush^t^f2[B + mousewheel]"
-        ]
-    ]
-    guibar //-------------------------------------------------------------------------
-    guitext "blend paint mode"
-    guilist [
-        guilist [
-            guiradio "off^t^t^t^t^t^t^f2[keypad 0]^t" blendpaintmode 0
-            guiradio "dig^t^t^t^t^t^t^f2[keypad 2]" blendpaintmode 2
-            guiradio "inverted dig^t^t^t^t^f2[keypad 4]" blendpaintmode 4
-        ]
-        guilist [
-            guiradio "replace^t^t^t^t^f2[keypad 1]" blendpaintmode 1
-            guiradio "fill^t^t^t^t^t^f2[keypad 3]" blendpaintmode 3
-            guiradio "inverted fill^t^t^t^f2[keypad 5]" blendpaintmode 5
-        ]
-    ]
-    guitext "paint blendmap^t^t^t^f2[mouse-left]"
-    guibutton "change blend brush^t^t^t^f2[mousewheel]" "nextblendbrush"
-    guibutton "rotate blend brush^t^t^t^f2[mouse-right]" "rotateblendbrush"
-    guibutton "clear entire blendmap^t^t^f2/clearblendmap" "clearblendmap"
-    guibutton "clear blendmap in selection^t^f2/clearblendmapsel" "clearblendmapsel"
-
-guitab "map" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guitext   "save map:"
-    guifield  savemap_name 20 [ savemap $savemap_name ]
-    guibutton [load @savemap_name map]             "map $savemap_name"
-    guibutton "newmap (default size: 12)"          "newmap $newmapsize"
-    guislider "newmapsize" 10 16
-    guibutton "increase mapsize (2x)"              "mapenlarge"
-    guitext   "max undo size (default: 8 MB)"
-    guislider "undomegs" 1 20
-    guibutton "optimize geometry"                  "remip"
-    guibutton "set map title/author"               "saycommand [/maptitle @maptitle]"
-    guibutton "show custom maps"                   "showcustommaps"
-
-guitab "cfg" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guitext (mapcfgname)
-    showfileeditor (mapcfgname) -80 17
-]
-
-skies1 = [
-    skyboxes/black
-]
-
-genskyitems = [
-    looplist cursky $arg1 [
-        guibutton $cursky (concat skybox $cursky) //"cube"
-    ]
-]
-
-showskyshot = [
-    guibar
-    skyshotname = (checkrolloveraction "skybox " [if (> $numargs 0) [result $arg1] [at $guirollovername 0]])
-    guiimage (concatword "<thumbnail:128>packages/" $skyshotname "_ft") (checkrolloveraction "skybox ") 4 1 "data/cube.png" (chopstr $skyshotname -16 "..")
-]
-
-lightingstuff = [
-    guitext "lightprecision"
-    guilistslider lightprecision "8 16 32 48 64 128 256"
-    guitext "lightlod (>= use lightprecision, < use lightprecision/2)"
-    guislider lightlod
-    guitext "lighterror"
-    guislider lighterror
-    guitext "lightthreads"
-    guislider lightthreads
-    guilist [
-        guitext "blurskylight^t"
-        guiradio "0 " blurskylight 0
-        guiradio "1 " blurskylight 1
-        guiradio "2 " blurskylight 2
-    ]
-    guilist [
-        guitext "blurlightmaps^t"
-        guiradio "0 " blurlms 0
-        guiradio "1 " blurlms 1
-        guiradio "2 " blurlms 2
-    ]
-    guibar //-------------------------------------------------------------------------
-    guibutton "calclight 1  (slow: 8xAA)" "calclight 1"
-    guibutton "calclight -1 (quick: no AA, no model shadows)"   "calclight -1"
-    guicheckbox "fullbright  ^f2[L]" fullbright
-]
-
-maplighting = [showgui _maplighting]
-newgui _maplighting [ ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    _sunlight_r = (& (>> $sunlight 16) 0xFF)
-    _sunlight_g = (& (>> $sunlight  8) 0xFF)
-    _sunlight_b = (& (>> $sunlight  0) 0xFF)
-    guilist [
-        guitext "sunlight^t^t^t^t^t^t^t^t"
-        guicolor $sunlight
-    ]
-    guislider _sunlight_r 0 255 [sunlight $_sunlight_r $_sunlight_g $_sunlight_b]
-    guislider _sunlight_g 0 255 [sunlight $_sunlight_r $_sunlight_g $_sunlight_b]
-    guislider _sunlight_b 0 255 [sunlight $_sunlight_r $_sunlight_g $_sunlight_b]
-
-    guilist [
-        guitext "sunlightscale "
-        guifield sunlightscale 8
-    ]
-    guitext "sunlightpitch "
-    guislider sunlightpitch
-    guitext "sunlightyaw "
-    guislider sunlightyaw
-    guibutton "Get sun pitch & yaw from camera.  ^f2/getsundir" "getsundir"
-
-    guibar //-------------------------------------------------------------------------
-
-    _skylight_r = (& (>> $skylight 16) 0xFF)
-    _skylight_g = (& (>> $skylight  8) 0xFF)
-    _skylight_b = (& (>> $skylight  0) 0xFF)
-    guilist [
-        guitext "skylight^t^t^t^t^t^t^t^t"
-        guicolor $skylight
-    ]
-    guislider _skylight_r 0 255 [skylight $_skylight_r $_skylight_g $_skylight_b]
-    guislider _skylight_g 0 255 [skylight $_skylight_r $_skylight_g $_skylight_b]
-    guislider _skylight_b 0 255 [skylight $_skylight_r $_skylight_g $_skylight_b]
-
-    guibar //-------------------------------------------------------------------------
-
-    _ambient_r = (& (>> $ambient 16) 0xFF)
-    _ambient_g = (& (>> $ambient  8) 0xFF)
-    _ambient_b = (& (>> $ambient  0) 0xFF)
-    guilist [
-        guitext "ambient^t^t^t^t^t^t^t^t"
-        guicolor $ambient
-    ]
-    guislider _ambient_r 0 255 [ambient $_ambient_r $_ambient_g $_ambient_b]
-    guislider _ambient_g 0 255 [ambient $_ambient_r $_ambient_g $_ambient_b]
-    guislider _ambient_b 0 255 [ambient $_ambient_r $_ambient_g $_ambient_b]
-
-guitab "settings" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    lightingstuff
-
-] "maplighting"
-
-newgui materials [
-    guibutton "air"                        "editmat air"
-    guibutton "water"                      "editmat water"
-    guibutton "lava"                       "editmat lava"
-    guibutton "clip"                       "editmat clip"
-    guibutton "glass"                      "editmat glass"
-    guibutton "noclip"                     "editmat noclip"
-    guibutton "gameclip"                   "editmat gameclip"
-    guibutton "death"                      "editmat death"
-    guibutton "alpha"                      "editmat alpha"
-
-    guicheckbox "show material volumes"    showmat
-
-    //guibutton "waterlod very high     (3)"  "waterlod 3"
-    //guibutton "waterlod high      (2)"          "waterlod 2"
-    //guibutton "waterlod default       (1)"  "waterlod 1"
-    //guibutton "waterlod low       (0)"          "waterlod 0"
-
-    //guibutton "watersubdiv very fine  (0)"          "watersubdiv 0"
-    //guibutton "watersubdiv fine       (1)"  "watersubdiv 1"
-    //guibutton "watersubdiv default        (2)"  "watersubdiv 2"
-    //guibutton "watersubdiv coarse     (3)"  "watersubdiv 3"
-
-    //guibutton "water waves on"                     "waterwaves 1"
-    //guibutton "water waves off"                    "waterwaves 0"
-]
-
-resetlight = [
-    lightcolour = 0
-    lightbright = 1
-    lightset 255 255 255
-    lightradius = 128
-]
-
-lightset = [
-    lightr = $arg1
-    lightg = $arg2
-    lightb = $arg3
-    if (= $lightbright 0) lightscale
-]
-
-lightscale = [
-    if (= $lightbright 0) [
-        lightr = (div $lightr 2); lightg = (div $lightg 2); lightb = (div $lightb 2)
-    ] [
-        lightr = (min 255 (* $lightr 2)); lightg = (min 255 (* $lightg 2)); lightb = (min 255 (* $lightb 2))
-    ]
-]
-
-lightcmd = [
-    result (concat newent light $lightradius $lightr $lightg $lightb)
-]
-
-newgui newlight [
-    guibutton (lightcmd)
-    guibar
-    guitext "color:"
-    guicolor (+ (* (+ (* $lightr 256) $lightg) 256) $lightb)
-    guislider lightr 0 255
-    guislider lightg 0 255
-    guislider lightb 0 255
-    guilist [
-        guicheckbox "bright"    lightbright 1 0 [lightscale]
-        guibar
-        guiradio "white"        lightcolour 0 [lightset 255 255 255]
-        guiradio "blue"         lightcolour 1 [lightset 192 192 255]
-        guiradio "red"          lightcolour 2 [lightset 255 192 192]
-        guiradio "green"        lightcolour 3 [lightset 192 255 192]
-        guiradio "yellow"       lightcolour 4 [lightset 255 255 192]
-        guiradio "purple"       lightcolour 5 [lightset 255 192 255]
-        guiradio "turquoise"    lightcolour 6 [lightset 192 255 255]
-    ]
-    guitext "radius:"
-    guislider lightradius 0 512
-]
-
-newgui newteleport [
-    guibutton "newent teleport 1"
-    guibutton "newent teledest 1"
-    guibutton "newent teleport 2"
-    guibutton "newent teledest 2"
-    guibutton "newent teleport 3"
-    guibutton "newent teledest 3"
-    guibutton "newent teleport 4"
-    guibutton "newent teledest 4"
-]
-
 getmapmodels = [
     loopconcat i $nummapmodels [
         if $arg2 [ if (mapmodelloaded $i) [ $arg1 $i ] ] [ $arg1 $i ]
@@ -1097,22 +329,6 @@ newgui mapmodels [
     ]
 ]
 
-newgui postfx [
-    guibutton "(effect OFF)"            "clearpostfx"
-    guibutton "bloom (subtle: 30%)"     "bloom 0.3"
-    guibutton "bloom (bright: 55%)"     "bloom 0.55"
-    guibutton "bloom (intense: 80%)"    "bloom 0.8"
-    guibutton "rotoscope"               "rotoscope 1"
-    guibutton "rotoscope + blur3"       "rotoscope 1 1"
-    guibutton "rotoscope + blur5"       "rotoscope 1 2"
-    guibutton "sobel"                   "setpostfx sobel"
-    guibutton "invert"                  "setpostfx invert"
-    guibutton "gbr"                     "setpostfx gbr"
-    guibutton "bw"                      "setpostfx bw"
-    guibutton "blur3"                   "setpostfx hblur3; addpostfx vblur3"
-    guibutton "blur5"                   "setpostfx hblur5; addpostfx vblur5"
-]
-
 macro resbutton [
     guibutton "%1x%2" "screenres %1 %2" (if (&& (= $scr_w %1) (= $scr_h %2)) [result "radio_on"] [result "radio_off"])
 ]
@@ -1161,17 +377,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
     guitab "hud" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
     guicheckbox "show FPS" showfps
     guilist [
-        guicheckbox "wall clock" wallclock
-        if $wallclock [
-            guibar
-            guicheckbox "24 hour" wallclock24
-            guibar
-            guicheckbox "seconds" wallclocksecs
-        ]
-    ]
-    guilist [
-        guicheckbox "damage screen"     damagescreen
-        guibar
         guicheckbox "damage compass"    damagecompass
     ]
     guilist [
@@ -1196,13 +401,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
             guicheckbox "hits" hitcrosshair 425
         ]
     ]
-    guilist [
-        guicheckbox "outline capture meters" outlinemeters
-        guibar
-        guicheckbox "numbered capture bases" basenumbers
-        guibar
-        guicheckbox "show teammates" radarteammates 1
-    ]
     guibar
     guilist [
         guicheckbox "ammobar^t^t" ammobar
@@ -1228,24 +426,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
         guiradio "^f2high detail" shaderdetail 3
     ]
     guilist [
-        guitext "water^t^t"
-        guibar
-        guicheckbox "^f2refraction"  waterrefract
-        guibar
-        guicheckbox "^f3reflection"  waterreflect
-        guibar
-        guicheckbox "^f0caustics"    caustics
-        guibar
-        guicheckbox "^f2animation"   vertwater
-    ]
-    guilist [
-        guitext "waterfalls^t^t"
-        guibar
-        guicheckbox "^f2refraction" waterfallrefract
-        guibar
-        guicheckbox "^f0reflection" waterfallenv
-    ]
-    guilist [
         guicheckbox "^f3soft shadows^t"  shadowmap
         if $shadowmap [
             guibar
@@ -1256,41 +436,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
             guibar
         ]
     ]
-    if $glare [
-        glarepreset = 0
-        if (= $glarescale 1) [
-            if (= $blurglare 4) [glarepreset = 1]
-            if (= $blurglare 7) [glarepreset = 3]
-        ]
-        if (= $glarescale 2) [
-            if (= $blurglare 3) [glarepreset = 2]
-            if (= $blurglare 7) [glarepreset = 4]
-        ]
-        guilist [
-            guicheckbox "^f3glare^t^t^t"       glare
-            guibar
-            guiradio "^f2subtle" glarepreset 1 [blurglare 4; glarescale 1]
-            guibar
-            guiradio "^f2glowy" glarepreset 2 [blurglare 3; glarescale 2]
-            guibar
-            guiradio "^f3soft" glarepreset 3 [blurglare 7; glarescale 1]
-            guibar
-            guiradio "^f3intense" glarepreset 4 [blurglare 7; glarescale 2]
-        ]
-    ] [
-        guicheckbox "^f3glare"         glare
-    ]
-    guilist [
-        guicheckbox "^f3motion blur^t" motionblur
-        if $motionblur [
-            guibar
-            guiradio "^f3subtle" motionblurscale 0.5
-            guibar
-            guiradio "^f3moderate" motionblurscale 0.65
-            guibar
-            guiradio "^f3intense" motionblurscale 0.8
-        ]
-    ]
     guilist [
         guicheckbox "^f0dynamic lights^t"    maxdynlights 3 0
         if $maxdynlights [
@@ -1311,7 +456,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
             guiradio "^f3high quality" depthfxsize 12 [blurdepthfx 0]
         ]
     ]
-    guicheckbox "^f0glass reflection"  glassenv
     guilist [
         guicheckbox "^f0decals^t^t" decals
         if $decals [
@@ -1333,13 +477,11 @@ newgui options [ ///////////////////////////////////////////////////////////////
     guilist [
         guitext "models^t^t"
         guibar
-        guicheckbox "^f0reflection"  envmapmodels
-        guibar
         guicheckbox "^f2bumpmap" bumpmodels
     ]
 
     guitab "display" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    guitext "field of view (default: 100)"
+    guitext "field of view"
     guislider fov
     guicheckbox "v-sync"            vsync 1 0
     guicheckbox "fullscreen"        fullscreen
@@ -1445,7 +587,6 @@ newgui options [ ///////////////////////////////////////////////////////////////
     guilistslider soundfreq "11025 22050 44100"
     guitext "sound buffer length"
     guislider soundbufferlen
-    guicheckbox "Mumble positional audio" mumble
 
     guitab "mouse" ////////////////////////////////////////////////////////////////////////////////////////////////////////////
     guicheckbox "invert mouse"      invmouse
@@ -1672,37 +813,8 @@ newgui hudscore [
     ]
 ] "HUDScore"
 
-
 bindactions = [forward backward left right jump attack togglezoom saycommand sayteamcommand showscores toggleconsole screenshot edittoggle "setweapon FI" "setweapon SG" "setweapon CG" "setweapon RL" "setweapon RI" "setweapon GL" "setweapon PI" "weapon" "universaldelta 1" "universaldelta -1" dropflag addbot delbot]
 
-entupdate = [ entset $entguitype $entguiattr0 $entguiattr1 $entguiattr2 $entguiattr3 $entguiattr4 ]
-
-initentgui = [
-  entguitype = (enttype)
-  @(loopconcat i 5 [result [
-    entguiattr@i = (entattr @i)
-  ]])
-]
-
-genentattributes = [
-    entattributes = (loopconcat i (listlen $arg2) [
-        entattribname = (at $arg2 $i)
-        entattriblimits = (at $arg3 (* 2 $i))
-        entattriblimits2 = (at $arg3 (+ 1 (* 2 $i)))
-        if (=s (at $entattriblimits 0) $entattriblimits) [
-            result [
-                guitext @entattribname
-                guislider entguiattr@i @entattriblimits @entattriblimits2 entupdate
-            ]
-        ] [
-            result [
-                guitext @entattribname
-                guinameslider entguiattr@i [@@entattriblimits] [@@entattriblimits2] entupdate
-            ]
-        ]
-    ])
-]
-
 guilistsplit = [
   guilist [
     z = (div (+ (listlen $arg3) (- $arg2 1)) $arg2)
@@ -1717,117 +829,3 @@ guilistsplit = [
     ]
   ]
 ]
-
-quickeditmenu = [
-  guitext "Quick Commands:"
-  guibar
-  guifield  savemap_name 10 [ savemap $savemap_name ]
-  guibutton "quick light"       "calclight -1"
-  guibutton "optimize map"      "remip"
-  guibutton "new entity"        "newent shells"
-  guibar
-  guibutton newmap
-  guibar
-  guibutton help "showgui editing"
-]
-
-matmenu = [
-    guibutton "air"                        "editmat air"
-    guibutton "water"                      "editmat water"
-    guibutton "lava"                       "editmat lava"
-    guibutton "clip"                       "editmat clip"
-    guibutton "glass"                      "editmat glass"
-    guibutton "noclip"                     "editmat noclip"
-    guibutton "gameclip"                   "editmat gameclip"
-    guibutton "death"                      "editmat death"
-    guibutton "alpha"                      "editmat alpha"
-    guicheckbox "show material volumes"    showmat
-]
-
-brushmenu = [
-  guilist [ // diamonds
-  guiimage "packages/icons/brush_1c.png" brush_0
-  guiimage "packages/icons/brush_21c.png" brush_1
-  guiimage "packages/icons/brush_421c.png" brush_2
-  ]
-  guilist [ // squares
-  guiimage "packages/icons/brush_3s.png" brush_3
-  guiimage "packages/icons/brush_5s.png" brush_4
-  guiimage "packages/icons/brush_7s.png" brush_5
-  ]
-  guititle smooth
-  guilist [ // smooth
-  guiimage "packages/icons/brush_3s.png" brush_6
-  guiimage "packages/icons/brush_5s.png" brush_7
-  guiimage "packages/icons/brush_7s.png" brush_8
-  ]
-]
-
-newentgui = [
-  genentattributes $arg1 $arg2 $arg3
-  newgui $arg1 [
-    guitext $entguitype
-    guibar
-    @entattributes
-    guitab type
-    guilistsplit n 2 $enttypelist [
-        guibutton $n [ entset @n ]
-    ]
-    guitab misc
-    @quickeditmenu
-  ] "" [initentgui]
-]
-
-looplist i $enttypelist [
-  newentgui $i "" ""
-]
-
-newgui materials [
-  @matmenu
-  guitab misc
-  @quickeditmenu
-]
-
-newgui brushes [
-  @brushmenu
-  guitab misc
-  @quickeditmenu
-]
-
-newgui quickedit [
-  @quickeditmenu
-  guitab materials
-  @matmenu
-]
-
-newentgui light "radius red green blue" "1 400 0 255 0 255 0 255"
-newentgui spotlight "radius" "0 200"
-newentgui playerstart "direction" "0 360"
-newentgui teleport "tag" "0 20"
-newentgui teledest "direction tag" "0 360 0 20"
-newentgui monster "direction type" "0 360 0 7"
-newentgui mapmodel "direction model" "0 360 0 372"
-newentgui envmap "radius" "0 512"
-newentgui jumppad "Z Y X" "-128 128 -128 127 -128 127"
-newentgui sound "type radius size" "0 20 0 500 0 500"
-newentgui particles "type" "0 13"
-
-contexteditgui = [
-    if $hmapedit [showgui brushes] [
-        if (enthavesel) [
-            showgui (enttype)
-        ] [showgui (? (havesel) materials quickedit)]
-    ]
-]
-
-showentgui = [ contexteditgui ] // legacy bind
-
-newgui seltexinfo [
-    guitext (concatword "Slot: " (getseltex))
-    guilist [ loop x 5 [
-        texname = (gettexname (getseltex) $x)
-        texname = (substr $texname (+ (strstr $texname ">") 1)) // chop off any leading commands
-        guiimage (concatword "packages/" $texname) "" 1 1
-    ]]
-    loop x 5 [ tex = (gettexname (getseltex) $x); if (strcmp $tex "") [] [guitext $tex]]
-]
diff --git a/data/stdedit.cfg b/data/stdedit.cfg
index 6d99574..5a319cc 100644
--- a/data/stdedit.cfg
+++ b/data/stdedit.cfg
@@ -1,7 +1,5 @@
-
 // implements some editing commands
 
-
 //////// Entity Editing ///////////////
 
 =enttype = [
@@ -46,15 +44,11 @@ entproperty = [
 ]
 
 enttypelist = [
-  light mapmodel playerstart envmap particles sound
+  light mapmodel playerstart particles sound
   shells bullets rockets riflerounds grenades cartridges
-  health healthboost greenarmour yellowarmour quaddamage
-  teleport teledest
-  monster carrot jumppad
-  base respawnpoint
+  health healthboost tinyhealth tinyarmour greenarmour yellowarmour quaddamage
+  teleport teledest jumppad
   spotlight
-  box barrel platform elevator
-  flag
 ]
 
 enttypeselect = [
@@ -66,35 +60,15 @@ enttypeselect = [
 
 ////// Entity primary actions /////////
 
-ent_action_base           = [ entproperty 0 ( * $arg1 1 ) ]
 ent_action_teleport       = [ entproperty 0 ( * $arg1 1 ) ]
 ent_action_teledest       = [ entproperty 1 ( * $arg1 1 ) ]
 ent_action_mapmodel       = [ entproperty 1 ( * $arg1 1 ) ]
 ent_action_spotlight      = [ entproperty 0 ( * $arg1 5 ) ]
 ent_action_light          = [ entproperty 0 ( * $arg1 5 ) ]
 ent_action_jumppad        = [ entproperty 0 ( * $arg1 5 ) ]
-ent_action_respawnpoint   = [ entproperty 0 ( * $arg1 15 ) ]
 ent_action_playerstart    = [ entproperty 0 ( * $arg1 15 ) ]
-ent_action_envmap         = [ entproperty 0 ( * $arg1 5 ) ]
 ent_action_particles      = [ entproperty 0 ( * $arg1 1 ) ]
 ent_action_sound          = [ entproperty 0 ( * $arg1 1 ) ]
-ent_action_cycle          = [ entset ( if ( > $arg1 -1 ) [ result $arg2 ] [ result $arg3 ] ) ]
-ent_action_shells         = [ ent_action_cycle $arg1 bullets quaddamage ]
-ent_action_bullets        = [ ent_action_cycle $arg1 rockets shells ]
-ent_action_rockets        = [ ent_action_cycle $arg1 riflerounds bullets ]
-ent_action_riflerounds    = [ ent_action_cycle $arg1 grenades rockets ]
-ent_action_grenades       = [ ent_action_cycle $arg1 cartridges riflerounds ]
-ent_action_cartridges     = [ ent_action_cycle $arg1 quaddamage grenades ]
-ent_action_quaddamage     = [ ent_action_cycle $arg1 shells cartridges ]
-ent_action_health         = [ ent_action_cycle $arg1 healthboost yellowarmour ]
-ent_action_healthboost    = [ ent_action_cycle $arg1 greenarmour health ]
-ent_action_greenarmour    = [ ent_action_cycle $arg1 yellowarmour healthboost ]
-ent_action_yellowarmour   = [ ent_action_cycle $arg1 health greenarmour ]
-ent_action_monster        = [ entproperty 1 ( * $arg1 1 ) ]
-ent_action_box            = [ entproperty 1 ( * $arg1 1 ) ]
-ent_action_barrel         = [ entproperty 1 ( * $arg1 1 ) ]
-ent_action_platform       = [ entproperty 1 ( * $arg1 1 ) ]
-ent_action_elevator       = [ entproperty 1 ( * $arg1 1 ) ]
 
 //////// Copy and Paste //////////////
 
@@ -144,7 +118,7 @@ editpaste  = [
 
 // select ents with given properties
 // '*' is wildcard
-entfind    = [
+entfind = [
   if (= $numargs 0) [
     entselect 1
   ] [
@@ -164,7 +138,7 @@ entfindinsel = [
   ]
 ]
 
-lse        = [
+lse = [
   line = ""
   count = 0
   entloop [
@@ -185,7 +159,7 @@ corners    = [ selectcorners 1; dragging 1; onrelease [ selectcorners 0; draggin
 editmove   = [ moving 1; onrelease [ moving 0 ]; result $moving ]
 entdrag    = [ entmoving 1; onrelease [entmoving 0]; result $entmoving ]
 editdrag   = [ cancelsel; || [entdrag] [ drag ] ]
-selcorners = [ if $hmapedit [ hmapselect ] [ cancelsel; || [entdrag] [ corners ] ] ]
+selcorners = [ cancelsel; || [entdrag] [ corners ] ]
 editextend = [ || [entdrag] [ selextend; reorient; editmove ] ]
 
 editmovewith    = [
@@ -216,7 +190,7 @@ editfacewentpush = [
   ]
 ]
 
-entswithdirection = "playerstart teledest mapmodel flag monster box barrel platform elevator"
+entswithdirection = "playerstart teledest mapmodel"
 
 entdirection = [
   if ( && [enthavesel] [ = (havesel) 0 ] ) [
@@ -271,15 +245,6 @@ edithud = [
       )(
         if $dropwaypoints [format "^f0dropwaypoints"][]
       )(
-        if $hmapedit [format "brush^f2 %1 ^f7:^f2 %2^n" $brushindex $brushname] [
-            if $blendpaintmode [
-                format "blendpaint mode: ^f2%1^f7^nblend brush: ^f2%2^n" (at $blendpaintmodes $blendpaintmode) (getblendbrushname (curblendbrush))
-            ] [if (! (enthavesel)) [
-                texnum = (? (>= $texguinum 0) $texguinum (getseltex))
-                format "^f2%1 ^f7:^f2 %2^n" (max 0 $texnum) (gettexname $texnum)
-            ]]
-        ]
-      )(
         if (enthavesel) [concat (entget) ":^f2" (enthavesel) "^f7selected^n"]
       )
 ]
@@ -289,33 +254,14 @@ entcomplete newent
 entcomplete entfind
 entcomplete clearents
 
-listcomplete editmat "air water clip glass noclip lava gameclip death alpha"
+listcomplete editmat "air clip noclip gameclip death alpha"
 air = [ editmat air $arg1 ]
-loop i 4 [
-    [water@(? $i (+ $i 1))] = [ editmat water@(? $i (+ $i 1)) $arg1 ]
-    [lava@(? $i (+ $i 1))] = [ editmat lava@(? $i (+ $i 1)) $arg1 ]
-    [glass@(? $i (+ $i 1))] = [ editmat glass@(? $i (+ $i 1)) $arg1 ]
-]
 clip = [ editmat clip $arg1 ]
 noclip = [ editmat noclip $arg1 ]
 gameclip = [ editmat gameclip $arg1 ]
 death = [ editmat death $arg1 ]
 alpha = [ editmat alpha $arg1 ]
 
-blendpaintmodes = ["off" "replace" "dig" "fill" "inverted dig" "inverted fill"]
-setblendpaintmode = [
-    if (> $numargs 0) [blendpaintmode $arg1] [blendpaintmode 0]
-    echo "blend paint mode set to:" (at $blendpaintmodes $blendpaintmode)
-]
-scrollblendbrush = [
-    if (> $numargs 0) [nextblendbrush $arg1] [nextblendbrush]
-    echo "blend brush set to:" (getblendbrushname (curblendbrush))
-]
-
-minimaphere = [minimapheight (at (getcampos) 2)]
-
-getsundir = [sunlightyaw (getcamyaw); sunlightpitch (getcampitch)]
-
 echovcolor  = [echo ***vcolor  (getvcolor  $getseltex)]
 echovrotate = [echo ***vrotate (getvrotate $getseltex)]
 echovoffset = [echo ***voffset (getvoffset $getseltex)]
@@ -323,27 +269,3 @@ echovscroll = [echo ***vscroll (getvscroll $getseltex)]
 echovscale  = [echo ***vscale  (getvscale  $getseltex)]
 echovlayer  = [echo ***vlayer  (getvlayer  $getseltex)]
 echovalpha  = [echo ***valpha  (getvalpha  $getseltex)]
-
-// echovshaderparamname = [echo (getvshaderparamnames $getseltex)] // Echoes the name of altered vshaderparam, if used.  Only works with vshaderparam, not params set in map.cfg
-echovshaderparam     = [echo ***vshaderparam (getvshaderparamnames $getseltex) (getvshaderparam $getseltex (getvshaderparamnames $getseltex))] // Only works with vshaderparam, not params set in map.cfg
-// echovshaderparamenvscale       = [echo ***shaderparam envscale       (getvshaderparam $getseltex envscale)]
-// echovshaderparamglowcolor      = [echo ***shaderparam glowcolor      (getvshaderparam $getseltex glowcolor)]
-// echovshaderparamparallaxscale  = [echo ***shaderparam parallaxscale  (getvshaderparam $getseltex parallaxscale)]
-// echovshaderparampulseglowcolor = [echo ***shaderparam pulseglowcolor (getvshaderparam $getseltex pulseglowcolor)]
-// echovshaderparampulseglowspeed = [echo ***shaderparam pulseglowspeed (getvshaderparam $getseltex pulseglowspeed)]
-// echovshaderparampulsespeed     = [echo ***shaderparam pulsespeed     (getvshaderparam $getseltex pulsespeed)]
-// echovshaderparamspecscale      = [echo ***shaderparam specscale      (getvshaderparam $getseltex specscale)]
-
-findpickupents = [entfind shells;entfind bullets;entfind rockets;entfind riflerounds;entfind grenades;entfind cartridges;entfind greenarmour;entfind yellowarmour;entfind health;entfind healthboost;entfind quaddamage;]
-
-prettysky = [
-    skybox "skyboxes/remus/sky01"
-    ambient 25 21 23
-    skylight 148 153 163
-    blurskylight 2
-    sunlight 255 252 250
-    sunlightscale 1.3
-    sunlightpitch 43
-    sunlightyaw 53
-]
-
diff --git a/data/stdlib.cfg b/data/stdlib.cfg
index 46e2517..bd7507c 100644
--- a/data/stdlib.cfg
+++ b/data/stdlib.cfg
@@ -46,14 +46,3 @@ editbindmod = [
 ]
 
 quine = [ echo (format "quine = [%1]" $quine) ]
-
-loadsky = [
-    skybox $arg1
-    if (> $numargs 1) [
-        spinsky $arg2
-    ] [
-        if (!=f $spinsky 0) [spinsky 0]
-    ]
-]
-
-mapmsg = [ maptitle $arg1 ]
author	xolatile	2025-08-05 10:40:01 +0200
committer	xolatile	2025-08-05 10:40:01 +0200
commit	a2a16b85572b1d28b0cd4901ea7348750732a740 (patch)
tree	6287cdf8331e821f9fe1e0adadc664a59634a812 /data
parent	6762e292d02e37a69a807e01493d4e14319cca33 (diff)
download	xolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.xz xolatile-badassbug-a2a16b85572b1d28b0cd4901ea7348750732a740.tar.zst