diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml
index 8c97af25..9734d543 100755
--- a/data/menu/nullifiedcat/antiaim.xml
+++ b/data/menu/nullifiedcat/antiaim.xml
@@ -50,7 +50,7 @@
-
+
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 @@
-
+
diff --git a/include/reclasses/CTFPartyClient.hpp b/include/reclasses/CTFPartyClient.hpp
index 731bcd25..bf07730c 100644
--- a/include/reclasses/CTFPartyClient.hpp
+++ b/include/reclasses/CTFPartyClient.hpp
@@ -20,6 +20,7 @@ public:
static ITFGroupMatchCriteria *MutLocalGroupCriteria(CTFPartyClient *client);
static bool BCanQueueForStandby(CTFPartyClient *this_);
char RequestQueueForMatch(int type);
+ void RequestQueueForStandby();
bool BInQueueForMatchGroup(int type);
char RequestLeaveForMatch(int type);
int BInvitePlayerToParty(CSteamID steamid);
diff --git a/include/reclasses/C_TFWeaponBaseMelee.hpp b/include/reclasses/C_TFWeaponBaseMelee.hpp
index da28d432..5ed03568 100644
--- a/include/reclasses/C_TFWeaponBaseMelee.hpp
+++ b/include/reclasses/C_TFWeaponBaseMelee.hpp
@@ -28,7 +28,7 @@ public:
self->GetClientClass()->m_ClassID == CL_CLASS(CTFKatana))
return 128;
else
- return (128.0f * 0.67) - 0.5f;
+ return 72;
}
};
} // namespace re
diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp
index 2d541b4f..189f1cd9 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)
@@ -547,12 +548,11 @@ void ProcessUserCmd(CUserCmd *cmd)
case 22: // Omegayaw
if (*bSendPackets)
{
- rngyaw = RandFloatRange(-180.0f, 180.0f);
- y = rngyaw;
+ randyaw += RandFloatRange(-30.0f, 30.0f);
+ y = randyaw;
}
else
- y = rngyaw - 180.0f;
- break;
+ 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/hacks/Misc.cpp b/src/hacks/Misc.cpp
index 2cb84178..689bbc25 100644
--- a/src/hacks/Misc.cpp
+++ b/src/hacks/Misc.cpp
@@ -483,6 +483,8 @@ CatCommand set_value("set", "Set value", [](const CCommand &args) {
return;
std::string value(args.Arg(2));
ReplaceString(value, "\\n", "\n");
+ var->m_fMaxVal = 999999999.9f;
+ var->m_fMinVal = -999999999.9f;
var->SetValue(value.c_str());
logging::Info("Set '%s' to '%s'", args.Arg(1), value.c_str());
});
diff --git a/src/hacks/NavBot.cpp b/src/hacks/NavBot.cpp
index d41afa21..46d56187 100644
--- a/src/hacks/NavBot.cpp
+++ b/src/hacks/NavBot.cpp
@@ -218,6 +218,8 @@ void initonce()
cd2.update();
cd3.update();
engi_spot_cd.update();
+ sniper_spots.clear();
+ preferred_sniper_spots.clear();
return;
}
diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp
index ba230beb..a106e1ac 100644
--- a/src/reclasses/CTFPartyClient.cpp
+++ b/src/reclasses/CTFPartyClient.cpp
@@ -67,7 +67,15 @@ int re::CTFPartyClient::LoadSavedCasualCriteria()
return LoadSavedCasualCriteria_fn(this);
}
-
+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 RequestStandby_t RequestStandby_fn = RequestStandby_t(addr);
+ RequestStandby_fn(this);
+ return;
+}
char re::CTFPartyClient::RequestQueueForMatch(int type)
{
typedef char (*RequestQueueForMatch_t)(re::CTFPartyClient *, int);
diff --git a/src/tfmm.cpp b/src/tfmm.cpp
index 81617b0c..aed063e9 100644
--- a/src/tfmm.cpp
+++ b/src/tfmm.cpp
@@ -13,7 +13,10 @@ 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", []() {
+ re::CTFPartyClient *client = re::CTFPartyClient::GTFPartyClient();
+ client->RequestQueueForStandby();
+});
CatCommand cmd_abandon("mm_abandon", "Abandon match",
[]() { tfmm::abandon(); });
@@ -56,6 +59,7 @@ void startQueue()
if (*queue == 7)
client->LoadSavedCasualCriteria();
client->RequestQueueForMatch((int) queue);
+ client->RequestQueueForStandby();
hacks::shared::autojoin::resetQueueTimer();
queuecount++;
}