From 7b2df5ed8dd5d854eb930598f497ed7c4214548b Mon Sep 17 00:00:00 2001
From: LightPower392 <21halo12@gmail.com>
Date: Tue, 30 Mar 2021 13:29:32 -0700
Subject: [PATCH] Extra Autosticky Option + More Tooltips

---
 data/menu/nullifiedcat/antiaim.xml            |  4 +--
 data/menu/nullifiedcat/crits.xml              | 12 +++----
 data/menu/nullifiedcat/misc/autoparty.xml     |  2 +-
 data/menu/nullifiedcat/misc/spyalert.xml      |  4 +--
 data/menu/nullifiedcat/movement.xml           |  8 ++---
 data/menu/nullifiedcat/visuals/chams.xml      | 16 +++++-----
 .../menu/nullifiedcat/visuals/chamshaders.xml |  7 ++--
 data/menu/nullifiedcat/visuals/colors.xml     |  2 +-
 data/menu/nullifiedcat/visuals/esp.xml        | 22 ++++++-------
 data/menu/nullifiedcat/visuals/glow.xml       |  4 +--
 data/menu/nullifiedcat/visuals/ui.xml         |  2 +-
 data/menu/nullifiedcat/visuals/world.xml      |  8 ++---
 data/menu/nullifiedcat/weapons/aimbot.xml     |  4 +--
 data/menu/nullifiedcat/weapons/nospread.xml   |  4 +--
 data/menu/nullifiedcat/weapons/triggerbot.xml | 24 ++++++++------
 src/hacks/AutoSticky.cpp                      | 32 ++++++++-----------
 16 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index f0c62923..b7288bff 100755
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -24,7 +24,7 @@
                     <Option name="Heck" value="11"/>
                 </Select>
             </LabeledObject>
-            <AutoVariable width="fill" target="antiaim.pitch.static" label="Custom pitch"/>
+            <AutoVariable width="fill" target="antiaim.pitch.static" label="Custom pitch" tooltip="Used when 'Pitch mode' is set to 'Custom'."/>
             <LabeledObject width="fill" label="Yaw mode">
                 <Select target="antiaim.yaw.mode">
                     <Option name="Disable" value="0"/>
@@ -52,7 +52,7 @@
                     <Option name="TestAA" value="22"/>
                 </Select>
             </LabeledObject>
-            <AutoVariable width="fill" target="antiaim.yaw.static" label="Custom yaw"/>
+            <AutoVariable width="fill" target="antiaim.yaw.static" label="Custom yaw" tooltip="Used when 'Yaw mode' is set to 'Custom'."/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Resolver" x="170">
diff --git a/data/menu/nullifiedcat/crits.xml b/data/menu/nullifiedcat/crits.xml
index aed32bac..fbbeae24 100755
--- a/data/menu/nullifiedcat/crits.xml
+++ b/data/menu/nullifiedcat/crits.xml
@@ -1,14 +1,14 @@
 <Tab name="Crits" padding="4 4 4 4">
     <Box padding="12 6 6 6" width="content" height="content" name="Crits">
         <List width="200">
-            <AutoVariable width="fill" target="crit.enabled" label="Enable crithack" tooltip="Note that melee crits will not be enabled"/>
-            <AutoVariable width="fill" target="crit.anti-crit" label="Save bucket" tooltip="Don't crit when not active or no one is nearby"/>
-            <AutoVariable width="fill" target="crit.key" label="Crit key" tooltip="Key used for non-melee crits"/>
-            <AutoVariable width="fill" target="crit.melee" label="Melee crits" tooltip="Enable melee crits (not bound to key)"/>
-            <AutoVariable width="fill" target="crit.info" label="Crit text" tooltip="Draw useful text on screen"/>
+            <AutoVariable width="fill" target="crit.enabled" label="Enable crithack" tooltip="Note that melee crits will not be enabled."/>
+            <AutoVariable width="fill" target="crit.anti-crit" label="Save bucket" tooltip="Don't crit when not active or no one is nearby."/>
+            <AutoVariable width="fill" target="crit.key" label="Crit key" tooltip="Key used for non-melee crits."/>
+            <AutoVariable width="fill" target="crit.melee" label="Melee crits" tooltip="Enable melee crits (not bound to key)."/>
+            <AutoVariable width="fill" target="crit.info" label="Crit text" tooltip="Draw useful text on screen."/>
             <AutoVariable width="fill" target="crit.draw-info.x" label="Text x position"/>
             <AutoVariable width="fill" target="crit.draw-info.y" label="Text y position"/>
-            <AutoVariable width="fill" target="crit.draw-meter" label="Crit bar" tooltip="Instead of text draw a Bar"/>
+            <AutoVariable width="fill" target="crit.draw-meter" label="Crit bar" tooltip="Draw a bar instead of or in addition to crit text."/>
             <AutoVariable width="fill" target="crit.bar-x" label="Bar x position"/>
             <AutoVariable width="fill" target="crit.bar-y" label="Bar y position"/>
             <AutoVariable width="fill" target="crit.bar-size" label="Bar size"/>
diff --git a/data/menu/nullifiedcat/misc/autoparty.xml b/data/menu/nullifiedcat/misc/autoparty.xml
index 176ae007..983d1de3 100755
--- a/data/menu/nullifiedcat/misc/autoparty.xml
+++ b/data/menu/nullifiedcat/misc/autoparty.xml
@@ -3,7 +3,7 @@
         <List width="250">
             <AutoVariable width="fill" target="autoparty.enable" label="Enable auto party"/>
             <AutoVariable width="fill" target="autoparty.run-frequency" label="Run frequency" tooltip="Run every n seconds."/>
-            <AutoVariable width="fill" target="autoparty.max-party-size" label="Max party members allowed."/>
+            <AutoVariable width="fill" target="autoparty.max-party-size" label="Max party size" tooltip="Max number of party members allowed."/>
             <AutoVariable width="fill" target="autoparty.kick-rage" label="Autokick rage" tooltip="Automatically kick raged players from the party."/>
             <AutoVariable width="fill" target="autoparty.auto-leave" label="Leave if offline" tooltip="Leave the party when a member goes offline."/>
             <AutoVariable width="fill" target="autoparty.auto-lock" label="Autolock party" tooltip="Lock the party when max party size is reached."/>
diff --git a/data/menu/nullifiedcat/misc/spyalert.xml b/data/menu/nullifiedcat/misc/spyalert.xml
index 11c1df12..81deeacb 100755
--- a/data/menu/nullifiedcat/misc/spyalert.xml
+++ b/data/menu/nullifiedcat/misc/spyalert.xml
@@ -3,9 +3,9 @@
         <List width="200">
             <AutoVariable width="fill" target="spy-alert.enable" label="Enable" tooltip="Warns you about nearby enemy spies."/>
             <AutoVariable width="fill" target="spy-alert.voicemenu" label="Call out Spy" tooltip="Call out Spy using voice menu."/>
-            <AutoVariable width="fill" target="spy-alert.sound" label="Sound" tooltip="Demoman calls out a Spy!"/>
+            <AutoVariable width="fill" target="spy-alert.sound" label="Sound" tooltip="Demoman calls out 'Spy!'"/>
             <AutoVariable width="fill" target="spy-alert.alert-interval" label="Interval" tooltip="Frequency of the above sound occuring."/>
-            <AutoVariable width="fill" target="spy-alert.alert-for-invisible" label="Alert for invis Spies" tooltip="Should invisible Spies be included in the alert."/>
+            <AutoVariable width="fill" target="spy-alert.alert-for-invisible" label="Alert for invis Spies" tooltip="Should invisible Spies be included in the alert?"/>
             <AutoVariable width="fill" target="spy-alert.distance.alert" label="Alert distance" tooltip="Distance to consider Spy very close."/>
             <AutoVariable width="fill" target="spy-alert.distance.warning" label="Backstab warning distance" tooltip="Distance to consider Spy close."/>
         </List>
diff --git a/data/menu/nullifiedcat/movement.xml b/data/menu/nullifiedcat/movement.xml
index f1f668f9..275c191d 100755
--- a/data/menu/nullifiedcat/movement.xml
+++ b/data/menu/nullifiedcat/movement.xml
@@ -34,17 +34,17 @@
             <AutoVariable width="fill" target="nav.draw" label="Draw path"/>
             <AutoVariable width="fill" target="nav.look-at-path" label="Look at path"/>
             <AutoVariable width="fill" target="navbot.enabled" label="Enable NavBot"/>
-            <AutoVariable width="fill" target="navbot.capture-objectives" label="Capture objectives" tooltip="Automatically capture objectives (CTF,CP and PL only)"/>
+            <AutoVariable width="fill" target="navbot.capture-objectives" label="Capture objectives" tooltip="Automatically capture objectives (CTF, CP, and PL only)."/>
             <AutoVariable width="fill" target="navbot.search-health" label="Search health"/>
             <AutoVariable width="fill" target="navbot.search-ammo" label="Search ammo"/>
             <AutoVariable width="fill" target="navbot.escape-danger" label="Escape danger"/>
-            <AutoVariable width="fill" target="navbot.escape-danger.slight-danger.capping" label="Safe capping" tooltip="Make bots run pre-emptively from capture points in case of danger"/>
+            <AutoVariable width="fill" target="navbot.escape-danger.slight-danger.capping" label="Safe capping" tooltip="Make bots run pre-emptively from capture points in case of danger."/>
             <AutoVariable width="fill" target="navbot.escape-danger.ctf-cap" label="Escape danger w. intel" tooltip="Also try to escape from danger when carrying intel."/>
             <AutoVariable width="fill" target="navbot.primary-only" label="Auto best weapon"/>
             <AutoVariable width="fill" target="navbot.melee-mode" label="Melee only"/>
             <LabeledObject width="fill" label="Force slot">
                 <Select target="navbot.force-slot">
-                    <Option name="Do not force" value="0"/>
+                    <Option name="Don't force" value="0"/>
                     <Option name="Primary" value="1"/>
                     <Option name="Secondary" value="2"/>
                     <Option name="Melee" value="3"/>
@@ -66,7 +66,7 @@
             <AutoVariable width="fill" target="antibackstab.angle" label="Detection angle"/>
             <AutoVariable width="fill" target="antibackstab.distance" label="Detection distance"/>
             <AutoVariable width="fill" target="antibackstab.silent" label="Silent"/>
-            <AutoVariable width="fill" target="antibackstab.nope" label="Nope!" tooltip="Have the charachter say 'no'."/>
+            <AutoVariable width="fill" target="antibackstab.nope" label="Nope!" tooltip="Have your character say 'no'."/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Shield aimbot" x="370">
diff --git a/data/menu/nullifiedcat/visuals/chams.xml b/data/menu/nullifiedcat/visuals/chams.xml
index b228db41..45f66ae4 100755
--- a/data/menu/nullifiedcat/visuals/chams.xml
+++ b/data/menu/nullifiedcat/visuals/chams.xml
@@ -6,11 +6,11 @@
                     <AutoVariable width="fill" target="chams.enable" label="Entity Chams" tooltip="Change textures for visiblity."/>
                     <AutoVariable width="fill" target="chams.legit" label="Legit" tooltip="Don't show chams through walls."/>
                     <AutoVariable width="fill" target="chams.health" label="Health" tooltip="Color chams according to player health."/>
-                    <AutoVariable width="fill" target="chams.recursive" label="Recursive"/>
-                    <AutoVariable width="fill" target="chams.aimbot.color" label="Aimbot coloring" tooltip="Color the aimbot's target according to color set in Visual:Colors"/>
-                    <AutoVariable width="fill" target="chams.novis" label="Use seperate novis colors" tooltip="Seperate colors when a entity is not visible"/>
-                    <AutoVariable width="fill" target="chams.weapons" label="Weapon chams seperate color" tooltip="Color weapons."/>
-                    <AutoVariable width="fill" target="chams.local-weapon" label="Local weapon chams" tooltip="Cham your first person weapon"/>
+                    <AutoVariable width="fill" target="chams.recursive" label="Recursive" tooltip="Include weapons in chams."/>
+                    <AutoVariable width="fill" target="chams.aimbot.color" label="Aimbot coloring" tooltip="Color the aimbot's target according to color set in Visuals->Colors"/>
+                    <AutoVariable width="fill" target="chams.novis" label="Use seperate novis colors" tooltip="Use seperate colors when an entity is not visible"/>
+                    <AutoVariable width="fill" target="chams.weapons" label="Weapon chams seperate color" tooltip="Color weapons differently. Requires 'Recursive' to be checked."/>
+                    <AutoVariable width="fill" target="chams.local-weapon" label="Local weapon chams" tooltip="Cham your weapons."/>
                     <AutoVariable width="fill" target="chams.overlay.local-weapon" label="Overlay local weapon chams" tooltip="Phong and other eye candies for local weapon chams"/>
                     <AutoVariable width="fill" target="chams.local-weapon.wireframe" label="Local weapon chams wireframe"/>
                     <AutoVariable width="fill" target="chams.local-weapon.original" label="Local weapon chams draw original"/>
@@ -27,10 +27,10 @@
             </Box>
             <Box padding="12 6 6 6" width="content" height="content" name="Backtrack chams" x="210" y="200">
                 <List width="200">
-                    <AutoVariable width="fill" target="backtrack.chams" label="Backtrack chams" tooltip="Draw chams for backtrack ticks"/>
+                    <AutoVariable width="fill" target="backtrack.chams" label="Backtrack chams" tooltip="Draw chams for backtrack ticks."/>
                     <AutoVariable width="fill" target="backtrack.chams.overlay" label="Overlay backtrack chams"/>
                     <AutoVariable width="fill" target="backtrack.chams.wireframe" label="Backtrack chams wireframe"/>
-                    <AutoVariable width="fill" target="backtrack.chams.ticks" label="Backtrack chams amount" tooltip="How many ticks to draw (WARNING, this can cause lag)"/>
+                    <AutoVariable width="fill" target="backtrack.chams.ticks" label="Backtrack chams amount" tooltip="How many ticks to draw (WARNING: this can cause lag)."/>
                 </List>
             </Box>
             <Box padding="12 6 6 6" width="content" height="content" name="Targets" x="210">
@@ -38,7 +38,7 @@
                     <AutoVariable width="fill" target="chams.show.players" label="Players"/>
                     <AutoVariable width="fill" target="chams.show.teammates" label="Teammates"/>
                     <AutoVariable width="fill" target="chams.show.disguised" label="Disguised"/>
-                    <AutoVariable width="fill" target="chams.self" label="Local Player"/>
+                    <AutoVariable width="fill" target="chams.self" label="Local player" tooltip="Show chams on yourself."/>
                     <AutoVariable width="fill" target="chams.show.buildings" label="Buildings"/>
                     <AutoVariable width="fill" target="chams.show.teammate-buildings" label="Team buildings"/>
                     <AutoVariable width="fill" target="chams.show.powerups" label="Powerups"/>
diff --git a/data/menu/nullifiedcat/visuals/chamshaders.xml b/data/menu/nullifiedcat/visuals/chamshaders.xml
index c1c97cb7..68b0f83e 100755
--- a/data/menu/nullifiedcat/visuals/chamshaders.xml
+++ b/data/menu/nullifiedcat/visuals/chamshaders.xml
@@ -5,9 +5,10 @@
             <AutoVariable width="fill" target="chams.additive" label="Additive"/>
             <AutoVariable width="fill" target="chams.pearlescent" label="Pearlescent"/>
             <AutoVariable width="fill" target="chams.phong" label="Phong"/>
-            <AutoVariable width="fill" target="chams.phongboost" label="Phong bst"/>
-            <AutoVariable width="fill" target="chams.phongexponent" label="Phong exp"/>
-            <AutoVariable width="fill" target="chams.phonefresnelranges" label="Phong Fresnel Ranges"/>
+            <AutoVariable width="fill" target="chams.phongboost" label="Phong bst" tooltip="Phong boost."/>
+            <AutoVariable width="fill" target="chams.phongexponent" label="Phong exp" tooltip="Phone exponent."/>
+			<!--Fresnel should be capitalized-->
+            <AutoVariable width="fill" target="chams.phonefresnelranges" label="Phong Fresnel ranges"/>
             <AutoVariable width="fill" target="chams.phongfresnelranges.1" label="Normal"/>
             <AutoVariable width="fill" target="chams.phongfresnelranges.2" label="Between"/>
             <AutoVariable width="fill" target="chams.phongfresnelranges.3" label="Grazing angle"/>
diff --git a/data/menu/nullifiedcat/visuals/colors.xml b/data/menu/nullifiedcat/visuals/colors.xml
index e55b895c..daae85b8 100755
--- a/data/menu/nullifiedcat/visuals/colors.xml
+++ b/data/menu/nullifiedcat/visuals/colors.xml
@@ -14,7 +14,7 @@
     <Box padding="12 6 6 6" width="content" height="content" name="Cheat colors" x="200">
         <List width="185">
             <AutoVariable width="fill" target="colors.guicolor" label="GUI Color"/>
-            <AutoVariable width="fill" target="colors.target" label="Target color" tooltip="Aimbot target"/>
+            <AutoVariable width="fill" target="colors.target" label="Target color" tooltip="Aimbot target color. This is used for ESP, chams, glow, and radar."/>
             <AutoVariable width="fill" target="misc.scoreboard.match-custom-team-colors" label="Scoreboard use custom colors"/>
         </List>
     </Box>
diff --git a/data/menu/nullifiedcat/visuals/esp.xml b/data/menu/nullifiedcat/visuals/esp.xml
index e38b868b..ff218f30 100755
--- a/data/menu/nullifiedcat/visuals/esp.xml
+++ b/data/menu/nullifiedcat/visuals/esp.xml
@@ -1,26 +1,26 @@
 <Tab name="ESP" padding="4 4 4 4">
     <Box padding="12 6 6 6" width="content" height="content" name="ESP">
         <List width="150">
-            <AutoVariable width="fill" target="esp.enable" label="Enable ESP" tooltip="Enable extrasensory perception"/>
+            <AutoVariable width="fill" target="esp.enable" label="Enable ESP" tooltip="Enable extrasensory perception. This shows important information about game entities."/>
             <AutoVariable width="fill" target="esp.legit" label="Legit mode" tooltip="Dont show ESP of enemies behind walls"/>
             <AutoVariable width="fill" target="esp.range" label="Max range"/>
-            <AutoVariable width="fill" target="lightesp.enable" label="Enable light ESP"/>
+            <AutoVariable width="fill" target="lightesp.enable" label="Enable light ESP" tooltip="Show a red and green dot on the heads of enemies."/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Targets" y="81">
         <List width="150">
-            <AutoVariable width="fill" target="esp.show.teammates" label="Teammate ESP"/>
-            <AutoVariable width="fill" target="esp.show.local" label="ESP on local player" tooltip="Toggles ESP on self."/>
+            <AutoVariable width="fill" target="esp.show.teammates" label="Teammate ESP" tooltip="Shows ESP on teammates."/>
+            <AutoVariable width="fill" target="esp.show.local" label="ESP on local player" tooltip="Shows ESP on yourself."/>
             <AutoVariable width="fill" target="esp.show.buildings" label="Building ESP"/>
-            <AutoVariable width="fill" target="esp.show.team-buildings" label="Teammate Building ESP"/>
+            <AutoVariable width="fill" target="esp.show.team-buildings" label="Teammate building ESP"/>
             <AutoVariable width="fill" target="esp.item.health" label="Health packs"/>
             <AutoVariable width="fill" target="esp.item.ammo" label="Ammo packs"/>
             <AutoVariable width="fill" target="esp.item.enable" label="Enable item ESP"/>
             <AutoVariable width="fill" target="esp.projectile.enable" label="Enable projectile ESP"/>
             <AutoVariable width="fill" target="esp.projectile.enemy-only" label="Only enemy projectiles"/>
             <AutoVariable width="fill" target="esp.show.npc" label="NPC ESP"/>
-            <AutoVariable width="fill" target="esp.item.money" label="MvM money"/>
-            <AutoVariable width="fill" target="esp.item.money-red" label="MvM red money" tooltip="Red money is automatically collected."/>
+            <AutoVariable width="fill" target="esp.item.money" label="MvM money" tooltip="Regular MvM money that needs to be picked up."/>
+            <AutoVariable width="fill" target="esp.item.money-red" label="MvM red money" tooltip="Red MvM money that is automatically picked up."/>
             <AutoVariable width="fill" target="esp.item.powerup" label="Mannpower powerups"/>
             <AutoVariable width="fill" target="esp.item.spellbook" label="Spellbooks"/>
             <AutoVariable width="fill" target="esp.item.objectives" label="Objectives" tooltip="Intel, carts and mvm bombs"/>
@@ -111,8 +111,8 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Player Info" x="170" y="300">
         <List width="150">
-            <AutoVariable width="fill" target="misc.playerinfo.draw-kda" label="Draw K/D Over Head"/>
-            <AutoVariable width="fill" target="misc.playerinfo.draw-level" label="That's How Mafia Works"/>
+            <AutoVariable width="fill" target="misc.playerinfo.draw-kda" label="Draw K/D over head"/>
+            <AutoVariable width="fill" target="misc.playerinfo.draw-level" label="That's how Mafia works"/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Strings" x="340">
@@ -133,7 +133,7 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Emoji" x="340" y="155">
         <List width="150">
-            <LabeledObject width="fill" label="Mode">
+            <LabeledObject width="fill" label="Mode" tooltip="Shows an emoji on the heads of ESP targets.">
                 <Select target="esp.emoji.mode">
                     <Option name="None" value="0"/>
                     <Option name="Joy" value="1"/>
@@ -147,7 +147,7 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Dominatemark" x="340" y="240">
         <List width="150">
-            <AutoVariable width="fill" target="dominatemark.enable" label="Enable" tooltip="Enables a mark on people you are dominating, similar to one if you are being dominated by someone else."/>
+            <AutoVariable width="fill" target="dominatemark.enable" label="Enable" tooltip="Enables a mark on people you are dominating, similar to the one shown if someone is dominating you."/>
             <AutoVariable width="fill" target="dominatemark.min-size" label="Draw min size"/>
             <AutoVariable width="fill" target="dominatemark.max-size" label="Draw max size"/>
         </List>
diff --git a/data/menu/nullifiedcat/visuals/glow.xml b/data/menu/nullifiedcat/visuals/glow.xml
index 53f1498a..6c3da196 100755
--- a/data/menu/nullifiedcat/visuals/glow.xml
+++ b/data/menu/nullifiedcat/visuals/glow.xml
@@ -1,10 +1,10 @@
 <Tab name="Glow" padding="4 4 4 4">
     <Box padding="12 6 6 6" width="content" height="content" name="Glow">
         <List width="150">
-            <AutoVariable width="fill" target="glow.enable" label="Enable glow"/>
+            <AutoVariable width="fill" target="glow.enable" label="Enable glow" tooltip="Enables a glow effect on certain targets, showing their position when otherwise not visible."/>
             <AutoVariable width="fill" target="glow.blur-scale" label="Blur scale" min="1" max="20"/>
             <AutoVariable width="fill" target="glow.health" label="Health" tooltip="Color glow according to player health."/>
-            <AutoVariable width="fill" target="glow.aimbot.color" label="Aimbot coloring" tooltip="Color the aimbot's target according to color set in Visual:Colors"/>
+            <AutoVariable width="fill" target="glow.aimbot.color" label="Aimbot coloring" tooltip="Color the aimbot's target according to color set in Visuals->Colors"/>
             <LabeledObject width="fill" label="Solid when">
                 <Select target="glow.solid-when">
                     <Option name="Never" value="0"/>
diff --git a/data/menu/nullifiedcat/visuals/ui.xml b/data/menu/nullifiedcat/visuals/ui.xml
index aa845887..6eceff3b 100755
--- a/data/menu/nullifiedcat/visuals/ui.xml
+++ b/data/menu/nullifiedcat/visuals/ui.xml
@@ -1,7 +1,7 @@
 <Tab name="UI" padding="4 4 4 4">
     <Box padding="12 6 6 6" width="content" height="content" name="UI">
         <List width="180">
-            <AutoVariable width="fill" target="visual.open-gui-button" label="GUI button"/>
+            <AutoVariable width="fill" target="visual.open-gui-button" label="GUI button" tooltip="Button to toggle this menu."/>
             <AutoVariable width="fill" target="visual.clean-screenshots" label="Clean screenshots"/>
             <AutoVariable width="fill" target="visual.disable" label="Disable visuals"/>
             <AutoVariable width="fill" target="visual.medal-flip" label="Guaranteed medal flip"/>
diff --git a/data/menu/nullifiedcat/visuals/world.xml b/data/menu/nullifiedcat/visuals/world.xml
index 88ca3ada..d53a4da6 100755
--- a/data/menu/nullifiedcat/visuals/world.xml
+++ b/data/menu/nullifiedcat/visuals/world.xml
@@ -7,7 +7,7 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Freecam" y="55">
         <List width="180">
-            <AutoVariable width="fill" target="visual.freecam-button" label="Freecam button"/>
+            <AutoVariable width="fill" target="visual.freecam-button" label="Freecam button" tooltip="Press this button to toggle freecam."/>
             <AutoVariable width="fill" target="visual.freecam-speed" label="Freecam speed (HU/s)"/>
         </List>
     </Box>
@@ -21,7 +21,7 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Zooming" y="190">
         <List width="180">
-            <AutoVariable width="fill" target="visual.zoom-key" label="Zoom key"/>
+            <AutoVariable width="fill" target="visual.zoom-key" label="Zoom key" tooltip="Hold down this key to override your FOV to the one set below."/>
             <AutoVariable width="fill" target="visual.zoom-key.fov" label="Zoom FOV"/>
         </List>
     </Box>
@@ -33,7 +33,7 @@
             <AutoVariable width="fill" target="remove.hats" label="Remove hats"/>
             <AutoVariable width="fill" target="remove.contracker" label="Remove contracker"/>
             <AutoVariable width="fill" target="remove.scope" label="Remove scope"/>
-            <AutoVariable width="fill" target="remove.zoom" label="Remove zoom/keep rifle" tooltip="Disables scope zoom and keeps the sniper rifle. Use the command 'zoom_sensitivity_ratio' to adjust mouse sensitivity."/>
+            <AutoVariable width="fill" target="remove.zoom" label="Remove zoom/keep rifle" tooltip="Disables scope zoom and keeps the sniper rifle. Use the command 'zoom_sensitivity_ratio' to adjust mouse sensitivity while zoomed."/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Misc" x="195" y="125">
@@ -93,7 +93,7 @@
                 </Select>
             </LabeledObject>
             <AutoVariable width="fill" target="visual.ragdoll-only-local" label="Only override local player kills"/>
-            <LabeledObject width="fill" label="Pyrovision">
+            <LabeledObject width="fill" label="Pyrovision" tooltip="Can be used to force Pyrovision on or off.">
                 <Select target="visual.force-pyrovision">
                     <Option name="Auto" value="0"/>
                     <Option name="On" value="1"/>
diff --git a/data/menu/nullifiedcat/weapons/aimbot.xml b/data/menu/nullifiedcat/weapons/aimbot.xml
index 26604c79..1031ed31 100755
--- a/data/menu/nullifiedcat/weapons/aimbot.xml
+++ b/data/menu/nullifiedcat/weapons/aimbot.xml
@@ -22,7 +22,7 @@
             <AutoVariable width="fill" target="aimbot.zoomed-only" label="Zoomed only" tooltip="If applicable, the aimbot will only shoot if you are scoped in."/>
         </List>
     </Box>
-    <Box padding="12 6 6 6" width="content" height="content" name="Projectile Aimbot" y="210">
+    <Box padding="12 6 6 6" width="content" height="content" name="Projectile aimbot" y="210">
         <List width="150">
             <AutoVariable width="fill" target="aimbot.projectile.enable" label="Enable projectile aimbot"/>
             <AutoVariable width="fill" target="misc.auto-flip-viewmodel" label="Flip viewmodel" tooltip="Automatically flip the viewmodel for projectile weapons."/>
@@ -116,7 +116,7 @@
             </LabeledObject>
             <AutoVariable width="fill" target="aimbot.spectator.enable" label="Aimbot enable" tooltip="Should the aimbot be enabled based on the above?"/>
             <AutoVariable width="fill" target="aimbot.spectator.fov" label="Spectated FOV" tooltip="FOV for the aimbot when in spectated mode."/>
-            <AutoVariable width="fill" target="aimbot.spectator.slow" label="Spectated slow" min="0" max="30"/>
+            <AutoVariable width="fill" target="aimbot.spectator.slow" label="Spectated slow" tooltip="Controls how quickly the aimbot moves your crosshair while in spectated mode." min="0" max="30"/>
         </List>
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Backtracking" x="340" y="85">
diff --git a/data/menu/nullifiedcat/weapons/nospread.xml b/data/menu/nullifiedcat/weapons/nospread.xml
index 61062844..439922e0 100755
--- a/data/menu/nullifiedcat/weapons/nospread.xml
+++ b/data/menu/nullifiedcat/weapons/nospread.xml
@@ -5,11 +5,11 @@
             <AutoVariable width="fill" target="nospread.bullet" label="Bullet nospread" tooltip="Bullets won't have any spread. Aimbot independent. (Only works on one bullet per shot)."/>
             <AutoVariable width="fill" target="nospread.center-cone" label="Center spread" tooltip="Center the bullet spread cone for a higher hitrate."/>
             <AutoVariable width="fill" target="nospread.draw-info" label="Draw info" tooltip="Draw some useful info onscreen."/>
-            <AutoVariable width="fill" target="nospread.draw-info.mantissa" label="Draw step size" tooltip="Draw Inaccuracy of server clock floats (Higher = Better)."/>
+            <AutoVariable width="fill" target="nospread.draw-info.mantissa" label="Draw step size" tooltip="Draw inaccuracy of server clock floats (higher = better)."/>
             <AutoVariable width="fill" target="nospread.use-extreme-accuracy" label="Precision mode" tooltip="Makes nospread sync slower, but also more accurate and ping resistant."/>
             <AutoVariable width="fill" target="nospread.use-average-latency" label="Use average latency" tooltip="Use average latency for ping correction instead of current one."/>
             <AutoVariable width="fill" target="nospread.correct-ping" label="Try to lag compensate" tooltip="Attempt to compensate for ping. Disable if you miss a lot on low jitter."/>
-            <LabeledObject width="fill" label="Spectator mode" tooltip="When (if every) should being spectated disable the nospread? Spectated: disable when anyone is spectating you. Firstperson: disable only when someone is spectating you in first person.">
+            <LabeledObject width="fill" label="Spectator mode" tooltip="When (if ever) should being spectated disable the nospread? Spectated: disable when anyone is spectating you. Firstperson: disable only when someone is spectating you in first person.">
                 <Select target="nospread.spectator-mode">
                     <Option name="Never" value="0"/>
                     <Option name="Firstperson" value="1" tooltip="Disable if at least one spectator is in firstperson."/>
diff --git a/data/menu/nullifiedcat/weapons/triggerbot.xml b/data/menu/nullifiedcat/weapons/triggerbot.xml
index c79404f9..0c1dca11 100755
--- a/data/menu/nullifiedcat/weapons/triggerbot.xml
+++ b/data/menu/nullifiedcat/weapons/triggerbot.xml
@@ -1,12 +1,12 @@
 <Tab name="Triggerbot" padding="4 4 4 4">
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto Reflect">
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto reflect">
         <List width="202">
             <AutoVariable width="fill" target="autoreflect.enable" label="Enable auto reflect"/>
             <AutoVariable width="fill" target="autoreflect.button" label="Reflect button"/>
             <AutoVariable width="fill" target="autoreflect.idle-only" label="Only reflect when able" tooltip="Don't try to reflect when using primary fire."/>
             <AutoVariable width="fill" target="autoreflect.teammate" label="Teammate projectiles" tooltip="Attempt to reflect teammate projectiles."/>
-            <AutoVariable width="fill" target="autoreflect.teammatesfire" label="Teammates" tooltip="Extinguishes teammates"/>
-            <AutoVariable width="fill" target="autoreflect.dodgeball" label="Dodgeball mode" tooltip="Disable vischeck"/>
+            <AutoVariable width="fill" target="autoreflect.teammatesfire" label="Teammates" tooltip="Auto extinguish teammates."/>
+            <AutoVariable width="fill" target="autoreflect.dodgeball" label="Dodgeball mode" tooltip="Disables vischeck."/>
             <AutoVariable width="fill" target="autoreflect.legit" label="Legit mode" tooltip="Don't move the mouse to reflect. Spectator safe."/>
         </List>
         <Box padding="12 6 6 6" name="Targets" width="content" height="content" y="110">
@@ -23,14 +23,14 @@
                     <AutoVariable width="fill" target="autoreflect.flares" label="Flares"/>
                     <AutoVariable width="fill" target="autoreflect.arrows" label="Arrows"/>
                     <AutoVariable width="fill" target="autoreflect.jars" label="Jars"/>
-                    <AutoVariable width="fill" target="autoreflect.healingbolts" label="Healing bolts"/>
-                    <AutoVariable width="fill" target="autoreflect.cleavers" label="Cleavers"/>
+                    <AutoVariable width="fill" target="autoreflect.healingbolts" label="Healing bolts" tooltip="Crusader's Crossbow healing bolts."/>
+                    <AutoVariable width="fill" target="autoreflect.cleavers" label="Cleavers" tooltip="The Scout's Flying Guillotine."/>
                 </List>
             </Box>
             <AutoVariable width="196" y="95" target="autoreflect.default" label="Default" tooltip="If a projectile is not known, should autoreflect still try to reflect it?"/>
         </Box>
     </Box>
-    <Box padding="12 6 6 6" width="content" height="content" name="Auto backstab" y="245">
+    <Box padding="12 6 6 6" width="content" height="content" name="Auto backstab" y="250">
         <List width="214">
             <AutoVariable width="fill" target="autobackstab.enabled" label="Enable auto backstab"/>
             <AutoVariable width="fill" target="autobackstab.decrease-range" label="Decrease stab range" tooltip="Decreases the swing range in order to make backstabs more consistent. Recommended while using backtrack."/>
@@ -61,7 +61,7 @@
             <AutoVariable width="fill" target="trigger.accuracy" label="Accuracy mode" tooltip="Shrinks the target's effective hitbox. Makes the triggerbot more accurate, but fire less frequently." min="0" max="10"/>
             <AutoVariable width="fill" target="trigger.delay" label="Delay" tooltip="Triggerbot's delay in milliseconds." min="0" max="1"/>
         </List>
-        <Box padding="12 6 6 6" width="content" height="content" name="Target selection" y="125">
+        <Box padding="12 6 6 6" width="content" height="content" name="Target selection" y="120">
             <List width="150">
                 <LabeledObject width="fill" label="Hitbox mode">
                     <Select target="trigger.hitbox-mode">
@@ -82,7 +82,7 @@
     </Box>
     <Box padding="12 6 6 6" width="content" height="content" name="Auto Detonator" x="410">
         <List width="150">
-            <AutoVariable width="fill" target="auto-detonator.enable" label="Enable auto Detonator" tooltip="Auto explode flares."/>
+            <AutoVariable width="fill" target="auto-detonator.enable" label="Enable auto Detonator" tooltip="Auto explode Detonator flares."/>
             <AutoVariable width="fill" target="auto-detonator.ignore-cloaked" label="Ignore cloaked"/>
         </List>
     </Box>
@@ -90,7 +90,13 @@
         <List width="150">
             <AutoVariable width="fill" target="autosticky.enable" label="Enable auto sticky" tooltip="Auto detonate stickies."/>
             <AutoVariable width="fill" target="autosticky.buildings" label="Detonate on buildings"/>
-            <AutoVariable width="fill" target="autosticky.legit" label="Legit mode" tooltip="Require line of sight and ignores invisible spies."/>
+                <LabeledObject width="fill" label="Legit mode" tooltip="Rage: No changes to make the autosticky appear more legit. Semi-legit: Require a line of sight to the Sticky and ignores invisible spies. Legit: same as semi-legit but also require a line of sight to the enemy.">
+                    <Select target="autosticky.legit-mode">
+                        <Option name="Rage" value="0"/>
+                        <Option name="Semi-legit" value="1"/>
+                        <Option name="Legit" value="2"/>
+                    </Select>
+                </LabeledObject>
             <AutoVariable width="fill" target="autosticky.dontblowmeup" label="Don't blow me up" tooltip="Don't detonate if you would recieve damage."/>
             <AutoVariable width="fill" target="autosticky.min-dist" label="Min distance" tooltip="Stickies will be auto-detonated if enemies are within this distance (measured in Hammer units)." min="0" max="130" step="5"/>
         </List>
diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp
index 5368e85c..20087583 100644
--- a/src/hacks/AutoSticky.cpp
+++ b/src/hacks/AutoSticky.cpp
@@ -14,7 +14,7 @@ namespace hacks::tf::autosticky
 {
 static settings::Boolean enable{ "autosticky.enable", "false" };
 static settings::Boolean buildings{ "autosticky.buildings", "true" };
-static settings::Boolean legit{ "autosticky.legit", "false" };
+static settings::Int legit{ "autosticky.legit-mode", "0" };
 static settings::Boolean dontblowmeup{ "autosticky.dontblowmeup", "true" };
 static settings::Int min_dist{ "autosticky.min-dist", "130" };
 
@@ -22,6 +22,8 @@ static settings::Int min_dist{ "autosticky.min-dist", "130" };
 static std::vector<CachedEntity *> bombs;
 static std::vector<CachedEntity *> targets;
 
+bool shouldExplode;
+
 // Function to tell when an ent is the local players own bomb
 bool IsBomb(CachedEntity *ent)
 {
@@ -71,8 +73,8 @@ bool IsTarget(CachedEntity *ent)
             // if (ignore_taunting && HasCondition<TFCond_Taunting>(ent)) return
             // false;
 
-            // If settings allow, dont target cloaked players
-            if (legit && IsPlayerInvisible(ent))
+            // If settings don't allow, dont target cloaked players
+            if (*legit && IsPlayerInvisible(ent))
                 return false;
         }
 
@@ -179,21 +181,15 @@ void CreateMove()
                     {
                         // Check user settings if legit mode is off, if legit mode
                         // is off then detonate
-                        if (!legit)
-                        {
-                            // Aim at bomb
-                            if (IsScottishResistance)
-                                AimAt(g_pLocalPlayer->v_Eye, bomb->m_vecOrigin(), current_user_cmd);
-                            // Use silent
-                            g_pLocalPlayer->bUseSilentAngles = true;
-
-                            // Continue the loop in case local player is within the explosion radius
-                            found = true;
-                            continue;
-                        }
-                        // Since legit mode is on, check if the sticky can see
-                        // the local player
-                        else if (CE_GOOD(target) && IsVectorVisible(g_pLocalPlayer->v_Eye, bomb->m_vecOrigin(), true))
+                        shouldExplode = false;
+                        if (!*legit)
+                            shouldExplode = true;
+                        else if (*legit == 1 && CE_GOOD(target) && IsVectorVisible(g_pLocalPlayer->v_Eye, bomb->m_vecOrigin(), true))
+                            shouldExplode = true;
+                        else if (*legit == 2 && CE_GOOD(target) && IsVectorVisible(g_pLocalPlayer->v_Eye, bomb->m_vecOrigin(), true) && IsVectorVisible(g_pLocalPlayer->v_Eye, *position, true))
+                            shouldExplode = true;
+                        
+                        if (shouldExplode)
                         {
                             // Aim at bomb
                             if (IsScottishResistance)