From 8f1f332ca9261dfa14134a696b41e7405b444341 Mon Sep 17 00:00:00 2001
From: Hunter Kvalevog <hunterkva@gmail.com>
Date: Tue, 5 Mar 2019 22:41:55 -0600
Subject: [PATCH] Move catbot tools

---
 data/menu/nullified-ui.xml                   |  2 +-
 data/menu/nullifiedcat/misc.xml              |  2 +-
 data/menu/nullifiedcat/misc/bhop.xml         |  6 ---
 data/menu/nullifiedcat/{ => misc}/catbot.xml | 36 ----------------
 data/menu/nullifiedcat/movement.xml          | 44 ++++++++++++++++++++
 5 files changed, 46 insertions(+), 44 deletions(-)
 delete mode 100755 data/menu/nullifiedcat/misc/bhop.xml
 rename data/menu/nullifiedcat/{ => misc}/catbot.xml (52%)
 create mode 100755 data/menu/nullifiedcat/movement.xml

diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml
index fc7fbe67..5040f21c 100755
--- a/data/menu/nullified-ui.xml
+++ b/data/menu/nullified-ui.xml
@@ -7,7 +7,7 @@
             <Include path="nullifiedcat/chat.xml"/>
             <Include path="nullifiedcat/crits.xml"/>
             <Include path="nullifiedcat/visuals.xml"/>
-            <Include path="nullifiedcat/catbot.xml"/>
+            <Include path="nullifiedcat/movement.xml"/>
             <Include path="nullifiedcat/spyalert.xml"/>
             <Include path="nullifiedcat/misc.xml"/>
             <Include path="nullifiedcat/irc.xml"/>
diff --git a/data/menu/nullifiedcat/misc.xml b/data/menu/nullifiedcat/misc.xml
index a7d574e3..33007844 100755
--- a/data/menu/nullifiedcat/misc.xml
+++ b/data/menu/nullifiedcat/misc.xml
@@ -4,9 +4,9 @@
         <Include path="nullifiedcat/misc/achievement.xml"/>
         <Include path="nullifiedcat/misc/anticheat.xml"/>
         <Include path="nullifiedcat/misc/announcer.xml"/>
-        <Include path="nullifiedcat/misc/bhop.xml"/>
         <Include path="nullifiedcat/misc/bptf.xml"/>
         <Include path="nullifiedcat/misc/collective.xml"/>
         <Include path="nullifiedcat/misc/Misc2.xml"/>
+        <Include path="nullifiedcat/misc/catbot.xml"/>
     </TabContainer>
 </Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/misc/bhop.xml b/data/menu/nullifiedcat/misc/bhop.xml
deleted file mode 100755
index c8760762..00000000
--- a/data/menu/nullifiedcat/misc/bhop.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<Tab name="Bhop" padding="4 4 4 4">
-    <List width="150">
-        <AutoVariable width="fill" target="bunnyhop.enable" label="Enable Bhop"/>
-        <AutoVariable width="fill" target="misc.autostrafe" label="Enable Auto strafe"/>
-    </List>
-</Tab>
\ No newline at end of file
diff --git a/data/menu/nullifiedcat/catbot.xml b/data/menu/nullifiedcat/misc/catbot.xml
similarity index 52%
rename from data/menu/nullifiedcat/catbot.xml
rename to data/menu/nullifiedcat/misc/catbot.xml
index 7e4bfa86..ec6e8845 100755
--- a/data/menu/nullifiedcat/catbot.xml
+++ b/data/menu/nullifiedcat/misc/catbot.xml
@@ -44,40 +44,4 @@
             <AutoVariable width="fill" target="cat-bot.anti-motd" label="Anti MOTD"/>
         </List>
     </Box>
-    <Box name="Followbot" width="content" height="content" padding="12 6 6 6" x="210">
-        <List width="170">
-            <AutoVariable width="fill" target="follow-bot.enable" label="Enable FB"/>
-            <AutoVariable width="fill" target="follow-bot.roaming" label="Roaming"/>
-            <AutoVariable width="fill" target="follow-bot.change-roaming-target" label="Change when possible"/>
-            <AutoVariable width="fill" target="follow-bot.jump-if-stuck" label="Jump if stuck"/>
-            <AutoVariable width="fill" target="follow-bot.taunt-sync" label="Synced taunts"/>
-            <AutoVariable width="fill" target="follow-bot.max-range" label="Activation range"/>
-            <AutoVariable width="fill" target="follow-bot.distance" label="Follow distance"/>
-            <AutoVariable width="fill" target="follow-bot.ipc-distance" label="IRC additive distance"/>
-            <AutoVariable width="fill" target="follow-bot.mimic-slot" label="Mimic slot"/>
-            <AutoVariable width="fill" target="follow-bot.always-medigun" label="Always Medigun"/>
-            <AutoVariable width="fill" target="follow-bot.switch-afk" label="AFK Switch"/>
-            <AutoVariable width="fill" target="follow-bot.afk-time" label="AFK limit"/>
-            <AutoVariable width="fill" target="follow-bot.corners" label="Corner activate"/>
-            <AutoVariable width="fill" target="follow-bot.steamid" label="SteamID to follow"/>
-        </List>
-    </Box>
-    <Box name="NavBot" width="content" height="content" padding="12 6 6 6" x="390">
-        <List width="170">
-            <AutoVariable width="fill" target="misc.pathing" label="Enable Pathing"/>
-	        <AutoVariable width="fill" target="misc.pathing.draw" label="Draw Path"/>
-            <AutoVariable width="fill" target="misc.pathing.look-at-path" label="Look at Path"/>
-            <AutoVariable width="fill" target="navbot.enabled" label="Enable Navbot"/>
-            <!--AutoVariable width="fill" target="navbot.scout-mode" label="Enable Scout Mode"/>
-            <AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/-->
-            <AutoVariable width="fill" target="navbot.get-health-and-ammo" label="Get Health and Ammo"/>
-            <AutoVariable width="fill" target="navbot.other-mode" label="General Mode"/>
-            <AutoVariable width="fill" target="navbot.primary-only" label="Best Weapon only"/>
-            <AutoVariable width="fill" target="navbot.autojump.enabled" label="Enable Autojump"/>
-            <AutoVariable width="fill" target="navbot.autojump.trigger-distance" label="Autojump Distance"/>
-            <!--AutoVariable width="fill" target="navbot.target-sentry" label="Try to target sentries"/-->
-            <AutoVariable width="fill" target="navbot.stay-near" label="Zone enemies (stay near)"/>
-            <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/-->
-        </List>
-    </Box>
 </Tab>
diff --git a/data/menu/nullifiedcat/movement.xml b/data/menu/nullifiedcat/movement.xml
new file mode 100755
index 00000000..1651556a
--- /dev/null
+++ b/data/menu/nullifiedcat/movement.xml
@@ -0,0 +1,44 @@
+<Tab name="Movement" padding="6 6 6 6">
+    <Box padding="12 6 6 6" width="content" height="content" name="Bunny Hop">
+        <List width="150">
+            <AutoVariable width="fill" target="bunnyhop.enable" label="Enable Bunny Hop"/>
+            <AutoVariable width="fill" target="misc.autostrafe" label="Enable Auto strafe"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="FollowBot" x="170">
+        <List width="180">
+            <AutoVariable width="fill" target="follow-bot.enable" label="Enable FollowBot"/>
+            <AutoVariable width="fill" target="follow-bot.roaming" label="Roaming"/>
+            <AutoVariable width="fill" target="follow-bot.change-roaming-target" label="Change when possible"/>
+            <AutoVariable width="fill" target="follow-bot.jump-if-stuck" label="Jump if stuck"/>
+            <AutoVariable width="fill" target="follow-bot.taunt-sync" label="Synced taunts"/>
+            <AutoVariable width="fill" target="follow-bot.max-range" label="Activation range"/>
+            <AutoVariable width="fill" target="follow-bot.distance" label="Follow distance"/>
+            <AutoVariable width="fill" target="follow-bot.ipc-distance" label="IRC additive distance"/>
+            <AutoVariable width="fill" target="follow-bot.mimic-slot" label="Mimic slot"/>
+            <AutoVariable width="fill" target="follow-bot.always-medigun" label="Always Medigun"/>
+            <AutoVariable width="fill" target="follow-bot.switch-afk" label="AFK Switch"/>
+            <AutoVariable width="fill" target="follow-bot.afk-time" label="AFK limit"/>
+            <AutoVariable width="fill" target="follow-bot.corners" label="Corner activate"/>
+            <AutoVariable width="fill" target="follow-bot.steamid" label="SteamID to follow"/>
+        </List>
+    </Box>
+    <Box padding="12 6 6 6" width="content" height="content" name="NavBot" y="50">
+        <List width="150">
+            <AutoVariable width="fill" target="misc.pathing" label="Enable Pathing"/>
+	        <AutoVariable width="fill" target="misc.pathing.draw" label="Draw Path"/>
+            <AutoVariable width="fill" target="misc.pathing.look-at-path" label="Look at Path"/>
+            <AutoVariable width="fill" target="navbot.enabled" label="Enable Navbot"/>
+            <!--AutoVariable width="fill" target="navbot.scout-mode" label="Enable Scout Mode"/>
+            <AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/-->
+            <AutoVariable width="fill" target="navbot.get-health-and-ammo" label="Get Health and Ammo"/>
+            <AutoVariable width="fill" target="navbot.other-mode" label="General Mode"/>
+            <AutoVariable width="fill" target="navbot.primary-only" label="Best Weapon only"/>
+            <AutoVariable width="fill" target="navbot.autojump.enabled" label="Enable Autojump"/>
+            <AutoVariable width="fill" target="navbot.autojump.trigger-distance" label="Jump Distance"/>
+            <!--AutoVariable width="fill" target="navbot.target-sentry" label="Try to target sentries"/-->
+            <AutoVariable width="fill" target="navbot.stay-near" label="Zone enemies (stay near)"/>
+            <!-- <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/> -->
+        </List>
+    </Box>
+</Tab>