From aa6f71be7a1e61783e14573090bc3f0234c76412 Mon Sep 17 00:00:00 2001 From: LIghty Date: Wed, 21 Mar 2018 20:15:58 +0100 Subject: [PATCH] custom self chams and glow settings --- src/menu/ncc/Menu.cpp | 141 +++++++++++++++++++++++++++++-------- src/visual/EffectChams.cpp | 17 ++++- src/visual/EffectGlow.cpp | 12 ++++ 3 files changed, 139 insertions(+), 31 deletions(-) diff --git a/src/menu/ncc/Menu.cpp b/src/menu/ncc/Menu.cpp index 43cf90c2..29ff4ab7 100644 --- a/src/menu/ncc/Menu.cpp +++ b/src/menu/ncc/Menu.cpp @@ -337,21 +337,36 @@ static const std::string list_tf2 = R"( "auto_vacc_bullets" ] "Ignore" [ + "Ignore Menu" "trigger_ignore_cloak" "trigger_ignore_hoovy" "trigger_ignore_vaccinator" ] "Auto Backstab" [ - "Auto BackStab" + "Auto BackStab Menu" "autobackstab_range" "autobackstab" ] "Auto Sticky" [ - "Auto Sticky" + "Auto Sticky Menu" "sticky_enabled" "sticky_legit" "sticky_buildings" ] + "Auto Detonator" [ + "Auto Detonator Menu" + "detonator_enabled" + "detonator_legit" + ] + "Auto Airblast" [ + "Auto Airblast Menu" + "reflect_enabled" + "reflect_key" + "reflect_legit" + "reflect_dodgeball" + "reflect_only_idle" + "reflect_stickybombs" + ] ] "Fake Lag" [ "Fake Lag Menu" @@ -361,8 +376,9 @@ static const std::string list_tf2 = R"( "Sequence Freezing Menu" "se_master" "se_key" + "se_doom" "se_switch" - "se_value"90 + "se_value" "se_cart" "se_cap" "se_cloak" @@ -379,6 +395,7 @@ static const std::string list_tf2 = R"( "fov_zoomed" "no_invis" "no_hats" + "antidisguise" "no_arms" "ESP" [ "ESP Menu" @@ -398,15 +415,6 @@ static const std::string list_tf2 = R"( "esp_class" "esp_name" "esp_distance" - "ESP Color" [ - "Esp Color" - "esp_color_blue_r" - "esp_color_blue_g" - "esp_color_blue_b" - "esp_color_red_r" - "esp_color_red_g" - "esp_color_red_b" - ] ] "Chams" [ "Chams Menu" @@ -424,6 +432,14 @@ static const std::string list_tf2 = R"( "chams_teammates" "chams_health" "chams_flat" + "Self Chams"[ + "Self Chams Menu" + "chams_self" + "chams_self_rainbow" + "chams_self_r" + "chams_self_g" + "chams_self_b" + ] ] "Glow" [ "Glow Menu" @@ -440,8 +456,28 @@ static const std::string list_tf2 = R"( "glow_players" "glow_teammates" "glow_health" + "Self Glow"[ + "Self Glow Menu" + "glow_self" + "glow_self_rainbow" + "glow_self_r" + "glow_self_g" + "glow_self_b" + ] + ] + "Colors" [ + "Colors Menu" + "gui_rainbow" + "gui_color_r" + "gui_color_g" + "gui_color_b" + "esp_color_blue_r" + "esp_color_blue_g" + "esp_color_blue_b" + "esp_color_red_r" + "esp_color_red_g" + "esp_color_red_b" ] - ] "Bunny Hop" [ "Bunny Hop Menu" @@ -456,9 +492,13 @@ static const std::string list_tf2 = R"( "Anti-Aim Menu" "aa_enabled" "aa_truefakes" + "aa_pitch_real" + "aa_yaw_real" + "aa_pitch_mode_real" + "aa_yaw_mode_real" "aa_pitch" - "aa_pitch_mode" "aa_yaw" + "aa_pitch_mode" "aa_yaw_mode" "aa_spin" "aa_roll" @@ -488,19 +528,29 @@ static const std::string list_tf2 = R"( "Chat Spam" [ "Chat Spam Menu" "spam" - "chat_newlines" "killsay" - "spam_teamname" - "spam_voicecommand" + "spam_teamname" + "spam_voicecommand" + "chat_newlines" "spam_delay" "spam_file" "spam_random" + "Uberspam" [ + "Uberspam Menu" + "uberspam" + "uberspam_team" + "uberspam_build" + "uberspam_ended" + "uberspam_used" + "uberspam_ready" + ] ] "Misc" [ "Misc Menu" "pure_bypass" "nolerp" - "info" + "info" + "info_min" "noisemaker" "medal_flip" "killstreak" @@ -509,12 +559,8 @@ static const std::string list_tf2 = R"( "anti_afk" "die_if_vac" "request_balance_spam" - "autotaunt" - "autotaunt_chance" - "gui_rainbow" - "gui_color_b" - "gui_color_g" - "gui_color_r" + "nopush_enabled" + "HealArrow" [ "HealArrow Menu" "healarrow" @@ -522,16 +568,55 @@ static const std::string list_tf2 = R"( "healarrow_charge" ] "Anti Backstab" [ - "Anti Backstab" + "Anti Backstab Menu" "antibackstab" "antibackstab_nope" "antibackstab_angle" "antibackstab_silent" "antibackstab_distance" ] - ] - "Ignore Settings" [ - "Ignore Settings Menu" + "Spyalert" [ + "Spyalert Menu" + "spyalert_enabled" + "spyalert_backstab" + "spyalert_sound" + "spyalert_interval" + "spyalert_warning" + ] + "Anti Cheat" [ + "Anti Cheat Menu" + "ac_enabled" + "ac_aimbot" + "ac_aimbot_detections" + "ac_aimbot_angle" + "ac_bhop_count" + ] + "Automated" [ + "Automated Menu" + "autoqueue" + "autojoin_team" + "autojoin_class" + "autotaunt" + "autotaunt_chance" + ] + "Debug" [ + "Debug Menu" + "debug_freecam" + "debug_projectiles" + "debug_log_sent_messages" + "debug_log_usermessages" + "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" + ] ] )"; diff --git a/src/visual/EffectChams.cpp b/src/visual/EffectChams.cpp index f7c78b86..d3350626 100644 --- a/src/visual/EffectChams.cpp +++ b/src/visual/EffectChams.cpp @@ -44,7 +44,16 @@ static CatVar legit(CV_SWITCH, "chams_legit", "0", "Legit chams", static CatVar singlepass(CV_SWITCH, "chams_singlepass", "0", "Single-pass", "Render chams only once (this disables 'darker' chams " "on invisible parts of player"); - +static CatVar chamsself(CV_SWITCH, "chams_self", "0", "Enable chams on self", + ""); +static CatVar rainbow(CV_SWITCH, "chams_self_rainbow", "1", + "Enable rainbow chams on self", + "Only visible in thirdperson!"); +static CatVar chamsR(CV_INT, "chams_self_r", "0", "Self chams red", "", 0, 255); +static CatVar chamsG(CV_INT, "chams_self_g", "0", "Self chams green", "", 0, + 255); +static CatVar chamsB(CV_INT, "chams_self_b", "0", "Self chams blue", "", 0, + 255); void EffectChams::Init() { logging::Info("Init EffectChams..."); @@ -120,8 +129,8 @@ rgba_t EffectChams::ChamsColor(IClientEntity *entity) case ENTITY_PLAYER: if (!players) return colors::empty; - if (!ent->m_bEnemy && !teammates) - return colors::empty; + if (ent->m_IDX == LOCAL_E->m_IDX && chamsself && !rainbow) + return colors::FromRGBA8(chamsR, chamsG, chamsB, 255); if (health) { return colors::Health(ent->m_iHealth, ent->m_iMaxHealth); @@ -140,6 +149,8 @@ bool EffectChams::ShouldRenderChams(IClientEntity *entity) CachedEntity *ent = ENTITY(entity->entindex()); if (CE_BAD(ent)) return false; + if (ent->m_IDX == LOCAL_E->m_IDX && !chamsself) + return false; switch (ent->m_Type) { case ENTITY_BUILDING: diff --git a/src/visual/EffectGlow.cpp b/src/visual/EffectGlow.cpp index 466a6d46..498f9515 100644 --- a/src/visual/EffectGlow.cpp +++ b/src/visual/EffectGlow.cpp @@ -49,6 +49,14 @@ static CatVar teammate_buildings(CV_SWITCH, "glow_teammate_buildings", "0", static CatVar powerups(CV_SWITCH, "glow_powerups", "1", "Powerups"); static CatVar weapons_white(CV_SWITCH, "glow_weapons_white", "1", "White Weapon Glow", "Weapons will glow white"); +static CatVar glowself(CV_SWITCH, "glow_self", "0", "Enable glow on self"); +static CatVar rainbow(CV_SWITCH, "glow_self_rainbow", "1", + "Enable rainbow glow on self", + "Only visible in thirdperson!"); +static CatVar glowR(CV_INT, "glow_self_r", "200", "Self glow red", "", 0, 255); +static CatVar glowG(CV_INT, "glow_self_g", "200", "Self glow green", "", 0, + 255); +static CatVar glowB(CV_INT, "glow_self_b", "200", "Self glow blue", "", 0, 255); struct ShaderStencilState_t { @@ -241,6 +249,8 @@ rgba_t EffectGlow::GlowColor(IClientEntity *entity) } break; case ENTITY_PLAYER: + if (ent->m_IDX == LOCAL_E->m_IDX && glowself && !rainbow) + return colors::FromRGBA8(glowR, glowG, glowB, 255); if (health) { return colors::Health(ent->m_iHealth, ent->m_iMaxHealth); @@ -262,6 +272,8 @@ bool EffectGlow::ShouldRenderGlow(IClientEntity *entity) ent = ENTITY(entity->entindex()); if (CE_BAD(ent)) return false; + if (ent->m_IDX == LOCAL_E->m_IDX && !glowself) + return false; switch (ent->m_Type) { case ENTITY_BUILDING: