Modify a bunch of aliases and settings

3 files changed, 18 insertions, 67 deletions

diff --git a/bindings-aliases.cfg b/bindings-aliases.cfg
index 869e732..79fce12 100755
--- a/bindings-aliases.cfg
+++ b/bindings-aliases.cfg
@@ -22,24 +22,13 @@ alias "+mic"    "volume 0.01; +voicerecord"
 alias "-mic"    "-voicerecord; volume_c"
 // alias "+mic"   "+voicerecord"
 // alias "-mic"   "-voicerecord"
-alias volume_up "incrementvar volume 0 1 0.1; volume"
-alias volume_down "incrementvar volume 0 1 -0.1; volume"
-
-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 volume_up "incrementvar volume 0 1 0.2; volume"
+alias volume_down "incrementvar volume 0 1 -0.2; volume"
 
 // 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 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 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 toggleafk "afk"
 alias       afk "+forward; +left; +speed; +duck; +lookatweapon; volume 0; alias toggleafk noafk"
@@ -49,37 +38,7 @@ alias togglehands handsleft
 alias handsleft   "cl_righthand 0; alias togglehands handsright;"
 alias handsright  "cl_righthand 1; alias togglehands handsleft;"
 
-// Funny scripting
-alias yes_c yes_1
-alias yes_1 "alias yes_c yes_2; say Yes."
-alias yes_2 "alias yes_c yes_3; say Affirmative."
-alias yes_3 "alias yes_c yes_4; say Roger that."
-alias yes_4 "alias yes_c yes_5; say Ja."
-alias yes_5 "alias yes_c yes_6; say Immers."
-alias yes_6 "alias yes_c yes_1; say Da."
-
-alias no_c no_1
-alias no_1 "alias no_c no_2; say No."
-alias no_2 "alias no_c no_3; say Negative."
-alias no_3 "alias no_c no_4; say Nah."
-alias no_4 "alias no_c no_5; say Nein."
-alias no_5 "alias no_c no_6; say Nie!"
-alias no_6 "alias no_c no_7; say Nay."
-alias no_7 "alias no_c no_1; say Negatory."
-
-alias maybe_c maybe_1
-alias maybe_1 "alias maybe_c maybe_2; say Maybe."
-alias maybe_2 "alias maybe_c maybe_3; say Perhaps."
-alias maybe_3 "alias maybe_c maybe_4; say Possibly."
-alias maybe_4 "alias maybe_c maybe_5; say Conceivably."
-alias maybe_5 "alias maybe_c maybe_1; say Perchance."
-
-alias gg_c gg_1
-alias gg_1 "alias gg_c gg_2; say Good Luck and Have Fun!"
-alias gg_2 "alias gg_c gg_3; say Good Half!"
-alias gg_3 "alias gg_c gg_1; say Good Game! Well Played!"
-
-alias "banana" "prop_physics_create /props/cs_italy/bananna.mdl"
+// 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"
@@ -103,9 +62,6 @@ alias trilluxe    "cl_clanid 5154531"
 alias wine        "cl_clanid 214135"
 alias zeus        "cl_clanid 10167451"
 
-alias dc       "disconnect"
-alias train    "unbind ctrl; bind f +duck" // need to get this into my head...
-
 alias "hmretake"  "connect 213.239.211.57:4008"
 alias "hm1on1"  "connect 213.239.211.57:4007"
 
diff --git a/bindings-normal.cfg b/bindings-normal.cfg
index 086137d..1fb0a31 100755
--- a/bindings-normal.cfg
+++ b/bindings-normal.cfg
@@ -14,7 +14,6 @@ bind "0" "slot10"
 
 bind "ESCAPE" "cancelselect"
 bind "ALT"       "+chshift; r_cleardecals;"
-// bind "BACKSPACE" "soundboard_c"
 bind "BACKSPACE" "teammenu"
 bind "CTRL"      "+duck"
 bind "RCTRL"     "toggleafk"
@@ -59,11 +58,8 @@ bind "["        "exec bindings-demo"
 bind "]"        "exec bindings"
 bind "."        "volume_up"
 bind ","        "volume_down"
-bind "-"        "togglevoice"
-bind "capslock" "togglevoice"
-
-// bind "PGUP" "roger; yes_c"
-// bind "PGDN" "negative; no_c"
+bind "-"        "clutch_mode_toggle"
+bind "capslock" "clutch_mode_toggle"
 
 bind "PGUP" "invnext"
 bind "PGDN" "invprev"
@@ -79,7 +75,6 @@ bind "MOUSE3"      "compliment" //fallback"
 bind "MOUSE4"      "+voicerecord"
 bind "MOUSE5"      "+jumpthrow" //fallback"
 // bind "MOUSE4"      "+jumpthrow"
-// bind "MOUSE5"      "maybe_c"
 bind "MWHEELUP"    ""
 bind "MWHEELDOWN"  "+jump"
 bind "KP_MULTIPLY" "+voicerecord"
diff --git a/bindings.cfg b/bindings.cfg
index 34a90a3..9e7e0a7 100755
--- a/bindings.cfg
+++ b/bindings.cfg
@@ -28,11 +28,11 @@ cl_disablefreezecam          1
 cl_hud_background_alpha      0.25
 cl_hud_bomb_under_radar      0
 cl_hud_color                 5
-cl_hud_healthammo_style      1 // no health bars
+cl_hud_healthammo_style      0 // no health bars / no burst indicator?
 cl_hud_playercount_pos       1 // bottom
 cl_hud_playercount_showcount 0
-cl_hud_radar_scale           1.25
-cl_radar_always_centered     0
+cl_hud_radar_scale           1
+l_radar_always_centered      2
 cl_radar_icon_scale_min      0.4
 cl_radar_scale               0.5
 cl_show_clan_in_death_notice 0
@@ -43,7 +43,7 @@ cl_use_opens_buy_menu        0
 con_filter_enable            2
 developer                    1
 gameinstructor_enable        0
-hud_scaling                  0.8
+hud_scaling                  1
 hud_showtargetid             1
 hud_takesshots               1
 net_graphheight              150
@@ -61,12 +61,11 @@ m_customaccel_scale 0
 sensitivity         0.8 // Should be the same as windows as of 08.01.2016
 
 // FPS (Mehrfache vom Tickrate)
-fps_max               129 // 129 // lets try 0 for a change :)
+fps_max               144
 fps_max_menu          30
 engine_no_focus_sleep 0
 mat_queue_mode        2
 cl_disablehtmlmotd    1
-cl_forcepreload       1
 
 // Network
 rate            128000
@@ -86,7 +85,6 @@ voice_enable                           1
 voice_scale                            0.5
 snd_mixahead                           0.075 // If clippy - more! Def: 0.1
 snd_mute_losefocus                     0     // mute game when alt-tabbed
-lobby_voice_chat_enabled               0     // voice chat in lobby
 cl_mute_enemy_team                     0
 dsp_enhance_stereo                     0     // No audible changes, less CPU?
 dsp_slow_cpu                           0
@@ -124,15 +122,17 @@ cl_viewmodel_shift_right_amt 0
 alias "fovsmall"   "viewmodel_fov 55;viewmodel_offset_x  2;viewmodel_offset_y -2;viewmodel_offset_z -2"
 alias "fovquake"   "viewmodel_fov 68;viewmodel_offset_x -2;viewmodel_offset_y -2;viewmodel_offset_z -2"
 alias "fovdefault" "viewmodel_fov 60;viewmodel_offset_x  1;viewmodel_offset_y  1;viewmodel_offset_z -1"
-fovsmall
+fovdefault
 viewmodel_presetpos 0 // to activate viewmodel, if loaded with parameter
 
 // Crosshair and local bindings
 exec bindings-crosshair
 exec bindings-local
 exec bindings-aliases
-fdefault
-volume 0.3
+con_filter_text "-"
+con_filter_text_out "Player"
+
+volume 0.8
 
 // log_dumpchannels
 // log_color "Console"          "FFFFFFFF"