diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 612d12e8..b6e608c2 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + diff --git a/src/hacks/AntiAim.cpp b/src/hacks/AntiAim.cpp index 4012142d..cee36c2a 100644 --- a/src/hacks/AntiAim.cpp +++ b/src/hacks/AntiAim.cpp @@ -14,12 +14,12 @@ namespace shared namespace antiaim { -CatVar communicate(CV_SWITCH, "identify", "1", +CatVar communicate(CV_SWITCH, "identify", "1", "identify", "Auto identify for other cathook users"); CatVar enabled(CV_SWITCH, "aa_enabled", "0", "Anti-Aim", "Master AntiAim switch"); -CatVar trueang(CV_SWITCH, "aa_truefakes", "1", - "Do true fakeangles (Unresolveable)"); +CatVar trueang(CV_SWITCH, "aa_realfakes", "1", "Real fakes", + "Do real fakeangles (Unresolveable)"); CatVar yaw(CV_FLOAT, "aa_yaw", "0.0", "Yaw", "Static yaw (left/right)", 360.0); CatVar pitch(CV_FLOAT, "aa_pitch", "-89.0", "Pitch", "Static pitch (up/down)", -89.0, 89.0); @@ -28,10 +28,10 @@ CatVar yaw_real(CV_FLOAT, "aa_yaw_real", "0.0", "Real Yaw", CatVar pitch_real(CV_FLOAT, "aa_pitch_real", "-89.0", "Real Pitch", "Static pitch (up/down)", -89.0, 89.0); CatEnum yaw_mode_enum({ "KEEP", "STATIC", "JITTER", "BIGRANDOM", "RANDOM", - "SPIN", "OFFSETKEEP", "EDGE", "HECK" }); + "SPIN", "OFFSETKEEP", "EDGE", "HECK", "FAKESIDEWAYS" }); CatEnum pitch_mode_enum({ "KEEP", "STATIC", "JITTER", "RANDOM", "FLIP", "FAKEFLIP", "FAKEUP", "FAKEDOWN", "FAKECENTER", "UP", - "DOWN", "HECK", "FAKESIDEWAYS" }); + "DOWN", "HECK" }); CatVar yaw_mode(yaw_mode_enum, "aa_yaw_mode", "0", "Yaw mode", "Yaw mode"); CatVar pitch_mode(pitch_mode_enum, "aa_pitch_mode", "0", "Pitch mode", "Pitch mode"); diff --git a/src/hacks/ESP.cpp b/src/hacks/ESP.cpp index d167a7f9..1e16e876 100644 --- a/src/hacks/ESP.cpp +++ b/src/hacks/ESP.cpp @@ -29,10 +29,12 @@ CatVar tracers(tracers_enum, "esp_tracers", "0", "Tracers", CatEnum emoji_esp_enum({ "None", "Joy", "Thinking" }); CatVar emoji_esp(emoji_esp_enum, "esp_emoji", "0", "Emoji ESP", "Draw emoji on peopels head"); -CatVar emoji_ok(CV_SWITCH, "esp_okhand", "0", "Draw ok_hand on hands"); -CatVar emoji_esp_size(CV_FLOAT, "esp_emoji_size", "32", "Emoji ESP Size"); +CatVar emoji_ok(CV_SWITCH, "esp_okhand", "0", "ok_hand", + "Draw ok_hand on hands"); +CatVar emoji_esp_size(CV_FLOAT, "esp_emoji_size", "32", "Emoji ESP Size", + "Emoji size"); CatVar emoji_esp_scaling(CV_SWITCH, "esp_emoji_scaling", "1", - "Emoji ESP Scaling"); + "Emoji ESP Scaling", "Emoji ESP Scaling"); CatVar emoji_min_size(CV_INT, "esp_emoji_min_size", "20", "Emoji ESP min size", "Minimum size for an emoji when you use auto scaling"); hitbox_cache::CachedHitbox *hitboxcache[32][18]{}; diff --git a/src/hacks/LagExploit.cpp b/src/hacks/LagExploit.cpp index ed8c919f..b27c92d2 100644 --- a/src/hacks/LagExploit.cpp +++ b/src/hacks/LagExploit.cpp @@ -14,22 +14,25 @@ namespace shared namespace lagexploit { -CatVar toggle(CV_SWITCH, "se_toggle", "0", "Toggle sequence exploit"); -CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot two shots at once"); +CatVar toggle(CV_SWITCH, "se_toggle", "0", "toggle", "Toggle sequence exploit"); +CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot", + "Instant revvup/shoot two shots at once"); // SHOUTOUTS TO BLACKFIRE CatVar doom(CV_SWITCH, "se_doom", "0", "Shoot 2+ shots at once", "See Center string on activation."); +CatVar razorback(CV_SWITCH, "se_antirazorback", "0", "Anti-Razorback", + "Stab through razorbacks"); CatVar stickyspam(CV_SWITCH, "se_stickyspam", "0", "Sticky spam", "Allows Spam of stickies simply by holding Mouse1."); -CatVar cloak(CV_SWITCH, "se_cloak", "0", "Instant decloak/cloak"); -CatVar cap(CV_SWITCH, "se_cap", "0", "Auto instant cap"); +CatVar cloak(CV_SWITCH, "se_cloak", "0", "Instant decloak/cloak", ""); +CatVar cap(CV_SWITCH, "se_cap", "0", "Auto instant cap", ""); CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points", "Automatically farm points by touching " "the cart (only works on attacking " "team)"); CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0", - "Instant weapon switch"); + "Instant weapon switch", ""); CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key"); CatVar master_switch(CV_SWITCH, "se_master", "1", "Enable sequence exploit", "Master switch for the sequence exploit\nDisabling this " @@ -293,9 +296,10 @@ void CreateMove() if (instant_weapon_switch && not HasCondition(LOCAL_E)) { static int lastweapon = 0; - if (lastweapon != g_pUserCmd->weaponselect) - amount = 1 * 90; - lastweapon = g_pUserCmd->weaponselect; + if (lastweapon != g_pUserCmd->weaponselect) { + amount = 2 * 90; + lastweapon = g_pUserCmd->weaponselect; + } } if (cloak && shoot) { @@ -395,7 +399,7 @@ void CreateMove() } } // SHOUTOUTS TO BLACKFIRE - if (doom) + if (doom || razorback) { static int i = 0; servertime = @@ -407,7 +411,7 @@ void CreateMove() CE_FLOAT(g_pLocalPlayer->weapon(), netvar.flNextPrimaryAttack); if (servertime - nextattack > 30.0f) nextattack = servertime - 30.0f; - if (servertime - nextattack > 0.0f && + if (doom && servertime - nextattack > 0.0f && (g_pUserCmd->buttons & IN_ATTACK || g_pUserCmd->buttons & IN_ATTACK2)) { @@ -420,6 +424,19 @@ void CreateMove() g_pUserCmd->buttons &= ~IN_ATTACK2; } } + else if (razorback && servertime - nextattack > 3.0f && + (g_pUserCmd->buttons & IN_ATTACK || + g_pUserCmd->buttons & IN_ATTACK2)) + { + if (g_pLocalPlayer->weapon()->m_iClassID == CL_CLASS(CTFKnife)) + { + if (!i) + i = 3; + amount = i * 66; + g_pUserCmd->buttons &= ~IN_ATTACK; + g_pUserCmd->buttons &= ~IN_ATTACK2; + } + } if (i) i--; lastwep = g_pLocalPlayer->weapon()->m_IDX; @@ -444,6 +461,16 @@ void Draw() auto amount = (int) servertime - (int) nextattack; AddCenterString(format("Fireable amount: ", amount), colors::orange); } + if (razorback) + if (servertime - nextattack > 3.0f) + { + AddCenterString(format("Can Stab through Razorback"), + colors::green); + } + else if (servertime - nextattack < 3.0f) + AddCenterString(format("Can't Stab through Razorback"), + colors::red); + #endif } } diff --git a/src/hooks/others.cpp b/src/hooks/others.cpp index 7b717c3b..2532ad38 100644 --- a/src/hooks/others.cpp +++ b/src/hooks/others.cpp @@ -283,16 +283,15 @@ static CatVar newlines_msg(CV_INT, "chat_newlines", "0", "Prefix newlines", // "Use this if you want to use spam/killsay and still be able to chat normally // (without having your msgs eaten by valve cooldown)"); -static CatVar airstuck(CV_KEY, "airstuck", "0", "Airstuck"); +static CatVar airstuck(CV_KEY, "airstuck", "0", "Airstuck", ""); static CatVar crypt_chat( CV_SWITCH, "chat_crypto", "1", "Crypto chat", "Start message with !! and it will be only visible to cathook users"); -static CatVar chat_filter(CV_STRING, "chat_censor", "", - "Censor words", +static CatVar chat_filter(CV_STRING, "chat_censor", "", "Censor words", "Spam Chat with newlines if the chosen words are " "said, seperate with commas"); static CatVar chat_filter_enabled(CV_SWITCH, "chat_censor_enabled", "0", - "Enable censor"); + "Enable censor", "Censor Words in chat"); bool SendNetMsg_hook(void *_this, INetMessage &msg, bool bForceReliable = false, bool bVoice = false) @@ -822,6 +821,7 @@ bool DispatchUserMessage_hook(void *_this, int type, bf_read &buf) for (int i = 0; i < 120; i++) clear += "\n"; } + *bSendPackets = true; chat_stack::Say(". " + clear, true); retrun = true; lastfilter = format(filter); @@ -854,6 +854,7 @@ bool DispatchUserMessage_hook(void *_this, int type, bf_read &buf) for (int i = 0; i < 120; i++) clear += "\n"; } + *bSendPackets = true; chat_stack::Say(". " + clear, true); retrun = true; lastfilter = format(filter); diff --git a/src/menu/CBaseContainer.cpp b/src/menu/CBaseContainer.cpp index 6ce27655..1ecade33 100644 --- a/src/menu/CBaseContainer.cpp +++ b/src/menu/CBaseContainer.cpp @@ -6,7 +6,7 @@ */ #include "menu/CBaseContainer.h" - +#include "menu/GUI.h" #include "common.hpp" #include "sdk.hpp" diff --git a/src/menu/ncc/ItemVariable.cpp b/src/menu/ncc/ItemVariable.cpp index d0e6177e..011164ac 100644 --- a/src/menu/ncc/ItemVariable.cpp +++ b/src/menu/ncc/ItemVariable.cpp @@ -7,6 +7,7 @@ #include "menu/ncc/ItemVariable.hpp" #include "menu/ncc/Item.hpp" +#include "menu/ncc/Menu.hpp" #include "common.hpp" namespace menu @@ -22,10 +23,11 @@ ItemVariable::ItemVariable(CatVar &variable) void ItemVariable::Update() { Item::Update(); - if (!catvar.desc_long.empty()) - if (catvar.desc_long.length() && IsHovered() && - catvar.desc_long != "no description") - ShowTooltip(catvar.desc_long); + if (catvar.registered == true) + if (!catvar.desc_long.empty()) + if (catvar.desc_long.length() && IsHovered() && + catvar.desc_long != "no description") + ShowTooltip(catvar.desc_long); } void ItemVariable::Change(float amount) diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp index 024a7026..246fdb99 100644 --- a/src/menu/ncc/Menu.cpp +++ b/src/menu/ncc/Menu.cpp @@ -586,7 +586,7 @@ static const std::string list_tf2 = R"( "Anti-/Anti-Aim" [ "Anti-Aim Menu" "aa_enabled" - "aa_truefakes" + "aa_realfakes" "aa_pitch_real" "aa_yaw_real" "aa_pitch_mode_real"