From 5e5b152f4b62432655cc4069c1d95be636749b7d Mon Sep 17 00:00:00 2001 From: navewindre Date: Tue, 13 Nov 2018 00:42:56 +0100 Subject: yo sick --- internal_rewrite/ui.h | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'internal_rewrite/ui.h') diff --git a/internal_rewrite/ui.h b/internal_rewrite/ui.h index 56f6c88..4a05e8d 100644 --- a/internal_rewrite/ui.h +++ b/internal_rewrite/ui.h @@ -40,7 +40,7 @@ namespace ui date_str = g_header.username; - menu = std::make_shared< ui::c_menu >( 10, 10, 580, 470, xors( "hit p hook" ), + menu = std::make_shared< ui::c_menu >( 10, 10, 580, 470, xors( "automated currency" ), //don't ask date_str.c_str( ) ); #else @@ -412,7 +412,7 @@ namespace ui yaw_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 0, 90, xors( "fake yaw jitter" ), &g_settings.rage.fake_yaw_jitter ) )->set_cond( [ ]( ) { return !!g_settings.rage.fake_yaw( ); } ); } - + auto edge_form = std::make_shared< ui::c_form >( 0, 0, 215, 110, xors( "edge detection" ), 110 ); { edge_form->add_item( std::make_shared< ui::c_dropdown< > >( 0, 0, 140, xors( "edge" ), &g_settings.rage.edge_dtc_normal, &dropdowns::antiaim_edge ) ); @@ -423,14 +423,14 @@ 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" ), + 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< > >( 0, 0, 140, xors( "priority" ), &g_settings.rage.edge_dtc_priority, &dropdowns::edge_priority ) )->set_cond( [ ]( ) { return g_settings.rage.edge_dtc_normal( ) && g_settings.rage.edge_detection( ); } ); - edge_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "break lby when edging" ), &g_settings.rage.break_lby_edge( ) ) + edge_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "break lby when edging" ), &g_settings.rage.break_lby_edge( ) ) )->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 ) ); @@ -447,24 +447,14 @@ namespace ui std::make_shared< ui::c_key_picker_small >( 195, 0, &g_settings.rage.fakewalk_key ) ); -#ifndef _DEBUG - lby_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 7, 14, &g_settings.rage.fakewalk_ticks ) )->set_cond( - [ ]( ) { return g_settings.rage.fakewalk; } ); - } -#else lby_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 7, 16 , &g_settings.rage.fakewalk_ticks ) )->set_cond( [ ]( ) { return g_settings.rage.fakewalk; } ); } -#endif auto fakelag_form = std::make_shared< ui::c_form >( 0, 0, 215, 165, xors( "fakelag" ), 165 ); { fakelag_form->add_item( std::make_shared< ui::c_dropdown< > >( 0, 0, 140, xors( "mode" ), &g_settings.rage.fakelag.mode, &dropdowns::fakelag_types ) ); -#ifndef _DEBUG - fakelag_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 2, 14, &g_settings.rage.fakelag.ticks ) ); -#else fakelag_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 2, 16, &g_settings.rage.fakelag.ticks ) ); -#endif fakelag_form->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 140, 0, 50, xors( "variance" ), &g_settings.rage.fakelag.fluctuate ) ); auto flags_form = fakelag_form->add_item( std::make_shared< ui::c_form >( 0, 5, 139, 0, xors( "flags" ), 0, true ) ); @@ -576,10 +566,13 @@ namespace ui chams_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "friendlies" ), &g_settings.visuals.chams.friendlies( ) ) ); chams_form->add_item( std::make_shared< ui::c_checkbox >( 0, 0, xors( "flat" ), &g_settings.visuals.chams.flat( ) ) )->set_cond( [ ]( ) { return !g_settings.misc.hide_from_obs( ); } ); chams_form->add_item( std::make_shared< ui::c_slider< float > >( 0, 0, 120, 0.f, 1.f, xors( "reflectivity" ), &g_settings.visuals.chams.reflectivity ) - )->set_cond( [ ]( ) { return !g_settings.visuals.chams.flat && !g_settings.misc.hide_from_obs; } ); + )->set_cond( [ ]( ) { return !g_settings.visuals.chams.flat; } ); + + chams_form->add_item( std::make_shared< ui::c_slider< float > >( 0, 0, 120, 0.f, 1.f, xors( "luminance" ), &g_settings.visuals.chams.luminance ) + )->set_cond( [ ]( ) { return !g_settings.visuals.chams.flat; } ); chams_form->add_item( std::make_shared< ui::c_slider< float > >( 0, 0, 120, 0.f, 1.f, xors( "shine" ), &g_settings.visuals.chams.shine ) - )->set_cond( [ ]( ) { return !g_settings.visuals.chams.flat && !g_settings.misc.hide_from_obs; } ); + )->set_cond( [ ]( ) { return !g_settings.visuals.chams.flat; } ); chams_form->add_item( std::make_shared< ui::c_color_picker >( 0, 0, 120, xors( "friendlies visible" ), &g_settings.visuals.chams.color_visible_friendly( ) ) )->set_cond( [ ]( ) { return g_settings.visuals.chams.friendlies( ); } ); @@ -717,8 +710,8 @@ namespace ui &dropdowns::fake_ping_activation ) )->add_item( std::make_shared< ui::c_key_picker_small >( 195, 0, &g_settings.misc.net_fakeping_key ) )->set_cond( [ ]( ) { return g_settings.misc.net_fakelag == 1 || g_settings.misc.net_fakelag == 2; } ); - fake_ping->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 120, 0, ( int )( sv_maxunlag->get_float( ) * 1000 ), xors( "amount" ), &g_settings.misc.net_fakeping_amount( ) ) - )->set_cond( [ ]( ) { return g_settings.misc.net_fakelag != 4; } ); + fake_ping->add_item( std::make_shared< ui::c_slider< int > >( 0, 0, 120, 0, 800, xors( "amount" ), &g_settings.misc.net_fakeping_amount( ) ) + )->set_cond( [ ]( ) { return g_settings.misc.net_fakelag; } ); } auto helpers_form = std::make_shared< ui::c_form >( 0, 0, 215, 0, xors( "helpers" ) ); { @@ -875,12 +868,11 @@ namespace ui static auto jitter_air = menu->find_item( xors( "in-air yaw jitter" ) ); jitter_air->set_text( g_settings.rage.air_yaw == 2 ? xors( "spin range" ) : xors( "in-air yaw jitter" ) ); - static auto sv_maxunlag = g_csgo.m_cvar( )->FindVar( "sv_maxunlag" ); - static auto fakeping_slider = ( c_slider< int >* )menu->find_item( xors( "amount" ) ).get( ); - + static auto fakeping_form = menu->find_item( xors( "fake latency" ) ); + auto game_rules = c_base_player::get_game_rules( ); if( game_rules ) { - fakeping_slider->set_max( *( bool* )( game_rules + 0x75 ) ? 0.f : 800.f ); + fakeping_form->set_visible( !*( bool* )( game_rules + 0x75 ) ); } render_item( menu.get( ) ); -- cgit v1.2.3