From ee18d192ebb06a91b95d803bee235f8c9d9ff905 Mon Sep 17 00:00:00 2001 From: ac-stef Date: Fri, 22 May 2015 14:03:02 +0200 Subject: [PATCH] introduce second edit meta key (LSHIFT) and use it to enable unscaled editing of entity attributes (first editmeta key is still LCTRL - but it is already used during editing entity attributes to provide 10x speed) --- config/resetbinds.cfg | 2 ++ config/scripts.cfg | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg index 4eb75547..61d3f4f0 100644 --- a/config/resetbinds.cfg +++ b/config/resetbinds.cfg @@ -21,6 +21,7 @@ alias key_voteno [ if $votepending [ && (vote 2) (echo you voted no) ] ] alias key_teamchat [ saycommand % ] alias key_commandline [ saycommand / ] alias key_prevweapon [ weapon (prevweapon) ] +alias key_editmeta2 [ editmeta2down = 1 ; onrelease [ editmeta2down = 0 ] ] bind MOUSE1 attack bind MOUSE2 altaction @@ -193,6 +194,7 @@ bind CAPSLOCK [] bind SCROLLOCK [] bind RSHIFT [] bind LSHIFT crouch +editbind LSHIFT key_editmeta2 bind RCTRL jump editbind RCTRL [] bind LCTRL [] diff --git a/config/scripts.cfg b/config/scripts.cfg index 6e1262b2..419623ef 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -223,6 +223,7 @@ delta_spect_0 = [ changefollowplayer $arg1 ] // Map editing using the mousewheel... tempalias modifier 0 +tempalias _editmeta2down 0 const domodifier [ modifier = $arg1; onrelease [ modifier = 0 ] ] const universaldelta [ @@ -245,13 +246,13 @@ delta_edit_4 = [ equalize $flrceil ] // Equalize floor/ceiling... delta_edit_6 = [ entproperty $editaxis $arg1 ] // Move map entity... delta_edit_10 = [ if (checkrange (+f $flyspeed (divf $arg1 4)) 1 5) [ flyspeed (+f $flyspeed (divf $arg1 4)); echo $flyspeed ] ] // Tweak flyspeed delta_edit_11 = [ if (> $arg1 0) [ expandselection 1 ] [ shrinkselection 1 ] ] // Expand/shrink the current selection -delta_edit_attr1 = [ entproperty 0 $arg2 ] // Changes the first value on entities... -delta_edit_attr2 = [ entproperty 1 $arg2 ] // Changes the second value on entities... -delta_edit_attr3 = [ entproperty 2 $arg2 ] // Changes the third value on entities... -delta_edit_attr4 = [ entproperty 3 $arg2 ] // Changes the fourth value on entities... -delta_edit_attr5 = [ entproperty 4 $arg2 ] // Changes the fifth value on entities... -delta_edit_attr6 = [ entproperty 5 $arg2 ] // Changes the sixth value on entities... -delta_edit_attr7 = [ entproperty 6 $arg2 ] // Changes the seventh value on entities... +delta_edit_attr1 = [ entproperty 0 $arg2 $editmeta2down ] // Changes the first value on entities... +delta_edit_attr2 = [ entproperty 1 $arg2 $editmeta2down ] // Changes the second value on entities... +delta_edit_attr3 = [ entproperty 2 $arg2 $editmeta2down ] // Changes the third value on entities... +delta_edit_attr4 = [ entproperty 3 $arg2 $editmeta2down ] // Changes the fourth value on entities... +delta_edit_attr5 = [ entproperty 4 $arg2 $editmeta2down ] // Changes the fifth value on entities... +delta_edit_attr6 = [ entproperty 5 $arg2 $editmeta2down ] // Changes the sixth value on entities... +delta_edit_attr7 = [ entproperty 6 $arg2 $editmeta2down ] // Changes the seventh value on entities... // HUD toggles const toggleshowmap [ showmap 1; onrelease [ showmap 0 ] ]