From a1d4be87c7c80053d4958b8f5cf9931fc904f104 Mon Sep 17 00:00:00 2001 From: LightCat Date: Tue, 31 Jul 2018 16:01:00 +0200 Subject: [PATCH] Even More XML's --- data/menu/nullified-ui.xml | 6 +- data/menu/nullifiedcat/aimbot.xml | 19 ++++- data/menu/nullifiedcat/antiaim.xml | 2 +- data/menu/nullifiedcat/catbot.xml | 56 ++++++++++++++ data/menu/nullifiedcat/chat.xml | 23 +++++- data/menu/nullifiedcat/crits.xml | 11 +++ data/menu/nullifiedcat/debug.xml | 19 +++++ data/menu/nullifiedcat/misc.xml | 10 +++ data/menu/nullifiedcat/misc/achievement.xml | 5 ++ data/menu/nullifiedcat/misc/announcer.xml | 5 ++ .../nullifiedcat/{ => misc}/antibackstab.xml | 2 +- .../menu/nullifiedcat/misc/autodeadringer.xml | 6 ++ data/menu/nullifiedcat/misc/bhop.xml | 6 ++ data/menu/nullifiedcat/misc/bptf.xml | 5 ++ .../nullifiedcat/trigger/autobackstab.xml | 8 ++ .../nullifiedcat/trigger/autodetonator.xml | 8 ++ .../nullifiedcat/{ => trigger}/autoheal.xml | 4 +- .../menu/nullifiedcat/trigger/autoreflect.xml | 20 +++++ data/menu/nullifiedcat/trigger/autosticky.xml | 9 +++ data/menu/nullifiedcat/triggerbot.xml | 75 +++++++++++-------- data/menu/nullifiedcat/visuals/chams.xml | 2 +- data/menu/nullifiedcat/visuals/esp.xml | 16 ++-- data/menu/nullifiedcat/visuals/radar.xml | 2 +- src/crits.cpp | 4 +- src/hacks/Aimbot.cpp | 4 +- src/hacks/AutoJoin.cpp | 2 +- src/hacks/AutoSticky.cpp | 2 +- src/hooks/DispatchUserMessage.cpp | 2 +- 28 files changed, 275 insertions(+), 58 deletions(-) create mode 100755 data/menu/nullifiedcat/catbot.xml create mode 100644 data/menu/nullifiedcat/crits.xml create mode 100644 data/menu/nullifiedcat/debug.xml create mode 100644 data/menu/nullifiedcat/misc.xml create mode 100644 data/menu/nullifiedcat/misc/achievement.xml create mode 100644 data/menu/nullifiedcat/misc/announcer.xml rename data/menu/nullifiedcat/{ => misc}/antibackstab.xml (98%) create mode 100644 data/menu/nullifiedcat/misc/autodeadringer.xml create mode 100644 data/menu/nullifiedcat/misc/bhop.xml create mode 100644 data/menu/nullifiedcat/misc/bptf.xml create mode 100644 data/menu/nullifiedcat/trigger/autobackstab.xml create mode 100644 data/menu/nullifiedcat/trigger/autodetonator.xml rename data/menu/nullifiedcat/{ => trigger}/autoheal.xml (98%) create mode 100644 data/menu/nullifiedcat/trigger/autoreflect.xml create mode 100644 data/menu/nullifiedcat/trigger/autosticky.xml diff --git a/data/menu/nullified-ui.xml b/data/menu/nullified-ui.xml index ab7de42a..544c1192 100644 --- a/data/menu/nullified-ui.xml +++ b/data/menu/nullified-ui.xml @@ -4,10 +4,12 @@ - - + + + + diff --git a/data/menu/nullifiedcat/aimbot.xml b/data/menu/nullifiedcat/aimbot.xml index feca27d5..1eb15795 100644 --- a/data/menu/nullifiedcat/aimbot.xml +++ b/data/menu/nullifiedcat/aimbot.xml @@ -24,7 +24,6 @@ - + + + diff --git a/data/menu/nullifiedcat/antiaim.xml b/data/menu/nullifiedcat/antiaim.xml index 24824ec3..5df916f5 100644 --- a/data/menu/nullifiedcat/antiaim.xml +++ b/data/menu/nullifiedcat/antiaim.xml @@ -1,4 +1,4 @@ - + diff --git a/data/menu/nullifiedcat/catbot.xml b/data/menu/nullifiedcat/catbot.xml new file mode 100755 index 00000000..4fc93eb2 --- /dev/null +++ b/data/menu/nullifiedcat/catbot.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/chat.xml b/data/menu/nullifiedcat/chat.xml index a399bfae..aa13aa23 100644 --- a/data/menu/nullifiedcat/chat.xml +++ b/data/menu/nullifiedcat/chat.xml @@ -1,4 +1,4 @@ - + @@ -20,4 +20,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/crits.xml b/data/menu/nullifiedcat/crits.xml new file mode 100644 index 00000000..1c10f26c --- /dev/null +++ b/data/menu/nullifiedcat/crits.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/debug.xml b/data/menu/nullifiedcat/debug.xml new file mode 100644 index 00000000..57efdb3e --- /dev/null +++ b/data/menu/nullifiedcat/debug.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc.xml b/data/menu/nullifiedcat/misc.xml new file mode 100644 index 00000000..a84eb8d0 --- /dev/null +++ b/data/menu/nullifiedcat/misc.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc/achievement.xml b/data/menu/nullifiedcat/misc/achievement.xml new file mode 100644 index 00000000..68cd06d7 --- /dev/null +++ b/data/menu/nullifiedcat/misc/achievement.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc/announcer.xml b/data/menu/nullifiedcat/misc/announcer.xml new file mode 100644 index 00000000..684322bf --- /dev/null +++ b/data/menu/nullifiedcat/misc/announcer.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/antibackstab.xml b/data/menu/nullifiedcat/misc/antibackstab.xml similarity index 98% rename from data/menu/nullifiedcat/antibackstab.xml rename to data/menu/nullifiedcat/misc/antibackstab.xml index 745c0453..7889d328 100644 --- a/data/menu/nullifiedcat/antibackstab.xml +++ b/data/menu/nullifiedcat/misc/antibackstab.xml @@ -8,4 +8,4 @@ - + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc/autodeadringer.xml b/data/menu/nullifiedcat/misc/autodeadringer.xml new file mode 100644 index 00000000..fbee8e03 --- /dev/null +++ b/data/menu/nullifiedcat/misc/autodeadringer.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc/bhop.xml b/data/menu/nullifiedcat/misc/bhop.xml new file mode 100644 index 00000000..c8760762 --- /dev/null +++ b/data/menu/nullifiedcat/misc/bhop.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/misc/bptf.xml b/data/menu/nullifiedcat/misc/bptf.xml new file mode 100644 index 00000000..68212a03 --- /dev/null +++ b/data/menu/nullifiedcat/misc/bptf.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/trigger/autobackstab.xml b/data/menu/nullifiedcat/trigger/autobackstab.xml new file mode 100644 index 00000000..dc24a6ca --- /dev/null +++ b/data/menu/nullifiedcat/trigger/autobackstab.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/trigger/autodetonator.xml b/data/menu/nullifiedcat/trigger/autodetonator.xml new file mode 100644 index 00000000..bacffcaa --- /dev/null +++ b/data/menu/nullifiedcat/trigger/autodetonator.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/autoheal.xml b/data/menu/nullifiedcat/trigger/autoheal.xml similarity index 98% rename from data/menu/nullifiedcat/autoheal.xml rename to data/menu/nullifiedcat/trigger/autoheal.xml index 1511bf14..093e3615 100644 --- a/data/menu/nullifiedcat/autoheal.xml +++ b/data/menu/nullifiedcat/trigger/autoheal.xml @@ -39,7 +39,7 @@ - + @@ -57,6 +57,6 @@ - + diff --git a/data/menu/nullifiedcat/trigger/autoreflect.xml b/data/menu/nullifiedcat/trigger/autoreflect.xml new file mode 100644 index 00000000..2120a459 --- /dev/null +++ b/data/menu/nullifiedcat/trigger/autoreflect.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/trigger/autosticky.xml b/data/menu/nullifiedcat/trigger/autosticky.xml new file mode 100644 index 00000000..8ff6dac2 --- /dev/null +++ b/data/menu/nullifiedcat/trigger/autosticky.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/data/menu/nullifiedcat/triggerbot.xml b/data/menu/nullifiedcat/triggerbot.xml index 666c8361..5af7274f 100644 --- a/data/menu/nullifiedcat/triggerbot.xml +++ b/data/menu/nullifiedcat/triggerbot.xml @@ -1,35 +1,44 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/data/menu/nullifiedcat/visuals/chams.xml b/data/menu/nullifiedcat/visuals/chams.xml index c97c1318..d6d694e3 100644 --- a/data/menu/nullifiedcat/visuals/chams.xml +++ b/data/menu/nullifiedcat/visuals/chams.xml @@ -1,4 +1,4 @@ - + diff --git a/data/menu/nullifiedcat/visuals/esp.xml b/data/menu/nullifiedcat/visuals/esp.xml index bb499c54..aa1bddcd 100644 --- a/data/menu/nullifiedcat/visuals/esp.xml +++ b/data/menu/nullifiedcat/visuals/esp.xml @@ -29,29 +29,29 @@ diff --git a/data/menu/nullifiedcat/visuals/radar.xml b/data/menu/nullifiedcat/visuals/radar.xml index fedd0b9e..d0194fd5 100644 --- a/data/menu/nullifiedcat/visuals/radar.xml +++ b/data/menu/nullifiedcat/visuals/radar.xml @@ -1,4 +1,4 @@ - + diff --git a/src/crits.cpp b/src/crits.cpp index 5fd86706..7acc1b1c 100644 --- a/src/crits.cpp +++ b/src/crits.cpp @@ -111,8 +111,8 @@ bool force_crit(IClientEntity *weapon) } else number = lastnumber; - logging::Info("Found critical: %d -> %d", command_number, - number); + //logging::Info("Found critical: %d -> %d", command_number, + // number); lastweapon = weapon->GetModel(); lastnumber = number; if (crit_experimental) diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp index 37712cad..906ca28f 100644 --- a/src/hacks/Aimbot.cpp +++ b/src/hacks/Aimbot.cpp @@ -18,8 +18,8 @@ static settings::Bool enable{ "aimbot.enable", "false" }; static settings::Button aimkey{ "aimbot.aimkey.button", "" }; static settings::Int aimkey_mode{ "aimbot.aimkey.mode", "1" }; -static settings::Bool autoshoot{ "aimbot.autoshoot", "0" }; -static settings::Bool autoshoot_disguised{ "aimbot.autoshoot-disguised", "0" }; +static settings::Bool autoshoot{ "aimbot.autoshoot", "1" }; +static settings::Bool autoshoot_disguised{ "aimbot.autoshoot-disguised", "1" }; static settings::Bool multipoint{ "aimbot.multipoint", "false" }; static settings::Int hitbox_mode{ "aimbot.hitbox-mode", "0" }; static settings::Float fov{ "aimbot.fov", "0" }; diff --git a/src/hacks/AutoJoin.cpp b/src/hacks/AutoJoin.cpp index b4a7f0db..eceb5760 100644 --- a/src/hacks/AutoJoin.cpp +++ b/src/hacks/AutoJoin.cpp @@ -11,7 +11,7 @@ #include "common.hpp" #include "hack.hpp" -static settings::Int autojoin_team{ "autojoin.team", "0" }; +static settings::Bool autojoin_team{ "autojoin.team", "false" }; static settings::Int autojoin_class{ "autojoin.class", "0" }; static settings::Bool auto_queue{ "autojoin.auto-queue", "false" }; diff --git a/src/hacks/AutoSticky.cpp b/src/hacks/AutoSticky.cpp index 0d46e3e5..7ad225d3 100644 --- a/src/hacks/AutoSticky.cpp +++ b/src/hacks/AutoSticky.cpp @@ -148,7 +148,7 @@ void CreateMove() { // Aim at bomb AimAt(g_pLocalPlayer->v_Eye, bomb->m_vecOrigin(), - current_user_cmd); + current_user_cmd); // Use silent g_pLocalPlayer->bUseSilentAngles = true; diff --git a/src/hooks/DispatchUserMessage.cpp b/src/hooks/DispatchUserMessage.cpp index ef2b0a8f..202a7950 100644 --- a/src/hooks/DispatchUserMessage.cpp +++ b/src/hooks/DispatchUserMessage.cpp @@ -71,7 +71,7 @@ DEFINE_HOOKED_METHOD(DispatchUserMessage, bool, void *this_, int type, } if (chat_filter_enable && data[0] != LOCAL_E->m_IDX) { - if (chat_filter) + if (chat_filter.toString() != "") { std::string tmp = {}; std::string tmp2 = {};