reorder some aliases

1 files changed, 26 insertions, 36 deletions

diff --git a/bindings-aliases.cfg b/bindings-aliases.cfg
index 6dcc2a4..38cf0d6 100644
--- a/bindings-aliases.cfg
+++ b/bindings-aliases.cfg
@@ -1,3 +1,17 @@
+// Simple toggles per keybind
+alias +cleanattack    "+attack"
+alias -cleanattack    "-attack; r_cleardecals"
+alias +crosshairmax   "cl_crosshair_sniper_width 1; cl_crosshairsize 1337; cl_crosshairgap 10;"
+alias -crosshairmax   "exec bindings-crosshair"
+alias +duckjump       "+jump; +duck";
+alias -duckjump       "-jump; -duck";
+alias +jumpthrow      "+JUMP; -ATTACK; -ATTACK2; cast_ray"
+alias -jumpthrow      "-JUMP"
+alias +score_netgraph "+showscores; net_graph 1;" // cl_showpos 1 //; r_cleardecals
+alias -score_netgraph "-showscores; net_graph 0;" // cl_showpos 0
+alias +zoomedoutradar "cl_radar_scale 0.3; cl_radar_always_centered 0";
+alias -zoomedoutradar "cl_radar_scale 0.5; cl_radar_always_centered 1";
+
 // Volume + Microphone
 alias "+mic"    "volume 0.01; +voicerecord"
 alias "-mic"    "-voicerecord; volume_c"
@@ -11,48 +25,30 @@ alias volume_2 "volume 0.05; echo "Volume |-+---|"; alias volume_c "volume_2"; a
 alias volume_1 "volume 0.02; echo "Volume |+----|"; alias volume_c "volume_1"; alias volume_up "volume_2"; alias volume_down "volume_0""
 alias volume_0 "volume 0;    echo "Volume |-OFF-|"; alias volume_c "volume_0"; alias volume_up "volume_1"; alias volume_down "volume_0""
 
+alias "fdefault" "con_filter_text "-"; con_filter_text_out "Player""
+alias "fvotes"   "con_filter_text "Votes"; con_filter_text_out """
+alias "fmap"     "con_filter_text "game:map"; con_filter_text_out "game:mapgroupname""
+alias "fdamage"  "con_filter_text "Damage Given"; con_filter_text_out "Player:""
+
 // Clutch-Mode
 alias togglevoice voiceoff
-alias voiceoff "voiceecho; echo "Voice-Off"; gameinstructor_enable 1; incrementvar snd_musicvolume 0 0.2 -0.05; incrementvar volume 0 0.6  0.1; voice_scale 0; ignorerad; ignoremsg; ignoremsg; ignoremsg; cl_clearhinthistory; alias togglevoice voiceon;  play buttons/blip1.wav;"
-alias voiceon  "voiceecho; echo "Voice-On";  gameinstructor_enable 0; incrementvar snd_musicvolume 0 0.2  0.05; incrementvar volume 0 0.6 -0.1; voice_scale 1; ignorerad; ignoremsg;                                 alias togglevoice voiceoff; play buttons/bell1.wav;"
+alias voiceoff "voiceecho; echo "Voice-Off"; say_team "[Clutchmode ON]";  gameinstructor_enable 1; incrementvar snd_musicvolume 0 0.2 -0.05; incrementvar volume 0 0.6  0.1; voice_scale 0; ignorerad; ignoremsg; ignoremsg; ignoremsg; cl_clearhinthistory; alias togglevoice voiceon;  play buttons/blip1.wav;"
+alias voiceon  "voiceecho; echo "Voice-On";  say_team "[Clutchmode OFF]"; gameinstructor_enable 0; incrementvar snd_musicvolume 0 0.2  0.05; incrementvar volume 0 0.6 -0.1; voice_scale 1; ignorerad; ignoremsg;                                            alias togglevoice voiceoff; play buttons/bell1.wav;"
 
 alias soundboard_c   "soundboard_on"
 alias soundboard_on  "voice_loopback 1; voice_inputfromfile 1; +voicerecord; alias soundboard_c soundboard_off"
 alias soundboard_off "voice_loopback 0; voice_inputfromfile 0; -voicerecord; alias soundboard_c soundboard_on"
-alias +soundboard "voice_loopback 1; voice_inputfromfile 1; +voicerecord"
-alias -soundboard "voice_loopback 0; voice_inputfromfile 0; -voicerecord"
+alias +soundboard    "voice_loopback 1; voice_inputfromfile 1; +voicerecord"
+alias -soundboard    "voice_loopback 0; voice_inputfromfile 0; -voicerecord"
 
 alias toggleafk "afk"
 alias       afk "+forward; +left; +speed; +duck; +lookatweapon; volume 0; alias toggleafk noafk"
 alias     noafk "-forward; -left; -speed; -duck; -lookatweapon; volume_c; alias toggleafk   afk"
 
-alias "fdefault" "con_filter_text "-"; con_filter_text_out "Player""
-alias "fvotes"   "con_filter_text "Votes"; con_filter_text_out """
-alias "fmap"     "con_filter_text "game:map"; con_filter_text_out "game:mapgroupname""
-alias "fdamage"  "con_filter_text "Damage Given"; con_filter_text_out "Player:""
-
 alias togglehands handsleft
 alias handsleft   "cl_righthand 0; alias togglehands handsright;"
 alias handsright  "cl_righthand 1; alias togglehands handsleft;"
 
-alias +jumpthrow "+JUMP; -ATTACK; -ATTACK2; cast_ray"
-alias -jumpthrow "-JUMP"
-
-alias "+score_netgraph" "+showscores; net_graph 1;" // cl_showpos 1 //; r_cleardecals
-alias "-score_netgraph" "-showscores; net_graph 0;" // cl_showpos 0
-
-alias "+crosshairmax" "cl_crosshair_sniper_width 1 ;cl_crosshairsize 1337; cl_crosshairgap 10;"
-alias "-crosshairmax" "exec bindings-crosshair"
-
-alias +cleanattack "+attack"
-alias -cleanattack "-attack; r_cleardecals"
-
-alias +duckjump "+jump; +duck";
-alias -duckjump "-jump; -duck";
-
-alias "+zoomedoutradar" "cl_radar_scale 0.3; cl_radar_always_centered 0";
-alias "-zoomedoutradar" "cl_radar_scale 0.5; cl_radar_always_centered 1";
-
 // Funny scripting
 alias yes_c yes_1
 alias yes_1 "alias yes_c yes_2; say Yes."
@@ -87,7 +83,6 @@ alias "banana" "prop_physics_create /props/cs_italy/bananna.mdl"
 
 // Faster clan access
 alias clans "echo 30fps arch beer gog hax linux rlinux naked overwatcher panda pebcak penguins pixel terrager trilluxe wine"
-alias noclan      "cl_clanid 0"
 alias 30fps       "cl_clanid 9393382"
 alias arch        "cl_clanid 123696"
 alias beer        "cl_clanid 532945"
@@ -95,6 +90,7 @@ alias gog         "cl_clanid 505263"
 alias hax         "cl_clanid 1188"
 alias linux       "cl_clanid 6856810"
 alias naked       "cl_clanid 4819367"
+alias noclan      "cl_clanid 0"
 alias noobs       "cl_clanid 3911289"
 alias overwatcher "cl_clanid 4779230"
 alias panda       "cl_clanid 2444451"
@@ -107,13 +103,7 @@ alias trilluxe    "cl_clanid 5154531"
 alias wine        "cl_clanid 214135"
 alias zeus        "cl_clanid 10167451"
 
-// Faster loading my bindings
-alias test          "exec bindings-test"
-alias demobindings  "exec bindings-demo"
-alias arenabindings "exec bindings-arena"
-alias fixaudio      "sdl_speaker_channels 6; sdl_speaker_channels 2"
-
-// Damn you volvo bringing a new command quest_blablabla...q<tab> won't work anymore
-alias q quit
+alias train    "unbind ctrl; bind f +duck" // need to get this into my head...
+alias fixaudio "sdl_speaker_channels 6; sdl_speaker_channels 2"
 
 // vim: commentstring=//\ %s