From ee773ac88b710e5a76f1bce44a461b30e88a6521 Mon Sep 17 00:00:00 2001
From: BenCat07 <BenCat07@gmail.com>
Date: Wed, 15 May 2019 18:19:22 +0200
Subject: [PATCH] Add Misc improvements

Log when Equipping an item failed
Add Deadringer to ESP Conditions
Fix Auto Deadringer not doing its job properly
---
 src/hacks/Achievement.cpp    | 8 ++++++++
 src/hacks/AutoDeadringer.cpp | 2 +-
 src/hacks/ESP.cpp            | 9 ++++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp
index 833a19d1..058ec30c 100644
--- a/src/hacks/Achievement.cpp
+++ b/src/hacks/Achievement.cpp
@@ -382,6 +382,14 @@ static InitRoutine init([]() {
                     if (!equip_queue.size())
                         equip = false;
                 }
+                else if (accept_time.check(10000) && cooldown_2.test_and_set(500))
+                {
+                    if (equip_queue.size())
+                    {
+                        logging::Info("Equipping failed!");
+                        equip_queue.clear();
+                    }
+                }
             }
         },
         "achievement_autounlock");
diff --git a/src/hacks/AutoDeadringer.cpp b/src/hacks/AutoDeadringer.cpp
index 422b3be3..a362460a 100644
--- a/src/hacks/AutoDeadringer.cpp
+++ b/src/hacks/AutoDeadringer.cpp
@@ -63,7 +63,7 @@ static void CreateMove()
             continue;
         if (ent->m_bCritProjectile() && ent->m_flDistance() <= 1000.0f)
             current_user_cmd->buttons |= IN_ATTACK2;
-        if (ent->m_flDistance() < 300.0f)
+        else if (ent->m_flDistance() < 300.0f)
             current_user_cmd->buttons |= IN_ATTACK2;
     }
 }
diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp
index 0032647b..18b19536 100644
--- a/src/hacks/ESP.cpp
+++ b/src/hacks/ESP.cpp
@@ -1134,7 +1134,14 @@ void _FASTCALL ProcessEntity(CachedEntity *ent)
                     const auto &clr = colors::EntityF(ent);
                     // Invis
                     if (IsPlayerInvisible(ent))
-                        AddEntityString(ent, "*CLOAKED*", colors::FromRGBA8(220.0f, 220.0f, 220.0f, 255.0f));
+                    {
+                        if (HasCondition<TFCond_DeadRingered>(ent))
+                            AddEntityString(ent, "*DEADRINGERED*", colors::FromRGBA8(178.0f, 0.0f, 255.0f, 255.0f));
+                        else
+                            AddEntityString(ent, "*CLOAKED*", colors::FromRGBA8(220.0f, 220.0f, 220.0f, 255.0f));
+                    }
+                    if (CE_BYTE(ent, netvar.m_bFeignDeathReady))
+                        AddEntityString(ent, "*DEADRINGER OUT*", colors::FromRGBA8(178.0f, 0.0f, 255.0f, 255.0f));
                     // Uber/Bonk
                     if (IsPlayerInvulnerable(ent))
                         AddEntityString(ent, "*INVULNERABLE*");