From 0d84c87ebcae3d6e3b510944466b31b4ae003848 Mon Sep 17 00:00:00 2001
From: LightCat <BenCat07@gmail.com>
Date: Sat, 1 Sep 2018 15:23:28 +0200
Subject: [PATCH] aa stuff

---
 data/menu/nullifiedcat/antiaim.xml | 1 +
 data/menu/nullifiedcat/catbot.xml  | 2 +-
 src/hacks/AntiAim.cpp              | 9 +++++++++
 src/hacks/AntiAntiAim.cpp          | 4 ++++
 src/reclasses/CTFPartyClient.cpp   | 3 ++-
 src/tfmm.cpp                       | 6 ++----
 6 files changed, 19 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 src/hacks/AntiAntiAim.cpp

diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index 5df916f5..9734d543 100755
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -50,6 +50,7 @@
                     <Option name="FakeLeft" value="19"/>
                     <Option name="FakeRight" value="20"/>
                     <Option name="FakeREdge" value="21"/>
+                    <Option name="TestAA" value="22"/>
                 </Select>
             </LabeledObject>
         </List>
diff --git a/data/menu/nullifiedcat/catbot.xml b/data/menu/nullifiedcat/catbot.xml
index e873011d..ab88a82a 100755
--- a/data/menu/nullifiedcat/catbot.xml
+++ b/data/menu/nullifiedcat/catbot.xml
@@ -57,7 +57,7 @@
     <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.draw" label="Draw Path"/>
             <AutoVariable width="fill" target="navbot.enable" label="Enable NavBot"/>
             <AutoVariable width="fill" target="navbot.spy-mode" label="Enable Spy Mode"/>
             <AutoVariable width="fill" target="navbot.heavy-mode" label="Enable Heavy Mode"/>
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index 657240ed..d433016c 100644
--- a/src/hacks/AntiAim.cpp
+++ b/src/hacks/AntiAim.cpp
@@ -401,6 +401,7 @@ void FakeCrouch(CUserCmd *cmd)
     if ((cmd->buttons & IN_ATTACK))
         *bSendPackets = true;
 }
+static float randyaw = 0.0f;
 void ProcessUserCmd(CUserCmd *cmd)
 {
     if (!enable)
@@ -546,6 +547,14 @@ void ProcessUserCmd(CUserCmd *cmd)
                 y = useEdge(y) + 180.0f;
         }
         break;
+    case 22: // Omegayaw
+        if (*bSendPackets)
+        {
+            randyaw += RandFloatRange(-30.0f, 30.0f);
+            y = randyaw;
+        }
+        else
+            y = randyaw - 180.0f + RandFloatRange(-40.0f, 40.0f);
     default:
         break;
     }
diff --git a/src/hacks/AntiAntiAim.cpp b/src/hacks/AntiAntiAim.cpp
old mode 100755
new mode 100644
index b3b7928d..8ebf9fcc
--- a/src/hacks/AntiAntiAim.cpp
+++ b/src/hacks/AntiAntiAim.cpp
@@ -49,6 +49,10 @@ void hacks::shared::anti_anti_aim::resolveEnt(int IDX, IClientEntity *entity)
         if (angles.y < 0)
             angles.y += 360.0f;
         angles.y -= 180.0f;
+        if (angles.x >= 90)
+            angles.x = -89;
+        if (angles.x <= -90)
+            angles.x = 89;
         if (quota < 0.8f)
             switch (g_Settings.brute.brutenum[IDX])
             {
diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp
index 2b756e7b..a106e1ac 100644
--- a/src/reclasses/CTFPartyClient.cpp
+++ b/src/reclasses/CTFPartyClient.cpp
@@ -70,7 +70,8 @@ int re::CTFPartyClient::LoadSavedCasualCriteria()
 void re::CTFPartyClient::RequestQueueForStandby()
 {
     typedef void (*RequestStandby_t)(re::CTFPartyClient *);
-    static uintptr_t addr = gSignatures.GetClientSignature("55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 4F ? 85 C9 74");
+    static uintptr_t addr = gSignatures.GetClientSignature(
+        "55 89 E5 57 56 53 83 EC ? 8B 7D ? 8B 4F ? 85 C9 74");
     static RequestStandby_t RequestStandby_fn = RequestStandby_t(addr);
     RequestStandby_fn(this);
     return;
diff --git a/src/tfmm.cpp b/src/tfmm.cpp
index 5734ef0e..aed063e9 100644
--- a/src/tfmm.cpp
+++ b/src/tfmm.cpp
@@ -13,9 +13,7 @@ settings::Int queue{ "autoqueue.mode", "7" };
 
 CatCommand cmd_queue_start("mm_queue_casual", "Start casual queue",
                            []() { tfmm::startQueue(); });
-CatCommand queue_party("mm_queue_party", "Queue for Party",
-                           []()
-{
+CatCommand queue_party("mm_queue_party", "Queue for Party", []() {
     re::CTFPartyClient *client = re::CTFPartyClient::GTFPartyClient();
     client->RequestQueueForStandby();
 });
@@ -61,7 +59,7 @@ void startQueue()
         if (*queue == 7)
             client->LoadSavedCasualCriteria();
         client->RequestQueueForMatch((int) queue);
-	client->RequestQueueForStandby();
+        client->RequestQueueForStandby();
         hacks::shared::autojoin::resetQueueTimer();
         queuecount++;
     }