From 9ad30fb824528d899d001f2836d2b7bba8ad320d Mon Sep 17 00:00:00 2001 From: LightCat Date: Thu, 30 Aug 2018 21:53:42 +0200 Subject: [PATCH 1/4] No min/max on cat_set'd cvars --- include/reclasses/C_TFWeaponBaseMelee.hpp | 2 +- src/hacks/Misc.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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/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()); }); From 0fe0d8946c193e5255b664b0a97d5a9cb2cd6d4b Mon Sep 17 00:00:00 2001 From: LightCat Date: Fri, 31 Aug 2018 15:18:32 +0200 Subject: [PATCH 2/4] fixes:tm: --- src/hacks/NavBot.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hacks/NavBot.cpp b/src/hacks/NavBot.cpp index 1d3fd479..6d685826 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.update(); + preferred_sniper_spots.update(); return; } From 7297288020a4d2b85ad0bca409cd1bfcc41f977f Mon Sep 17 00:00:00 2001 From: LightCat Date: Fri, 31 Aug 2018 16:35:28 +0200 Subject: [PATCH 3/4] Auto queue for current party too --- include/reclasses/CTFPartyClient.hpp | 1 + src/hacks/NavBot.cpp | 4 ++-- src/reclasses/CTFPartyClient.cpp | 9 ++++++++- src/tfmm.cpp | 8 +++++++- 4 files changed, 18 insertions(+), 4 deletions(-) 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/src/hacks/NavBot.cpp b/src/hacks/NavBot.cpp index 6d685826..632e0133 100644 --- a/src/hacks/NavBot.cpp +++ b/src/hacks/NavBot.cpp @@ -218,8 +218,8 @@ void initonce() cd2.update(); cd3.update(); engi_spot_cd.update(); - sniper_spots.update(); - preferred_sniper_spots.update(); + sniper_spots.clear(); + preferred_sniper_spots.clear(); return; } diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp index ba230beb..2b756e7b 100644 --- a/src/reclasses/CTFPartyClient.cpp +++ b/src/reclasses/CTFPartyClient.cpp @@ -67,7 +67,14 @@ 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..5734ef0e 100644 --- a/src/tfmm.cpp +++ b/src/tfmm.cpp @@ -13,7 +13,12 @@ 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 +61,7 @@ void startQueue() if (*queue == 7) client->LoadSavedCasualCriteria(); client->RequestQueueForMatch((int) queue); + client->RequestQueueForStandby(); hacks::shared::autojoin::resetQueueTimer(); queuecount++; } From 0d84c87ebcae3d6e3b510944466b31b4ae003848 Mon Sep 17 00:00:00 2001 From: LightCat Date: Sat, 1 Sep 2018 15:23:28 +0200 Subject: [PATCH 4/4] 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 @@