Merge pull request #367 from LightyPonce/cathook-NCC

Cathook ncc update

include/menu/compatlayer.hpp

@@ -49,7 +49,6 @@ void FString(unsigned long font, int x, int y, int color, int shadow,
 void DrawRect(int x, int y, int w, int h, int color);
 void DrawLine(int x, int y, int dx, int dy, int color);
 void OutlineRect(int x, int y, int w, int h, int color);
-void DrawCircle(float cx, float cy, float r, int num_segments, int color);
 void GetStringLength(unsigned long font, char *string, int &length,
                      int &height);
 std::pair<int, int> GetStringLength(unsigned long font, std::string string);

src/crits.cpp

@@ -12,7 +12,7 @@ CatVar crit_info(CV_SWITCH, "crit_info", "0", "Show crit info");
 CatVar crit_key(CV_KEY, "crit_key", "0", "Crit Key");
 CatVar crit_melee(CV_SWITCH, "crit_melee", "0", "Melee crits");
 CatVar crit_legiter(
-    CV_SWITCH, "crit_force_gameplay", "0",
+    CV_SWITCH, "crit_force_gameplay", "0", "Don't hinder gameplay",
     "Attempt to crit when possible but do not hinder normal gameplay");
 CatVar crit_experimental(CV_SWITCH, "crit_experimental", "0",
                          "Experimental crithack");

src/hacks/LagExploit.cpp

@@ -15,19 +15,19 @@ namespace lagexploit
 {
 
 CatVar toggle(CV_SWITCH, "se_toggle", "0", "Toggle sequence exploit");
-CatVar shoot(CV_SWITCH, "se_shoot", "0",
+CatVar shoot(CV_SWITCH, "se_shoot", "0", "Instant revvup/shoot two shots at once");
-             "Allows instant revving up or shooting two shots at once");
 
 // SHOUTOUTS TO BLACKFIRE
-CatVar doom(CV_SWITCH, "se_doom", "0",
+CatVar doom(CV_SWITCH, "se_doom", "0", "Shoot 2+ shots at once",
-            "Shoot 2+ shots at once, see Center string on activate.");
+            "See Center string on activation.");
-CatVar stickyspam(CV_SWITCH, "se_stickyspam", "0",
+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 cart(CV_SWITCH, "se_cart", "0", "Automatically farm points by touching "
+CatVar cart(CV_SWITCH, "se_cart", "0", "Farm cart points",
-                                       "the cart (only works on attacking "
+            "Automatically farm points by touching "
-                                       "team)");
+            "the cart (only works on attacking "
+            "team)");
 CatVar instant_weapon_switch(CV_SWITCH, "se_switch", "0",
                              "Instant weapon switch");
 CatVar key(CV_KEY, "se_key", "0", "Sequence exploit key");

src/menu/compatibilitylayer.cpp

@@ -2,7 +2,6 @@
 
 namespace fonts
 {
-unsigned long ESP                    = 0;
 unsigned long MENU                   = 0;
 unsigned long MENU_BIG               = 0;
 const std::vector<std::string> fonts = { "Tahoma Bold",  "Tahoma",
@@ -10,19 +9,6 @@ const std::vector<std::string> fonts = { "Tahoma Bold",  "Tahoma",
                                          "Verdana Bold", "Arial",
                                          "Courier New",  "Ubuntu Mono Bold" };
 CatEnum family_enum(fonts);
-CatVar esp_family(family_enum, "font_esp_family", "2", "ESP font",
-                  "ESP font family");
-CatVar esp_height(CV_INT, "font_esp_height", "14", "ESP height",
-                  "ESP font height");
-
-void Update()
-{
-    fonts::ESP = g_ISurface->CreateFont();
-    g_ISurface->SetFontGlyphSet(
-        fonts::ESP, fonts::fonts[_clamp(0, 7, (int) fonts::esp_family)].c_str(),
-        (int) fonts::esp_height, 0, 0, 0, 0); // or Ubuntu Mono Bold
-                                              // g_ISurface->ResetFontCaches();
-}
 }
 
 int colorsint::FromHSL(float h, float s, float v)
@@ -87,22 +73,6 @@ void draw::OutlineRect(int x, int y, int w, int h, int color)
     g_ISurface->DrawOutlinedRect(x, y, x + w, y + h);
 }
 
-void draw::DrawCircle(float x, float y, float r, int num_segments, int color)
-{
-    if (num_segments < 3 || r == 0)
-        return;
-    g_ISurface->DrawSetColor(*reinterpret_cast<Color *>(&color));
-    float Step = PI * 2.0 / num_segments;
-    for (float a = 0; a < (PI * 2.0); a += Step)
-    {
-        float x1 = r * cos(a) + x;
-        float y1 = r * sin(a) + y;
-        float x2 = r * cos(a + Step) + x;
-        float y2 = r * sin(a + Step) + y;
-        g_ISurface->DrawLine(x1, y1, x2, y2);
-    }
-}
-
 void draw::GetStringLength(unsigned long font, char *string, int &length,
                            int &height)
 {

src/menu/ncc/ItemVariable.cpp

@@ -22,9 +22,10 @@ ItemVariable::ItemVariable(CatVar &variable)
 void ItemVariable::Update()
 {
     Item::Update();
-    if (catvar.desc_long.length() && IsHovered() &&
+    if (!catvar.desc_long.empty())
-        catvar.desc_long != "no description")
+        if (catvar.desc_long.length() && IsHovered() &&
-        ShowTooltip(catvar.desc_long);
+                catvar.desc_long != "no description")
+            ShowTooltip(catvar.desc_long);
 }
 
 void ItemVariable::Change(float amount)

src/menu/ncc/Menu.cpp

@@ -297,6 +297,8 @@ static const std::string list_tf2 = R"(
 	    "aimbot_autoshoot"
 	    "aimbot_hitboxmode"
 	    "aimbot_fov"
+		"aimbot_fov_draw"
+		"aimbot_fov_draw_opacity"
 	    "aimbot_prioritymode"
 	    "aimbot_charge"
 	    "Ignore" [
@@ -324,6 +326,16 @@ static const std::string list_tf2 = R"(
 	        "aimbot_only_when_can_shoot"
 	        "aimbot_maxrange"
 	        "aimbot_slow"
+			"aimbot_auto_unzoom"
+			"aimbot_auto_zoom"
+			"aimbot_spin_up"
+			"aimbot_miss_chance"
+			"aimbot_extrapolate"
+			"aimbot_target_lock"
+			"aimbot_rage_only"
+			"aimbot_stickys"
+			"aimbot_buildings_other"
+			"aimbot_buildings_sentry"
 	        "Projectile Aimbot" [
 	            "Projectile Aimbot Tweaks"
 	            "aimbot_projectile"
@@ -407,8 +419,8 @@ static const std::string list_tf2 = R"(
 	    "Fake Lag Menu"
 			"fakelag"
 	]
-	"Sequence Freezing" [
+	"Sequence Exploit" [
-			"Sequence Freezing Menu"
+			"Sequence Exploit Menu"
 			"se_master"
 			"se_key"
 			"se_doom"
@@ -428,6 +440,7 @@ static const std::string list_tf2 = R"(
 	    	"no_zoom"
 			"fov"
 			"fov_zoomed"
+			"render_zoomed"
 			"no_invis"
 			"no_hats"
 			"antidisguise"
@@ -435,16 +448,34 @@ static const std::string list_tf2 = R"(
 			"gui_ncc_scale"
 			"gui_ncc_font_family"
 			"gui_ncc_font_title_family"
+			"fast_outline"
 			"ESP" [
 			    "ESP Menu"
 			    "esp_enabled"
-			    "esp_box"
+				"ESP Preferences"[
-			    "esp_local"
+					"ESP Preferences Menu"
-				"esp_tracers"
+			    	"esp_box"
-				"esp_health"
+					"esp_text_position"
-				"esp_bones"
+					"esp_expand"
-				"esp_vischeck"
+			    	"esp_local"
-				"esp_box_corner_size"
+					"esp_tracers"
+					"esp_sightlines"
+					"esp_health"
+					"esp_bones"
+					"esp_vischeck"
+					"esp_box_corner_size"
+					"esp_entity"
+					"esp_entity_id"
+					"esp_model_name"
+					"esp_weapon_spawners"
+					"esp_spellbooks"
+					"esp_money"
+					"esp_money_red"
+					"esp_powerups"
+					"esp_show_tank"
+					"esp_followbot_id"
+				]
+				"esp_legit"
 				"esp_buildings"
 				"esp_teammates"
 				"esp_weapon"
@@ -453,6 +484,32 @@ static const std::string list_tf2 = R"(
 				"esp_class"
 				"esp_name"
 				"esp_distance"
+				"Item ESP"[
+					"Item ESP Menu"
+					"esp_item"
+					"esp_item_weapons"
+					"esp_item_ammo"
+					"esp_item_health"
+					"esp_item_powerups"
+					"esp_item_adrenaline"
+				]
+				"Projectile ESP" [
+					"Projectile ESP Menu"
+					"esp_proj"
+					"esp_proj_enemy"
+					"esp_proj_stickies"
+					"esp_proj_pipes"
+					"esp_proj_arrows"
+					"esp_proj_rockets"
+				]
+				"Emoji ESP"[
+					"Emoji ESP Menu"
+					"esp_emoji"
+					"esp_okhand"
+					"esp_emoji_scaling"
+					"esp_emoji_size"
+					"esp_emoji_min_size"
+				]
 				]
 			"Chams" [
 			"Chams Menu"
@@ -544,6 +601,7 @@ static const std::string list_tf2 = R"(
 	"aa_roll"
 	"aa_no_clamp"
 	"resolver"
+	"identify"
 	"Anti Anti Aim" [
 			"aa_aaaa_enabled"
 			"aa_aaaa_flip_key"
@@ -565,8 +623,8 @@ static const std::string list_tf2 = R"(
 	    "Name Stealer Menu"
 	    "name_stealer"
 	]
-	"Chat Spam" [
+	"Chat Settings" [
-			"Chat Spam Menu"
+			"Chat Settings Menu"
 			"spam"
 			"killsay"
 			"spam_teamname"
@@ -575,6 +633,13 @@ static const std::string list_tf2 = R"(
 			"spam_delay"
 			"spam_file"
 			"spam_random"
+			"clean_chat"
+			"chat_censor_enabled"
+			"chat_censor"
+			"chat_crypto"
+			"chat_log"
+			"chat_log_nospam"
+			"chat_log_noipc"
 			"Uberspam" [
 				"Uberspam Menu"
 					"uberspam"
@@ -598,13 +663,35 @@ static const std::string list_tf2 = R"(
 			"clean_screenshots"
 			"anti_afk"
 			"die_if_vac"
+			"announcer"
 			"request_balance_spam"
 			"nopush_enabled"
-				"HealArrow" [
+			"bptf_enable"
-					"HealArrow Menu"
+				"Followbot"[
-					"healarrow"
+					"Followbot Menu"
-					"healarrow_timeout"
+					"fb_bot"
-					"healarrow_charge"
+					"fb_autoteam"
+					"fb_autoclass"
+					"fb_activation"
+					"fb_distance"
+					"fb_mimic_slot"
+					"fb_sync_taunt"
+					"fb_always_medigun"
+					"fb_roaming"
+					"fb_crumb_draw"
+				]
+				"Catbot Utilities"[
+					"Catbot Utilities Menu"
+					"cbu"
+					"cbu_random_votekicks"
+					"cbu_micspam"
+					"cbu_micspam_on_interval"
+					"cbu_micspam_off_interval"
+					"cbu_abandon_if_bots_gte"
+					"cbu_abandon_if_ipc_bots_gte"
+					"cbu_abandon_if_humans_lte"
+					"cbu_abandon_if_players_lte"
+					"cbu_mark_human_threshold"
 				]
 				"Anti Backstab" [
 				"Anti Backstab Menu"
@@ -629,6 +716,8 @@ static const std::string list_tf2 = R"(
 				"ac_aimbot_detections"
 				"ac_aimbot_angle"
 				"ac_bhop_count"
+				"ac_ignore_local"
+				"ac_chat"
 				]
 				"Automated" [
 				"Automated Menu"
@@ -638,25 +727,38 @@ static const std::string list_tf2 = R"(
 				"autotaunt"
 				"autotaunt_chance"
 				]
-				"Debug" [
+				"HealArrow" [
-					"Debug Menu"
+					"HealArrow Menu"
-						"debug_freecam"
+					"healarrow"
-						"debug_projectiles"
+					"healarrow_timeout"
-						"debug_log_sent_messages"
+					"healarrow_charge"
-						"debug_log_usermessages"
+					"healarrow_callout"
-						"debug_tcm"
-						"debug_info"
-						"skinchanger_debug"
-						"debug_aimbot_engine_pp"
-						"aimbot_debug"
-						"debug_ve_averaging"
-						"debug_ve_smooth"
-						"debug_ve_window"
-						"debug_pp_rocket_time_ping"
-						"debug_pp_extrapolate"
-						"debug_engine_pred_others"
 				]
 	]
+	"Debug" [
+		"Debug Menu"
+		"fast_vischeck"
+		"gui_bounds"
+		"debug_freecam"
+		"debug_projectiles"
+		"debug_log_sent_messages"
+		"debug_log_usermessages"
+		"debug_tcm"
+		"debug_info"
+		"votelog"
+		"hitrate"
+		"skinchanger_debug"
+		"debug_aimbot_engine_pp"
+		"aimbot_debug"
+		"engine_prediction"
+		"setupbones_time"
+		"debug_ve_averaging"
+		"debug_ve_smooth"
+		"debug_ve_window"
+		"debug_pp_rocket_time_ping"
+		"debug_pp_extrapolate"
+		"debug_engine_pred_others"
+	]
 )";
 
 List &MainList()