diff --git a/config/resetbinds.cfg b/config/resetbinds.cfg index 13bf177b..2e10e012 100644 --- a/config/resetbinds.cfg +++ b/config/resetbinds.cfg @@ -111,8 +111,8 @@ bind "F1" [ && (vote 1) (echo you voted yes) ] bind "F2" [ && (vote 2) (echo you voted no) ] bind F3 "" bind F4 "" -bind F5 "if $editing [ toggleocull ]" -bind F6 "if $editing [ showmip ]" +bind F5 [ if $editing [ toggleocull ] [ domodifier 1 ] ] +bind F6 [ if $editing [ showmip ] [ domodifier 2 ] ] bind F7 [ if $editing [ if $fullbright [ fullbright 0 ] [ fullbright 1 ] ] ] bind F8 "" bind F9 "" diff --git a/config/scripts.cfg b/config/scripts.cfg index 090bb448..8f5ab547 100644 --- a/config/scripts.cfg +++ b/config/scripts.cfg @@ -136,6 +136,9 @@ grenades = [ weapon 8 ] altaction = [ (concatword altaction_ (curweapon)) ] +checkmag = [ if (|| (magcontent $arg1) (magreserve $arg1)) [ result 1 ] [ result 0 ] ] +checkrange = [ if (&& (>= $arg1 $arg2) (<= $arg1 $arg3)) [ result 1 ] [ result 0 ] ] + quicknadethrow_old = [ if (> (magcontent 8) 0) [ if (!= (curweapon) 7) [ grenades ] @@ -145,6 +148,7 @@ quicknadethrow_old = [ ] loop i 10 [ (concatword altaction_ $i) = quicknadethrow ] // Quick nade throw is default +// altaction_0 = [ if (checkmag (currentprimary)) [ primary ] [ if (|| (checkmag 1) (checkmag 9)) [ secondary ] [ if (checkmag 8) [ grenades ] ] ] ] // Knife // uncomment to switch to primary/secondary/grenades with MOUSE2 depending on ammo content for each. altaction_5 = [ setscope 1; onrelease [ setscope 0 ] ] // Sniper // altaction_7 = [ setburst 1; onrelease [ setburst 0 ] ] // Combat pistol // TODO uncomment when this becomes a priority/testing, for now lets save an unused alias - Bukz // altaction_8 = [ attack ] // Grenade // with this comment, you throw the nade and the nade is unselected : Brahma @@ -164,6 +168,8 @@ zoom = [ ] delta_game_0 = [ if (= $arg1 1) [ shiftweapon 1 ] [ shiftweapon -1 ] ] +delta_game_1 = [ if (checkrange (+ $gamma $arg1) 30 300) [ gamma (+ $gamma $arg1) ] ] +delta_game_2 = [ if (checkrange (+ $fov $arg1) 75 120) [ fov (+ $fov $arg1) ] ] delta_spect_0 = [ changefollowplayer $arg1 ] // Map editing using the mousewheel... @@ -190,7 +196,7 @@ delta_edit_5 = [ entproperty 0 $arg1 ] // Changes the first value on entitie delta_edit_6 = [ entproperty $editaxis $arg1 ] // Move map entity... delta_edit_7 = [ entproperty 1 $arg1 ] // Changes the second value on entities... delta_edit_8 = [ entproperty 2 $arg1 ] // Changes the third value on entities... -delta_edit_9 = [ entproperty 3 $arg1 ] // Changes the fourth value on entities... +delta_edit_9 = [ entproperty 3 $arg1 ] // Changes the fourth value on entities...ss // HUD toggles toggleshowmap = [ showmap 1; onrelease [ showmap 0 ] ]