Few more changes, please do not compile...

1 files changed, 8 insertions, 86 deletions

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
-]
-