From bbdfd579a9b9904dea3dbe8ac3bcc954693d8ec0 Mon Sep 17 00:00:00 2001
From: Hunter Kvalevog <hunterkva@gmail.com>
Date: Tue, 5 Mar 2019 18:01:08 -0600
Subject: [PATCH] Organize Triggerbot menu

---
 data/menu/nullifiedcat/triggerbot.xml | 33 +++++++++++++++------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/data/menu/nullifiedcat/triggerbot.xml b/data/menu/nullifiedcat/triggerbot.xml
index 5af7274f..00ad0475 100755
--- a/data/menu/nullifiedcat/triggerbot.xml
+++ b/data/menu/nullifiedcat/triggerbot.xml
@@ -1,11 +1,10 @@
-<Tab name="Trigger Bot">
+<Tab name="Trigger">
     <TabContainer width="fill" height="fill">
         <Tab name="Trigger Bot" padding="6 6 6 6">
-            <Box padding="6 6 6 6" width="content" height="content">
+            <Box name="Trigger Bot" padding="12 6 6 6" width="content" height="content">
                 <List width="150">
-                    <AutoVariable width="fill" target="trigger.enable" label="Enable"/>
-                    <AutoVariable width="fill" target="trigger.key.button" label="Aimkey"/>
-                    <LabeledObject width="fill" label="Triggerkey mode">
+                    <AutoVariable width="fill" target="trigger.enable" label="Enable Trigger Bot"/>
+                    <LabeledObject width="fill" label="Trigger Key mode">
                         <Select target="trigger.key.mode">
                             <Option name="Disable" value="0"/>
                             <Option name="Pressed" value="1"/>
@@ -13,6 +12,15 @@
                             <Option name="Toggle" value="3"/>
                         </Select>
                     </LabeledObject>
+                    <AutoVariable width="fill" target="trigger.key.button" label="Aim Key"/>
+                    <AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge"/>
+                    <AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only"/>
+                    <AutoVariable width="fill" target="trigger.accuracy" label="Accuracy mode" min="0" max="10"/>
+                    <AutoVariable width="fill" target="trigger.delay" label="Delay" min="0" max="1"/>
+                </List>
+            </Box>
+            <Box padding="12 6 6 6" width="content" height="content" name="Target Selection" x="170">
+                <List width="150">
                     <LabeledObject width="fill" label="Hitbox mode">
                         <Select target="trigger.hitbox-mode">
                             <Option name="Auto Head" value="0"/>
@@ -20,18 +28,13 @@
                             <Option name="Head Only" value="2"/>
                         </Select>
                     </LabeledObject>
-                    <AutoVariable width="fill" target="trigger.wait-for-charge" label="Wait for charge"/>
-                    <AutoVariable width="fill" target="trigger.zoomed-only" label="Zoomed only"/>
-                    <AutoVariable width="fill" target="trigger.accuracy" label="Accuracy mode" min="0" max="10"/>
-                    <AutoVariable width="fill" target="trigger.delay" label="Delay" min="0" max="1"/>
-
-                    <AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="NOT Cloaked Spies"/>
-                    <AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="NOT Vaccinator"/>
-                    <AutoVariable width="fill" target="trigger.target.buildings-other" label="Other Buildings"/>
-                    <AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry Guns"/>
+                    <AutoVariable width="fill" target="trigger.target.max-range" label="Max Range"/>
                     <AutoVariable width="fill" target="trigger.target.stickybombs" label="Stickybombs"/>
+                    <AutoVariable width="fill" target="trigger.target.buildings-sentry" label="Sentry Guns"/>
+                    <AutoVariable width="fill" target="trigger.target.buildings-other" label="Other Buildings"/>
+                    <AutoVariable width="fill" target="trigger.target.ignore-cloaked-spies" label="Ignore Cloaked Spies"/>
+                    <AutoVariable width="fill" target="trigger.target.ignore-vaccinator" label="Ignore Vaccinator Uber"/>
                     <AutoVariable width="fill" target="trigger.target.teammates" label="Teammates"/>
-                    <AutoVariable width="fill" target="trigger.target.max-range" label="Max Range" min="0" max="4096"/>
                 </List>
             </Box>
         </Tab>