From 32baac5c8cc3d0fea3034f3ae42a652bb3a8f259 Mon Sep 17 00:00:00 2001
From: LightPower392 <60998601+LightPower392@users.noreply.github.com>
Date: Mon, 17 Feb 2020 08:04:02 -0800
Subject: [PATCH] Fix movement.xml and add disguised option to chams (#915)

* Fixed capitalization

* Added disguised option

* Added disguised option

* Added disguised option

* fixed IsPlayerDisguised(ent)

* Fixed IsPlayerDisguised(ent)

* Fixed IsPlayerDisguised(ent)
---
 data/menu/nullifiedcat/movement.xml         | 28 ++++++++++-----------
 data/menu/nullifiedcat/trigger/autoheal.xml | 18 ++++++-------
 data/menu/nullifiedcat/visuals/chams.xml    |  1 +
 src/visual/EffectChams.cpp                  |  3 +++
 src/visual/EffectGlow.cpp                   |  2 +-
 5 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/data/menu/nullifiedcat/movement.xml b/data/menu/nullifiedcat/movement.xml
index 35aff2e6..56310bea 100755
--- a/data/menu/nullifiedcat/movement.xml
+++ b/data/menu/nullifiedcat/movement.xml
@@ -9,19 +9,19 @@
         <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.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.mimic-crouch" label="Mimic crouch"/>
+            <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.mimic-crouch" label="Mimic Crouch"/>
             <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"/>
+            <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"/>
             <AutoVariable width="fill" target="follow-bot.prioritize-friends" label="Prioritize Friends"/>
             <AutoVariable width="fill" target="follow-bot.prioritize-leader" label="Prioritize the Party Leader"/>
             <AutoVariable width="fill" target="follow-bot.draw-crumbs" label="Draw Crumbs"/>
@@ -33,16 +33,16 @@
 	        <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.engineer-mode" label="Enable Engineer mode"/>
+            <AutoVariable width="fill" target="navbot.engineer-mode" label="Enable Engineer Mode"/>
             <AutoVariable width="fill" target="navbot.get-health-and-ammo" label="Get Health and Ammo"/>
             <AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/>
             <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.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.spy-ignore-time" label="Spy ignore time"/>
+            <AutoVariable width="fill" target="navbot.stay-near" label="Zone Enemies (Stay Near)"/>
+            <AutoVariable width="fill" target="navbot.spy-ignore-time" label="Spy ignore Time"/>
             <!-- <!AutoVariable width="fill" target="navbot.take-teleporters" label="take teleporters"/> -->
         </List>
     </Box>
diff --git a/data/menu/nullifiedcat/trigger/autoheal.xml b/data/menu/nullifiedcat/trigger/autoheal.xml
index 142364d2..a1084b0e 100755
--- a/data/menu/nullifiedcat/trigger/autoheal.xml
+++ b/data/menu/nullifiedcat/trigger/autoheal.xml
@@ -15,13 +15,13 @@
     <Box padding="12 6 6 6" width="content" height="content" name="Health Priority" y="155">
         <List width="160">
             <AutoVariable width="fill" target="autoheal.priority-scout" label="Scout Weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-soldier" label="Soldier weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-pyro" label="Pyro weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-demoman" label="Demoman weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-heavy" label="Heavy weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-engineer" label="Engineer weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-medic" label="Medic weight"/>
-            <AutoVariable width="fill" target="autoheal.priority-sniper" label="Sniper weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-soldier" label="Soldier Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-pyro" label="Pyro Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-demoman" label="Demoman Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-heavy" label="Heavy Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-engineer" label="Engineer Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-medic" label="Medic Weight"/>
+            <AutoVariable width="fill" target="autoheal.priority-sniper" label="Sniper Weight"/>
             <AutoVariable width="fill" target="autoheal.priority-spy" label="Spy Weight"/>
         </List>
     </Box>
@@ -40,7 +40,7 @@
         </List>
         <Box padding="12 6 6 6" name="Bullet" width="content" height="content" x="170">
             <List width="150">
-                <LabeledObject width="fill" label="Sniper Pp">
+                <LabeledObject width="fill" label="Sniper Pop">
                     <Select target="autoheal.vacc.bullet.sniper-pop">
                         <Option name="Never" value="0"/>
                         <Option name="Visible, zoom" value="1"/>
@@ -66,7 +66,7 @@
                 <AutoVariable width="fill" target="autoheal.vacc.fire.prevent-afterburn" label="Prevent Afterburn"/>
                 <AutoVariable width="fill" target="autoheal.vacc.fire.pyro-range" label="Danger Range"/>
                 <AutoVariable width="fill" target="autoheal.vacc.fire.min-charges" label="Min. Charges" min="0" max="4"/>
-                <LabeledObject width="fill" label="Pyro pop">
+                <LabeledObject width="fill" label="Pyro Pop">
                     <Select target="autoheal.vacc.fire.pyro-pop">
                         <Option name="Never" value="0"/>
                         <Option name="Near, flames" value="1"/>
diff --git a/data/menu/nullifiedcat/visuals/chams.xml b/data/menu/nullifiedcat/visuals/chams.xml
index 8a31c52f..300282a3 100755
--- a/data/menu/nullifiedcat/visuals/chams.xml
+++ b/data/menu/nullifiedcat/visuals/chams.xml
@@ -22,6 +22,7 @@
         <List width="150">
             <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="Chams Self"/>
             <AutoVariable width="fill" target="chams.show.buildings" label="Buildings"/>
             <AutoVariable width="fill" target="chams.show.teammate-buildings" label="Team Buildings"/>
diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp
index 9857b310..9541fa82 100644
--- a/src/visual/EffectChams.cpp
+++ b/src/visual/EffectChams.cpp
@@ -16,6 +16,7 @@ namespace effect_chams
 static settings::Boolean flat{ "chams.flat", "false" };
 static settings::Boolean health{ "chams.health", "false" };
 static settings::Boolean teammates{ "chams.show.teammates", "false" };
+static settings::Boolean disguised{ "chams.show.disguised", "true" };
 static settings::Boolean players{ "chams.show.players", "true" };
 static settings::Boolean medkits{ "chams.show.medkits", "false" };
 static settings::Boolean ammobox{ "chams.show.ammoboxes", "false" };
@@ -233,6 +234,8 @@ bool EffectChams::ShouldRenderChams(IClientEntity *entity)
     case ENTITY_PLAYER:
         if (!players)
             return false;
+        if (!disguised && IsPlayerDisguised(ent))
+            return false;
         if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent))
             return false;
         if (CE_BYTE(ent, netvar.iLifeState))
diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp
index 1a8db157..ffbb16b1 100644
--- a/src/visual/EffectGlow.cpp
+++ b/src/visual/EffectGlow.cpp
@@ -286,7 +286,7 @@ bool EffectGlow::ShouldRenderGlow(IClientEntity *entity)
     case ENTITY_PLAYER:
         if (!players)
             return false;
-        if (!disguised && (IsPlayerDisguised(ent)))
+        if (!disguised && IsPlayerDisguised(ent))
             return false;
         if (!teammates && !ent->m_bEnemy() && playerlist::IsDefault(ent))
             return false;