i hate myself

7 files changed, 51 insertions, 21 deletions

diff --git a/cheat/internal_rewrite/extra.cpp b/cheat/internal_rewrite/extra.cpp
index 2408e7f..6882f21 100644
--- a/cheat/internal_rewrite/extra.cpp
+++ b/cheat/internal_rewrite/extra.cpp
@@ -91,7 +91,7 @@ namespace features
 			//arbitrary number much

 			float latency = 0.15f - ( in_latency + g_csgo.m_globals->m_frametime ) - TICK_INTERVAL( );

 

-			if( g_settings.misc.net_fakeping_active && latency > 0.f ) {

+			if( g_settings.misc.net_fakelag && latency > 0.f ) {

 				channel->m_nInSequenceNr += 2 * 64 - ( 63 * latency );

 			}

 		}

@@ -122,18 +122,18 @@ namespace features
 	void c_extra::money_talk( IGameEvent *evt ) {

 		static float last_time = 0.0f;

 

-		if ( !g_csgo.m_engine( )->IsConnected( ) || !g_csgo.m_engine( )->IsInGame( ) ) {

+		if( !g_csgo.m_engine( )->IsConnected( ) || !g_csgo.m_engine( )->IsInGame( ) ) {

 			last_time = 0.0f;

 		}

 

-		if ( !g_settings.misc.money_talk( ) )

+		if( !g_settings.misc.money_talk( ) )

 			return;

 

-		if ( evt && !strcmp( evt->GetName( ), xors( "player_death" ) ) ) {

+		if( evt && !strcmp( evt->GetName( ), xors( "player_death" ) ) ) {

 			const int player = g_csgo.m_engine( )->GetPlayerForUserID( evt->GetInt( xors( "attacker" ) ) );

 

-			if ( player == g_csgo.m_engine( )->GetLocalPlayer( ) ) {

-				if ( last_time <= g_csgo.m_globals->m_curtime ) {

+			if( player == g_csgo.m_engine( )->GetLocalPlayer( ) ) {

+				if( last_time <= g_csgo.m_globals->m_curtime ) {

 					g_csgo.m_engine( )->ClientCmd( xors( "say god i wish i had moneybot" ) );

 

 					last_time = g_csgo.m_globals->m_curtime + 0.1f;

diff --git a/cheat/internal_rewrite/internal_rewrite.vcxproj b/cheat/internal_rewrite/internal_rewrite.vcxproj
index a531095..5381eb2 100644
--- a/cheat/internal_rewrite/internal_rewrite.vcxproj
+++ b/cheat/internal_rewrite/internal_rewrite.vcxproj
@@ -46,7 +46,7 @@
     <VCProjectVersion>15.0</VCProjectVersion>

     <ProjectGuid>{140DEC51-B0E7-4289-BB6F-79686422318E}</ProjectGuid>

     <RootNamespace>internal_rewrite</RootNamespace>

-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>

+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>

     <ProjectName>csgo</ProjectName>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/cheat/internal_rewrite/ragebot_antiaim.cpp b/cheat/internal_rewrite/ragebot_antiaim.cpp
index beff445..958a5c1 100644
--- a/cheat/internal_rewrite/ragebot_antiaim.cpp
+++ b/cheat/internal_rewrite/ragebot_antiaim.cpp
@@ -552,8 +552,22 @@ namespace features
 		}

 		else {

 			int jitter = g_settings.rage.edge_dtc_real_jitter;

-			if (jitter) {

-				aim_angle.y += math::random_number< float >(-jitter, jitter);

+			

+			if( jitter > 0 ) {

+				switch( g_settings.rage.edge_detection ) {

+				case 1:

+					aim_angle.y += math::random_number< float >( -jitter, jitter );

+					break;

+				case 2:

+					aim_angle.y += math::random_number( 0, 100 ) % 2 ? jitter : -jitter;

+					break;

+				case 3: {

+					constexpr static double rate = 360.0 / 1.618033988749895;

+					aim_angle.y += ( -jitter * 0.5f ) + ( std::fmod( g_csgo.m_globals->m_curtime * rate, jitter + 1.f ) );

+					break;

+				}

+				default: break;

+				}

 			}

 		}

 

@@ -870,7 +884,23 @@ namespace features
 		m_is_edging = freestanding || edge_detected;

 

 		if( g_settings.rage.break_lby( ) && ( !m_is_edging || g_settings.rage.break_lby_edge ) ) {

-			float yaw = m_is_edging ? m_cmd->m_viewangles.y : get_yaw( true );

+			float yaw;

+

+			if( m_is_edging ) {

+				auto target = util::get_closest_player( );

+				if( target != -1 ) {

+					auto ent = g_csgo.m_entlist( )->GetClientEntity< >( target );

+					

+					vec3_t ang = math::vector_angles(

+						ent->m_vecOrigin( ),

+						g_ctx.m_local->m_vecOrigin( ) );

+

+					yaw = ang.y + m_direction ? 90.f : -90.f;

+				}

+			}

+			else {

+				yaw = get_yaw( true );

+			}

 

 			m_breaker.override_angles( &m_cmd->m_viewangles.y,

 				yaw,

diff --git a/cheat/internal_rewrite/settings.hpp b/cheat/internal_rewrite/settings.hpp
index 6880bff..d21d4a0 100644
--- a/cheat/internal_rewrite/settings.hpp
+++ b/cheat/internal_rewrite/settings.hpp
@@ -268,9 +268,9 @@ namespace data
 			con_var< int > real_yaw_moving_add{ &holder_, fnv( "rage_real_yaw_moving_add" ), 0 };

 			con_var< int > real_moving_jitter{ &holder_, fnv( "rage_real_moving_jitter" ), 0 };

 

-			con_var< bool > edge_detection{ &holder_, fnv( "rage_edge_dtc" ), 0 };

+			con_var< int > edge_detection{ &holder_, fnv( "rage_edge_dtc" ), 0 };

 			con_var< int > edge_dtc_jitter{ &holder_, fnv( "rage_edge_dtc_jitter" ), 0 };

-			con_var< int > edge_dtc_real_jitter{ &holder_, fnv("rage_edge_dtc_real_jitter"), 0 };

+			con_var< int > edge_dtc_real_jitter{ &holder_, fnv( "rage_edge_dtc_real_jitter" ), 0 };

 

 			con_var< bool > break_lby_edge{ &holder_, fnv( "rage_break_lby_edge" ) };

 			con_var< int > edge_dtc_normal{ &holder_, fnv( "rage_edge_dtc_normal" ), 0 };

diff --git a/cheat/internal_rewrite/ui.h b/cheat/internal_rewrite/ui.h
index 7dc88a3..1dd6481 100644
--- a/cheat/internal_rewrite/ui.h
+++ b/cheat/internal_rewrite/ui.h
@@ -419,8 +419,11 @@ namespace ui
 						edge_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 70, 300, &g_settings.rage.edge_dtc_moving ) )->set_cond(

 							[ ]( ) { return !!g_settings.rage.edge_dtc_normal( ); } );

 

-						edge_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "freestanding" ),

-							&g_settings.rage.edge_detection ) );

+						edge_form->add_item( std::make_shared< ui::c_dropdown< int > >( 0, 0, 140, xors( "freestanding" ),

+							&g_settings.rage.edge_detection, &dropdowns::antiaim_freestanding ) );

+

+						edge_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 0, 90, xors( "modifier" ),

+							&g_settings.rage.edge_dtc_real_jitter ) );

 

 						edge_form->add_item( std::make_shared< ui::c_dropdown< > >( 0, 0, 140, xors( "priority" ),

 							&g_settings.rage.edge_dtc_priority, &dropdowns::edge_priority )

@@ -430,7 +433,6 @@ namespace ui
 						)->set_cond( [ ]( ) { return g_settings.rage.break_lby; } );

 

 						edge_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 0, 90, xors( "fake jitter" ), &g_settings.rage.edge_dtc_jitter ) );

-						edge_form->add_item(std::make_shared< ui::c_slider< int > >(0, 0, 140, 0, 90, xors("real jitter"), &g_settings.rage.edge_dtc_real_jitter));

 					}

 

 					auto lby_form = std::make_shared< ui::c_form >( 0, 0, 215, 106, xors( "lby breaker" ), 106 ); {

diff --git a/cheat/internal_rewrite/ui_dropdown_item.h b/cheat/internal_rewrite/ui_dropdown_item.h
index 2774013..6789b3c 100644
--- a/cheat/internal_rewrite/ui_dropdown_item.h
+++ b/cheat/internal_rewrite/ui_dropdown_item.h
@@ -63,8 +63,8 @@ namespace ui
 		static std::vector< dropdown_item_t< > > antiaim_freestanding = {

 			{ xors( "disabled" ), 0 },

 			{ xors( "static" ), 1 },

-			{ xors( "narrow angle" ), 2 },

-			{ xors( "wide angle" ), 3 },

+			{ xors( "switch" ), 2 },

+			{ xors( "spin" ), 3 },

 		};

 

 		static std::vector< dropdown_item_t< > > auto_stop = {

diff --git a/cheat/internal_rewrite/visual_local.cpp b/cheat/internal_rewrite/visual_local.cpp
index 119c352..927486a 100644
--- a/cheat/internal_rewrite/visual_local.cpp
+++ b/cheat/internal_rewrite/visual_local.cpp
@@ -38,8 +38,6 @@ namespace features
 			static float incoming_latency;

 			if( g_settings.misc.net_fakelag ) {

 				float desired_latency = incoming_latency + 0.15f;

-				if( g_settings.misc.net_fakelag == 4 )

-					desired_latency = 1.0f;

 

 				auto nci = g_csgo.m_engine( )->GetNetChannelInfo( );

 				if( nci ) {

@@ -53,11 +51,11 @@ namespace features
 					//if( g_settings.misc.net_fakelag == 4 )

 						//visible = true;

 

-					if( percentage > 0.35f ) {

+					//if( percentage > 0.35f ) {

 						draw_really_big_string( 9, ( cur_pos += offset ), clr_t( 110, 110, 110, 255 ), xors( "PING" ) );

 						draw_really_big_string( 11, cur_pos + 2, clr_t( 0, 0, 0, 255 ), xors( "PING" ) );

 						draw_really_big_string( 10, cur_pos, col, xors( "PING" ) );

-					}

+					//}

 				}

 			}

 			else {