From e80ed09ba63cfc665b60a2bf0aba2fefc1566d4f Mon Sep 17 00:00:00 2001
From: julianacat <julianrowe9999@gmail.com>
Date: Sun, 16 Jul 2017 22:18:54 -0500
Subject: [PATCH] Updated menu for push

---
 src/hacks/FollowBot.cpp |  4 +--
 tf-settings/menu.json   | 65 ++++++++++++++++++++++-------------------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/hacks/FollowBot.cpp b/src/hacks/FollowBot.cpp
index a2949c71..d2459b70 100644
--- a/src/hacks/FollowBot.cpp
+++ b/src/hacks/FollowBot.cpp
@@ -28,8 +28,8 @@ namespace hacks { namespace shared { namespace followbot {
 	
 // User settings
 CatVar bot(CV_SWITCH, "fb_bot", "0", "Master Followbot Switch", "Set to 1 in followbots' configs");
-CatVar follow_distance(CV_FLOAT, "fb_distance", "175", "Followbot Follow Distance", "How close the bots should stay to the target");
-CatVar follow_activation(CV_FLOAT, "fb_activation", "175", "Followbot Activation Distance", "How close a player should be until the followbot will pick a target");
+CatVar follow_distance(CV_FLOAT, "fb_distance", "175", "Follow Distance", "How close the bots should stay to the target");
+CatVar follow_activation(CV_FLOAT, "fb_activation", "175", "Activation Distance", "How close a player should be until the followbot will pick them as a target");
 CatVar mimic_slot(CV_SWITCH, "fb_mimic_slot", "0", "Mimic selected weapon", "If enabled, this bot will select same weapon slot as the owner");
 CatVar always_medigun(CV_SWITCH, "fb_always_medigun", "0", "Always use Medigun", "Medics will always use Medigun");
 CatVar crumb_draw(CV_SWITCH, "fb_crumb_draw", "1", "Draw Crumbs", "Draws the path made for the followbot");
diff --git a/tf-settings/menu.json b/tf-settings/menu.json
index 06bf6625..4aedf10e 100644
--- a/tf-settings/menu.json
+++ b/tf-settings/menu.json
@@ -16,14 +16,16 @@
 				"type": "list",
 				"name": "Ignore",
 				"list": [
+					"aimbot_ignore_cloak",
+					"aimbot_ignore_deadringer",
+					"aimbot_ignore_vaccinator",
 					"ignore_taunting",
 					"aimbot_ignore_hoovy",
+					"aimbot_teammates",
 					"aimbot_buildings_sentry",
 					"aimbot_buildings_other",
-					"aimbot_stickys",
-					"aimbot_teammates",
-					"aimbot_ignore_cloak",
-					"aimbot_ignore_vaccinator"
+					"aimbot_stickys"
+					
 				]
 			},
 			{
@@ -110,11 +112,11 @@
 				"name": "Auto Reflect",
 				"list": [
 					"reflect_enabled",
+					"reflect_key",
 					"reflect_legit",
 					"reflect_only_idle",
 					"reflect_stickybombs",
-					"reflect_dodgeball",
-					"reflect_key"					
+					"reflect_dodgeball"					
 				]
 			},
 			{
@@ -138,6 +140,7 @@
 					"trigger_maxrange",
 					"trigger_charge",
 					"trigger_hitboxmode",
+					"trigger_accuracy",
 					"trigger_key_mode",
 					"trigger_key"
 				]
@@ -345,36 +348,23 @@
 		"type": "list",
 		"name": "Chat Settings",
 		"list": [
+			"spam",
+			"killsay",
+			"uberspam",
+			"spam_file",
+			"killsay_file",
+			"spam_random",
 			"chat_newlines",
 			"clean_chat",
-			"killsay",
-			"killsay_file",
-			"spam",
-			"spam_random",
-			"spam_file",
-			"spam_teamname",
-			"uberspam",
-			"uberspam_build",
+			"chat_crypto",
 			"uberspam_ready",
 			"uberspam_used",
 			"uberspam_ended",
 			"uberspam_team",
-			"uberspam_file"
-		]
-	},
-	{
-		"type": "list",
-		"name": "Follow Bot Settings",
-		"data": "ipc",
-		"list": [
-			"fb_bot",
-			"fb_auto_playerlist",
-			"fb_mimic_slot",
-			"fb_always_medigun",
-			"fb_autoclass",
-			"fb_follow_distance",
-			"ipc_server",
-			"fb_autoteam"
+			"uberspam_build",
+			"uberspam_file",
+			"spam_voicecommand",
+			"spam_teamname"
 		]
 	},
 	{
@@ -392,6 +382,20 @@
 			"ac_bhop_count"
 		]
 	},
+	{
+		"type": "list",
+		"name": "Followbot",
+		"list": [
+			"fb_bot",
+			"fb_distance",
+			"fb_activation",
+			"fb_roaming",
+			"fb_mimic_slot",
+			"fb_always_medigun",
+			"fb_sync_taunt",
+			"fb_crumb_draw"
+		]
+	},
 	{
 		"type": "list",
 		"name": "Miscellaneous",
@@ -492,6 +496,7 @@
 					"debug_info",
 					"log",
 					"setupbones_time",
+					"nolerp",
 					"skinchanger_debug",
 					"software_cursor_mode",
 					"experimental_cursor_fix",