Some basic cleanup

6 files changed, 20 insertions, 29 deletions

diff --git a/agl-aliases.cfg b/agl-aliases.cfg
index f811683..3aac07e 100644
--- a/agl-aliases.cfg
+++ b/agl-aliases.cfg
@@ -1,42 +1,27 @@
-// Simple toggles per keybind
-alias +cleanattack    "+attack"
-alias -cleanattack    "-attack; r_cleardecals"
 alias +crosshairmax   "cl_crosshair_sniper_width 1; cl_crosshairstyle 3; cl_crosshairsize 1337; cl_crosshairgap 10;"
 alias -crosshairmax   "exec agl-crosshair"
-alias +duckjump       "+jump; +duck";
-alias -duckjump       "-jump; -duck";
+alias +chshift   "+crosshairmax; binds_alt"
+alias -chshift   "-crosshairmax; binds_normal"
+
 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";
-alias +walkshift      "+speed; exec agl-shift";
-alias -walkshift      "-speed; exec agl-normal";
-
-alias +chshift   "+crosshairmax; exec agl-shift"
-alias -chshift   "-crosshairmax; exec agl-normal"
 
 // Volume + Microphone
 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.2; volume"
-alias volume_down "incrementvar volume 0 1 -0.2; volume"
+alias volume_up "incrementvar volume 0 1 0.2"
+alias volume_down "incrementvar volume 0 1 -0.2"
 
 // 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 toggleafk "afk"
-alias       afk "+forward; +left; +speed; +duck; +lookatweapon; volume 0; alias toggleafk noafk"
-alias     noafk "-forward; -left; -speed; -duck; -lookatweapon; volume 0.8; alias toggleafk   afk"
-
-alias togglehands handsleft
-alias handsleft   "cl_righthand 0; alias togglehands handsright;"
-alias handsright  "cl_righthand 1; alias togglehands handsleft;"
+// alias toggleafk "afk"
+// alias       afk "+forward; +left; +speed; +duck; +lookatweapon; volume 0; alias toggleafk noafk"
+// alias     noafk "-forward; -left; -speed; -duck; -lookatweapon; volume 0.8; alias toggleafk   afk"
 
 // alias "banana" "prop_physics_create /props/cs_italy/bananna.mdl"
 
@@ -71,8 +56,6 @@ alias "5on5"      "exec agl; password beer1337; connect 89.58.2.246:27016"
 alias "load_5on5" "rcon exec csgo_esl_serverconfig/esl5on5.cfg"
 alias "rr"        "rcon mp_restartgame 1"
 alias "sc"        "rcon mp_scrambleteams 1"
-// alias "hmretake"  "connect 213.239.211.57:4008"
-// alias "hm1on1"  "connect 213.239.211.57:4007"
 
 alias "use_pistol" "use weapon_glock; use weapon_hkp2000; use weapon_p250; use weapon_tec9; use weapon_usp_silencer; use weapon_cz75a; use weapon_deagle; use weapon_elite; use weapon_fiveseven;"
 
diff --git a/agl-arena.cfg b/agl-arena.cfg
index 93cc9b3..50f3732 100644
--- a/agl-arena.cfg
+++ b/agl-arena.cfg
@@ -17,6 +17,8 @@ bind "LEFTARROW" "niceshot_c"
 bind "DOWNARROW" "thankyou_c"
 bind "RIGHTARROW" ""
 
+alias +cleanattack    "+attack"
+alias -cleanattack    "-attack; r_cleardecals"
 bind mouse1 +cleanattack
 
 voice_enable 0
diff --git a/agl-shift.cfg b/agl-normal-mod.cfg
index 79b1213..79b1213 100644
--- a/agl-shift.cfg
+++ b/agl-normal-mod.cfg
diff --git a/agl-normal.cfg b/agl-normal.cfg
index cb2b0db..af4a3f7 100644
--- a/agl-normal.cfg
+++ b/agl-normal.cfg
@@ -12,7 +12,7 @@ bind "8" "slot8"
 bind "9" "slot9"
 bind "0" "slot10"
 
-bind "ESCAPE" "cancelselect"
+bind "ESCAPE"    "cancelselect"
 bind "ALT"       "+chshift; r_cleardecals;"
 bind "BACKSPACE" "teammenu"
 bind "CTRL"      "+duck"
diff --git a/agl-training.cfg b/agl-training.cfg
index f6d4ecd..39a03f7 100644
--- a/agl-training.cfg
+++ b/agl-training.cfg
@@ -46,3 +46,6 @@ mp_respawn_on_death_t 1
 
 // https://totalcsgo.com/commands/bot
 // mp_restartgame 1
+
+// alias binds_normal "exec agl-normal"
+alias binds_alt ""
diff --git a/agl.cfg b/agl.cfg
index 7d6b4b5..9976345 100644
--- a/agl.cfg
+++ b/agl.cfg
@@ -102,11 +102,14 @@ viewmodel_presetpos 0 // to activate viewmodel, if loaded with parameter
 
 volume 0.8
 
-// Load crosshair etc
+// Load crosshair
+exec agl-aliases
 exec agl-crosshair
 exec agl-local
-exec agl-aliases
-exec agl-normal
+
+alias binds_normal "exec agl-normal"
+alias binds_alt "exec agl-normal-mod"
+binds_normal
 
 host_writeconfig
 hud_reloadscheme