From a11ca74ba8df92e99da6f0e58cefc5c738944d3f Mon Sep 17 00:00:00 2001
From: nullifiedcat <nullifiedcat@gmail.com>
Date: Sat, 13 May 2017 21:36:31 +0300
Subject: [PATCH] crit indicator

---
 .cproject                     |   2 +-
 res/crit_1                    | Bin 0 -> 16384 bytes
 res/crit_2                    | Bin 0 -> 16384 bytes
 res/crit_3                    | Bin 0 -> 16384 bytes
 res/crit_4                    | Bin 0 -> 16384 bytes
 src/gui/ncc/CritIndicator.cpp |  75 ++++++++++++++++++++++++++++++++++
 src/gui/ncc/CritIndicator.hpp |  42 +++++++++++++++++++
 src/gui/ncc/Menu.hpp          |   1 +
 src/gui/ncc/Root.cpp          |   1 +
 src/hacks/Aimbot.cpp          |  22 +++++-----
 src/hacks/Misc.cpp            |  12 +++---
 src/hacks/Misc.h              |   6 +++
 12 files changed, 144 insertions(+), 17 deletions(-)
 create mode 100644 res/crit_1
 create mode 100644 res/crit_2
 create mode 100644 res/crit_3
 create mode 100644 res/crit_4
 create mode 100644 src/gui/ncc/CritIndicator.cpp
 create mode 100644 src/gui/ncc/CritIndicator.hpp

diff --git a/.cproject b/.cproject
index 4c9aa72f..67c24b54 100644
--- a/.cproject
+++ b/.cproject
@@ -32,7 +32,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1168214098." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.965909756" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.debug" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.1799148153" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder arguments="-e NOGUI=1 GAME=tf2" buildPath="${workspace_loc:/cathook}" command="make" id="cdt.managedbuild.target.gnu.builder.exe.debug.1548213350" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
+							<builder arguments="-e GAME=tf2" buildPath="${workspace_loc:/cathook}" command="make" id="cdt.managedbuild.target.gnu.builder.exe.debug.1548213350" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.782611349" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool command="g++" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.883030293" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
 								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.908662295" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
diff --git a/res/crit_1 b/res/crit_1
new file mode 100644
index 0000000000000000000000000000000000000000..5a05876e883e98ebd0d7879d8950e6d9da41a2c9
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/res/crit_2 b/res/crit_2
new file mode 100644
index 0000000000000000000000000000000000000000..b1b35a20d96b77efdf8d01dfbe3a01e89628b623
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/res/crit_3 b/res/crit_3
new file mode 100644
index 0000000000000000000000000000000000000000..2d12e738ad55260ef47cd03030e8c72d8be934c2
GIT binary patch
literal 16384
zcmeHO2~bp57L5ohcC#4NOpH#=xS$D%Cef&wRHBna$BIkEU1KzZ7@!55NleO7M<*#4
zHW5^0Q2`Nf0cF#sHzJ}5RlzYNqsHARf}pZAbOXKp?m4%+KXkJgmIk}4u<F+P&42&i
zd+zq`d;j~~bG`q1EzoO$UJF>(0!O%^uCbhLUnOvY23wNzNp58SgPa{a(3_Uz+a6w!
z*%z3ce{XJ<Q_O%kPT+FPzl-t1-<#i&`>^LQ@D+jY=|oP*(2hLY)wz)UBINFc{C7@p
z_OxjS%$tHaS79p|Xm(fSvd@F>Xvj|lZz-q<*AxFW(7z9Rzq?1+doW}QAp18^1g?Fd
z(^ONr_|3(=eZZ{(RbkF<)BByhPT_?88N7~zcP02%Vl2n+&BwVB{X5IEqt698eq{%l
zGa&mebf_U+Kn0);pfSMyN8JAg*N+Z5ZLcg|a8ecLw6i#gvui|0Wi_7<zUv<>Jf%1_
zBD@;19~<Q#hRgxY=XU4squkw2{L%YTj6NV=)Izs%VCLgG3v}-QcU$fElMmG}|M*TP
z^4MR8`-eKKlV|_=eSmSYVBG%8QqMD*^5vOI$aoBSB>R8hy)tOv*ZuI@0rA<lvvNA}
zoN}$W`09+5>Wq;QwWJG(bfH|Y2UQ(=VONFRTfpdmKlin0Idr?z5&ougfqj^0Ty&vy
zHD9Cf6=|#feny=(BD?}}9+52Y{uvYm+6Y@Li{}On!{58LE=pJNXKDZWown|C0V7|N
z!xT<SB<xREy0_q@Qppo(p)Vs{lcRxdCGgD(Q(W!2&gSm7%No6R6EN!tdxMXNY48zh
z&rXP8?M^bQh#=z$=mxG&gM!<`zq506U!QYm;ECeYeiCIp^wIcBbQP;kt1nDCC?o9j
z8+wwij2d>xdoz~m_2G`l%jU+~$2$cs{_!sfHA<cs*bV&14p(QUG{n2^q!?grUIG3@
zb)cU>(>o%oGjnz8^JXytxuwuYO+F!iYuDxKRDNPDY@)}`>Rg7Lg-+*^xnZN)D+_Ty
zt6)l8rOIE@h@Iu9S}WFGo{?NH7#CS{#(i(~LFesM4=4r-kOPyhIOlZxnkfCZWPt9A
zvq_A<qz-YZAsevznUBZ;<Zj03J@=vC$L+xn>@G)#gq&2umXt&0{F>r`Vu5n7c)=-U
z$-;Cga(`xf_*-%gvo2SNcvm&yZ>cZonfH1O`Da6-Q;7Z3<YRr|9vd3ArF?mosx9oM
z_8{JhwPJO_Tk-x+<J(>Lbl!O!)ItSvR8{XSY|Q&+Ix@HBoKPGY6mkJ|(4#F~(Az(s
z>=wHD_T1EZ1@g(1hxv7*jkR??LgmemPJG!G&z|_ZW?k+Q)Ph>n0FyXqssZGqichoE
z$%8{`ke{n0PKWJU(+l@L%pSG3TE0fWwC#HqyTR|pi_$l@#;Yg)rrVG|5Var+c~B2O
zwGsm&!lM<v5~W5Cc<F}RYEhq%^CS80kr!&ba`d&-+}};Mq`y<GZQzO3x8|g-(~Y^)
zf>%#sXJuhM7>R!G4)UM@I<|;is@Yfvm^kO1amaDAy;C}OzhnMeaq;MxOxO8V>z>}e
z$hBW*9$U-Gww4k7o;&gY_*-8Os2@yl39Lq(zmHn2?^RE5!usO(M|b9?)=)2D>~T!6
zv+*v}uLUYUiM(`i#uvIlH?6|&&25j~D8{fR>SNX{4hVnh@UVK|<sapS>(50H_hV7J
zucLOhg1s^BwG=<-1u7N(5?*te&+<3l>7WDfyp3MW2lUwyw_q=&pX569)%S*`c}#ix
za9IZJi_7D<f$q5zV(pS#g8%bmWwu72(`J1W`CY^q`%5i)h)b$~+<Aochn4%R#`oBN
zJ5XN(Dgv%*jFs4{6{-UyZT3XxCm*8y!dBSLxBS!Wx|Z0<?}oTnqX$ASaN+W_<maEI
zpPwc>%_H2AKRR-2+Dp6Tsl#{GqznzMEt;O#VA{8v#=-Sj#~OhD9@e^2>X{Aq4E|>4
zk>6>}sQT>8FE~GNc$)lYeNW>rcEoygfbyHD9zAQxqEkxJpT%Q3mM_ax<&KY**ZT@7
zzFX8fHs&9#$oj92C+?9wy(Mg@^p_MWyoIzM(zWG#)(%G8t=flTqI5|{eudX*jwST!
zDIT(wId1BJTsbfraW$@8CO$Uxcgt(41;2fq_8?<;c$d%2dJ4Cx9N8MdQuF|troBMN
zY*4y5T@~*fNayBrO!?Z%wJ!Ka`<m4`Vyu7qwTq4S_KZ|7Zq7d5fHj2niVs2av0rkt
z73{2@b-rQ`^eWYc`qwf4Q(d?;Em2NuDG}m82zr&}Z7U;i1fT{gnrcDITyHBTXzwfa
z%F(0_3!{F5&b1`y6JNI#?5v(RC%%Y!M(aT<^{+85s8&)BKx5;2K(QnD7Bc83=p6&m
zdBnk%BhI1ySpL>Ns(HC%fuqWRs}V2T+v)c+I76++zFCfXLHkCs6Kf0oo*DI2llMk!
z4c@2F8EOS=5P^Qk#oDp6`pLY7L9}-<Vrz^8IwLNcenj^3dr1*EKZ*pEVcl05_RmfG
zM~VZisoEQ;i>L<_2V{eA<ip^p_7kjTAHd?J5%0e3py!`J<1^g%xZ`|CX7p<#e)wH`
zbM6T`7tT!m!|qYqP5BeiI|kz%h0fDuz)fdKY^*S3L!7NEU;|nks(?QzjkDM69KlqF
zXL*hH-wr85LIRS81YgE@QT$5O74!sV=R#EHsaH-J5?T%{>)10P;C};i=^RDbJZ7k;
z{B_Q81@K?PGh1+;Zk71S_D@!1^WaA{VWfT*{ZOOtSzPcjQ???D-Vf2c{FmrCB~LOR
zf0ts8S<cYhd-Kzj;tA3BFn>wHpkQa6Tg!7a;$bcSN|t1NOL1=O^_$^0)I*t94uk!2
z8T{#^{pS0A+Aq&mF@6$u&CtgT^~8AZsfu^qQ48#unCogS7@wv`zS~hdsVDzhYxR$f
z0UA-;R0*y@*~eYOha&#}iduLJIY4LX`W%4owU0i@R2zGuUr_&+9p#2v^`4luOAa^E
z4r^Emd}z#n^L3Eox@y&FP1=aChrs2@KBwE5|1IMuzKHu3uwNbGNF(zRYT{i2DgW<d
z?vg~#PDggWHIL;>vnHVzLQJ=210jPtq5WxkqAH#nC}{qzgl2u-dszRX&`;l@TJmsd
z=HoMC_EF8a4I6Aj-FU&8v6F7sJX7t<mS*k*h8AaH6x)Q0)`vKk9rS+0uQ?vg_8;tV
zzV4x3E7^$LP~vP&n(Gl$3L7w(AA@gWY@#0E94`fVV6=fD5Aa?{b8g~+^R+xtQKD;b
z7W}!iIezxH&QD?oJG=;r#hOwj^A*u|NF}hr71YGl>^y58(bJbxJvY=p5reZZisguc
zO@cnu&xoB5x2wO`ZoTj}Y!LQjdG>bT-vJ)`Fpjro?4;YBc_-hMe=eYRh5A0fb~T?7
zzZ!iB{(G&nx~C0~pzjTx(GT_5w_u&sm7aUBD1A2G+w0HCs4ps*99IVaE$#|WTY46K
zPJf&c@oDX&KCgJ;DJ9<d@3AEeUDdU4;^9HHUOD%v{^Pt{EAoiCfwk}5uJW~|=OtsJ
zhU5DYHSLA*&4UU#5Nb>MTSC_di!(OkeW3<@uTC&F>Ne`&2bSP#D?EzErVY3|FD(Ii
zpusnE3}PS>HsIQd{+7^F79jS(cRcs$Tdp{#9hb3|y<-W!w!{N{y(jtt`IWz=D1d*i
zE$MD4U5lnAtu9-ZDNP>{AwW-W(f>DMDIL3$&rN){SvVzO#gz|It|A8B?@n3P%6p@u
yZy(gasi0`oL7V7jEp5x>fnj8WmkXRzZRXv-rESp5uh#;-7U;D=uLZi-0{;gIzbGXD

literal 0
HcmV?d00001

diff --git a/res/crit_4 b/res/crit_4
new file mode 100644
index 0000000000000000000000000000000000000000..686695b464f130aa97a0a3575d93a592ff10ca39
GIT binary patch
literal 16384
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
Z-$+%44AnfVHBhaAY7JCt;Qw0#{{>2Z+ra<;

literal 0
HcmV?d00001

diff --git a/src/gui/ncc/CritIndicator.cpp b/src/gui/ncc/CritIndicator.cpp
new file mode 100644
index 00000000..1742b4c0
--- /dev/null
+++ b/src/gui/ncc/CritIndicator.cpp
@@ -0,0 +1,75 @@
+/*
+ * CritIndicator.cpp
+ *
+ *  Created on: May 13, 2017
+ *      Author: nullifiedcat
+ */
+
+#include "CritIndicator.hpp"
+#include "../../common.h"
+
+namespace menu { namespace ncc {
+
+CatVar ci_enabled(CV_SWITCH, "gui_ncc_crit_indicator", "1", "Crit Indicator");
+CatVar ci_x(CV_INT, "gui_ncc_crit_indicator_x", "400", "Crit Indicator X");
+CatVar ci_y(CV_INT, "gui_ncc_crit_indicator_x", "150", "Crit Indicator Y");
+
+CritIndicator::CritIndicator() : CBaseWidget("ncc_crit_indicator"),
+	crit_normal(&_binary_crit_1_start, 64, 64),
+	crit_none(&_binary_crit_2_start, 64, 64),
+	crit_ready(&_binary_crit_3_start, 64, 64),
+	crit_disabled(&_binary_crit_4_start, 64, 64) {
+	SetOffset((int)ci_x, (int)ci_y);
+	SetSize(64, 72);
+}
+
+bool CritIndicator::IsVisible() {
+	return !g_Settings.bInvalid && ci_enabled && hacks::shared::misc::crit_hack_next;
+}
+
+void CritIndicator::Draw(int x, int y) {
+	if (!crit_none.id) crit_none.Load();
+	if (!crit_disabled.id) crit_disabled.Load();
+	if (!crit_normal.id) crit_normal.Load();
+	if (!crit_ready.id) crit_ready.Load();
+	Texture* tx = &crit_none;
+	bool critkey { false };
+	if (RandomCrits() && WeaponCanCrit()) {
+		// It's safe to be 1 tick behind real values to prevent flickering.
+		if (hacks::shared::misc::found_crit_number >= hacks::shared::misc::last_number - 1 && hacks::shared::misc::found_crit_weapon == RAW_ENT(LOCAL_W)) {
+			tx = &crit_normal;
+			if (CritKeyDown() || experimental_crit_hack.KeyDown()) {
+				tx = &crit_ready;
+				critkey = true;
+			}
+		}
+	} else {
+		tx = &crit_disabled;
+	}
+	draw::DrawRect(x, y, 64, 72, colors::Transparent(colors::black));
+	tx->Draw(x, y, 64, 64);
+	draw::OutlineRect(x, y, 64, 72, critkey ? colors::pink : GUIColor());
+	draw::DrawLine(x, y + 64, 64, 0, critkey ? colors::pink : GUIColor());
+	if (CE_GOOD(LOCAL_W)) {
+		float bucket = *(float*)((uintptr_t)RAW_ENT(LOCAL_W) + 2612u);
+		draw::DrawRect(x + 1, y + 65, 62.0f * (bucket / 1000.0f), 6, colors::Create(20, 235, 20, 255));
+	}
+}
+
+bool CritIndicator::AlwaysVisible() {
+	return IsVisible();
+}
+
+void CritIndicator::Update() {
+	if (IsPressed()) {
+		auto offset = GetOffset();
+		offset.first += g_pGUI->mouse_dx;
+		offset.second += g_pGUI->mouse_dy;
+		SetOffset(offset.first, offset.second);
+		ci_x = (int)offset.first;
+		ci_y = (int)offset.second;
+	}
+}
+
+}}
+
diff --git a/src/gui/ncc/CritIndicator.hpp b/src/gui/ncc/CritIndicator.hpp
new file mode 100644
index 00000000..0907b900
--- /dev/null
+++ b/src/gui/ncc/CritIndicator.hpp
@@ -0,0 +1,42 @@
+/*
+ * CritIndicator.hpp
+ *
+ *  Created on: May 13, 2017
+ *      Author: nullifiedcat
+ */
+
+#ifndef CRITINDICATOR_HPP_
+#define CRITINDICATOR_HPP_
+
+#include "Menu.hpp"
+
+extern unsigned char _binary_crit_1_start;
+extern unsigned char _binary_crit_2_start;
+extern unsigned char _binary_crit_3_start;
+extern unsigned char _binary_crit_4_start;
+
+namespace menu { namespace ncc {
+
+// FIXME temporary.. I need to make a way to save this instead of using convars.
+extern CatVar ci_enabled;
+extern CatVar ci_x;
+extern CatVar ci_y;
+
+class CritIndicator : public CBaseWidget {
+public:
+	CritIndicator();
+
+	virtual bool IsVisible() override;
+	virtual void Draw(int x, int y) override;
+	virtual bool AlwaysVisible() override;
+	virtual void Update() override;
+public:
+	Texture crit_normal;
+	Texture crit_none;
+	Texture crit_ready;
+	Texture crit_disabled;
+};
+
+}}
+
+#endif /* CRITINDICATOR_HPP_ */
diff --git a/src/gui/ncc/Menu.hpp b/src/gui/ncc/Menu.hpp
index 9bb77120..46dff553 100644
--- a/src/gui/ncc/Menu.hpp
+++ b/src/gui/ncc/Menu.hpp
@@ -24,6 +24,7 @@
 #include "Root.hpp"
 #include "Tooltip.hpp"
 #include "Background.hpp"
+#include "CritIndicator.hpp"
 #include "Logo.hpp"
 
 namespace menu { namespace ncc {
diff --git a/src/gui/ncc/Root.cpp b/src/gui/ncc/Root.cpp
index f38c18f1..867af4cc 100644
--- a/src/gui/ncc/Root.cpp
+++ b/src/gui/ncc/Root.cpp
@@ -46,6 +46,7 @@ void Root::Setup() {
 	PlayerList* pl = new PlayerList();
 	pl->SetOffset(200, 200);
 	AddChild(pl);
+	AddChild(new CritIndicator());
 }
 
 void Root::OnKeyPress(ButtonCode_t key, bool repeat) {
diff --git a/src/hacks/Aimbot.cpp b/src/hacks/Aimbot.cpp
index 490a0a06..4f5d568b 100644
--- a/src/hacks/Aimbot.cpp
+++ b/src/hacks/Aimbot.cpp
@@ -633,16 +633,18 @@ EAimbotLocalState ShouldAim() {
 			}
 		}
 	}
-	switch (GetWeaponMode()) {
-	case weapon_hitscan:
-	case weapon_melee:
-		break;
-	case weapon_projectile:
-		if (!projectile_aimbot) return EAimbotLocalState::DISABLED_FOR_THIS_WEAPON;
-		break;
-	default:
-		return EAimbotLocalState::DISABLED_FOR_THIS_WEAPON;
-	};
+	IF_GAME (IsTF2()) {
+		switch (GetWeaponMode()) {
+		case weapon_hitscan:
+		case weapon_melee:
+			break;
+		case weapon_projectile:
+			if (!projectile_aimbot) return EAimbotLocalState::DISABLED_FOR_THIS_WEAPON;
+			break;
+		default:
+			return EAimbotLocalState::DISABLED_FOR_THIS_WEAPON;
+		};
+	}
 	IF_GAME (IsTF()) {
 		if (g_pLocalPlayer->bZoomed) {
 			if (!(g_pUserCmd->buttons & (IN_ATTACK | IN_ATTACK2))) {
diff --git a/src/hacks/Misc.cpp b/src/hacks/Misc.cpp
index 1bc859eb..b6cc5f54 100644
--- a/src/hacks/Misc.cpp
+++ b/src/hacks/Misc.cpp
@@ -48,7 +48,7 @@ bool C_TFPlayer__ShouldDraw_hook(IClientEntity* thisptr) {
 	}
 }
 
-static CatVar crit_hack_next(CV_SWITCH, "crit_hack_next", "0", "Next crit info");
+CatVar crit_hack_next(CV_SWITCH, "crit_hack_next", "0", "Next crit info");
 
 void DumpRecvTable(CachedEntity* ent, RecvTable* table, int depth, const char* ft, unsigned acc_offset) {
 	bool forcetable = ft && strlen(ft);
@@ -98,9 +98,9 @@ static CatCommand dump_vars("debug_dump_netvars", "Dump netvars of entity", [](c
 
 CatVar nopush_enabled(CV_SWITCH, "nopush_enabled", "0", "No Push", "Prevents other players from pushing you around.");
 
-static IClientEntity* found_crit_weapon = nullptr;
-static int found_crit_number = 0;
-static int last_number = 0;
+IClientEntity* found_crit_weapon = nullptr;
+int found_crit_number = 0;
+int last_number = 0;
 
 // SUPER SECRET CODE DONOT STEEL
 
@@ -189,7 +189,7 @@ void CreateMove() {
 		if (crit_hack_next && CE_GOOD(LOCAL_W) && WeaponCanCrit() && RandomCrits()) {
 			PROF_SECTION(CM_misc_crit_hack_prediction);
 			weapon = RAW_ENT(LOCAL_W);
-			if (vfunc<bool(*)(IClientEntity*)>(weapon, 1944 / 4, 0)(weapon)) {
+			if (weapon && vfunc<bool(*)(IClientEntity*)>(weapon, 1944 / 4, 0)(weapon)) {
 				if (experimental_crit_hack.KeyDown()) {
 					if (!g_pUserCmd->command_number || critWarmup < 8) {
 						if (g_pUserCmd->buttons & IN_ATTACK) {
@@ -285,7 +285,7 @@ void CreateMove() {
 
 void Draw() {
 	if (crit_info && CE_GOOD(LOCAL_W)) {
-		if (CritKeyDown()) {
+		if (CritKeyDown() || experimental_crit_hack.KeyDown()) {
 			AddCenterString("FORCED CRITS!", colors::red);
 		}
 		IF_GAME (IsTF2()) {
diff --git a/src/hacks/Misc.h b/src/hacks/Misc.h
index f250b422..a8c84833 100644
--- a/src/hacks/Misc.h
+++ b/src/hacks/Misc.h
@@ -12,12 +12,18 @@
 
 class ConVar;
 class CatCommand;
+class IClientEntity;
 
 namespace hacks { namespace shared { namespace misc {
 
 void CreateMove();
 void Draw();
 
+extern IClientEntity* found_crit_weapon;
+extern int found_crit_number;
+extern int last_number;
+
+extern CatVar crit_hack_next;
 extern CatVar debug_info;
 extern CatVar flashlight_spam;
 extern CatVar crit_info; // TODO separate