Restore the disguise kit with auto-disguise

Fixes a previous bug.

README.md

@@ -31,7 +31,6 @@ Most features are usable by all classes, but a few are class-specific. If you wo
 TF2-Scripts comes with several settings used to disable certain undesired features; edit them in `cfg\_settings.cfg`:
 
 - `AUTO_CROUCH_JUMP`
-- `AUTO_DISGUISE`
 - `CLEAR_CONSOLE_ON_START`
 - `DEBUG_OUTPUT_ON_START`
 - `ENGINEER_PDA`
@@ -40,6 +39,7 @@ TF2-Scripts comes with several settings used to disable certain undesired featur
 - `LOADOUT_SWITCH`
 - `SHOW_NETGRAPH`
 - `SOLDIER_ROCKET_JUMP`
+- `SPY_AUTO_DISGUISE`
 - `SPY_LINES`
 - `SPY_TAUNT`
 - `SUICIDE_EXPLOSION`

cfg/_settings.cfg

@@ -6,15 +6,6 @@
 // When set to crouch_on, automatically crouches when holding the jump button.
 alias AUTO_CROUCH_JUMP "crouch_on"
 
-// AUTO_DISGUISE
-// Values: disguise_on | disguise_off
-// Set to disguise_on to activate automatic disguise functions on Spy.
-// Set to disguise_off to de-activate them.
-// Note: be careful when placing sappers or otherwise using MOUSE1 without
-// meaning to attack, as this will automatically change the disguise. Use
-// MOUSE3 to perform a normal attack.
-alias AUTO_DISGUISE "disguise_on"
-
 // CLEAR_CONSOLE_ON_START
 // Values: clear_on | clear_off
 // Set to disguise_on if you want the developer console to be cleared once 
@@ -62,6 +53,15 @@ alias SHOW_NETGRAPH "netgraph_off"
 // active, press MOUSE2 to jump.
 alias SOLDIER_ROCKET_JUMP "rocket_on"
 
+// SPY_AUTO_DISGUISE
+// Values: disguise_on | disguise_off
+// Set to disguise_on to activate automatic disguise functions on Spy.
+// Set to disguise_off to de-activate them.
+// Note: be careful when placing sappers or otherwise using MOUSE1 without
+// meaning to attack, as this will automatically change the disguise. Use
+// MOUSE3 to perform a normal attack.
+alias SPY_AUTO_DISGUISE "disguise_on"
+
 // SPY_LINES
 // Values: spy_lines_on | spy_lines_off
 // If set to spy_lines_on, the Shift+Num combination will say a line

cfg/engineer.cfg

@@ -20,16 +20,13 @@ alias buildings_6 "alias key6 sentry; alias key7 dispenser; alias key8 t_entranc
 
 // PDA
 // Enables or disables the Engineer's PDA.
-alias scroll_1 "slot1; alias scroll_up scroll_3; alias scroll_down scroll_2"
-alias scroll_2 "slot2; alias scroll_up scroll_1; alias scroll_down scroll_3"
-alias scroll_3 "slot3; alias scroll_up scroll_2; alias scroll_down scroll_1"
+alias scroll1 "slot1; alias scroll_up scroll3; alias scroll_down scroll2"
+alias scroll2 "slot2; alias scroll_up scroll1; alias scroll_down scroll3"
+alias scroll3 "slot3; alias scroll_up scroll2; alias scroll_down scroll1"
 alias scroll_on "alias scroll_up invprev; alias scroll_down invnext"
-alias scroll_off "scroll_1"
-alias key1_off "slot1; scroll_1"
-alias key2_off "slot2; scroll_2"
-alias key3_off "slot3; scroll_3"
+alias scroll_off "scroll1"
 alias pda_on "alias key1 slot1; alias key2 slot2; alias key3 slot3; alias key4 slot4; alias key5 slot5; buildings_6; scroll_on"
-alias pda_off "alias key1 key1_off; alias key2 key2_off; alias key3 key3_off; buildings_4; alias key8 slot8; alias key9 slot9; scroll_off"
+alias pda_off "alias key1 scroll1; alias key2 scroll2; alias key3 scroll3; buildings_4; alias key8 slot8; alias key9 slot9; scroll_off"
 bind MWHEELUP scroll_up
 bind MWHEELDOWN scroll_down
 ENGINEER_PDA

cfg/spy.cfg

@@ -47,16 +47,18 @@ alias -disguise_attack "-attack; next_disguise"
 // Disguised Weapon Switching
 // When switching weapons, the disguise also switches weapons.
 // With some players, this might reduce suspicion that you're a spy.
-// Only works if spy_toggle is set to disguise_on.
-// Note: the scroll wheel will now only scroll between 1 and 3, because once
-// the disguise kit always gets skipped once the last disguise is activated.
+// Only works when disguise_on is active.
 alias reload1 "slot1; lastdisguise"
 alias reload2 "slot2; lastdisguise"
 alias reload3 "slot3; lastdisguise"
-alias reload_m_up "invprev; lastdisguise"
-alias reload_m_down "invnext; lastdisguise"
-alias disguise_weapon_on "alias key1 reload1; alias key2 reload2; alias key3 reload3; bind MWHEELUP reload_m_up; bind MWHEELDOWN reload_m_down"
-alias disguise_weapon_off "alias key1 slot1; alias key2 slot2; alias key3 slot3; bind MWHEELUP invprev; bind MWHEELDOWN invnext"
+alias scroll1 "reload1; alias scroll_up scroll4; alias scroll_down scroll2"
+alias scroll2 "reload2; alias scroll_up scroll1; alias scroll_down scroll3"
+alias scroll3 "reload3; alias scroll_up scroll2; alias scroll_down scroll4"
+alias scroll4 "slot4; alias scroll_up scroll3; alias scroll_down scroll1"
+alias disguise_weapon_on "alias key1 scroll1; alias key2 scroll2; alias key3 scroll3; alias key4 scroll4; scroll1"
+alias disguise_weapon_off "alias key1 slot1; alias key2 slot2; alias key3 slot3; alias key4 slot4; alias scroll_up invprev; alias scroll_down invnext"
+bind MWHEELUP scroll_up
+bind MWHEELDOWN scroll_down
 
 
 // Disguise Toggling
@@ -72,4 +74,5 @@ bind F spy_toggle
 // attack without disguising (for example: sapping a sentry).
 bind MOUSE3 +attack
 
-AUTO_DISGUISE
+
+SPY_AUTO_DISGUISE