diff --git a/Copy_Command.hpp b/Copy_Command.hpp index 182ddee..5c17a1d 100644 --- a/Copy_Command.hpp +++ b/Copy_Command.hpp @@ -481,16 +481,6 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu { __int8 Compensate_Burst = 0; - if (Weapon_Identifier == 153) - { - if (*(float*)((unsigned __int32)Weapon + 3392) + *(float*)((unsigned __int32)Weapon + 3396) != 0) - { - Compensate_Burst = 1; - - Command->Buttons |= 1; - } - } - if (Weapon_Identifier == 2) { Command->Command_Number = -2134739495; @@ -507,11 +497,23 @@ void __thiscall Redirected_Copy_Command(void* Unknown_Parameter, Command_Structu } else { - if ((163 - Weapon_Identifier ^ Weapon_Identifier - 162) == 1) + if (Weapon_Identifier == 153) { - Command->Command_Number = -2139097805; + if (*(float*)((unsigned __int32)Weapon + 3392) + *(float*)((unsigned __int32)Weapon + 3396) != 0) + { + Compensate_Burst = 1; - Command->Random_Seed = 494641349; + Command->Buttons |= 1; + } + } + else + { + if ((163 - Weapon_Identifier ^ Weapon_Identifier - 162) == 1) + { + Command->Command_Number = -2139097805; + + Command->Random_Seed = 494641349; + } } } } diff --git a/Paint.hpp b/Paint.hpp index d3d3af4..cd07354 100755 --- a/Paint.hpp +++ b/Paint.hpp @@ -4,10 +4,10 @@ void __thiscall Redirected_Paint(void* Panel) Set_Order_Type((unsigned __int32)Client_Module + 4082160)(Panel, -1); - void* Local_Player = *(void**)((unsigned __int32)Client_Module + 7498712); - __int32 Entity_Number = 1; + void* Local_Player = *(void**)((unsigned __int32)Client_Module + 7498712); + Sorted_Target_List.clear(); Traverse_Entity_List_Label: @@ -22,8 +22,6 @@ void __thiscall Redirected_Paint(void* Panel) if (Identifier != -1) { - __int8 Equipment = Identifier < 0; - using Get_Origin_Type = float*(__thiscall*)(void* Entity); float* Local_Player_Origin = Get_Origin_Type((unsigned __int32)Client_Module + 297584)(Local_Player); @@ -41,7 +39,7 @@ void __thiscall Redirected_Paint(void* Panel) __builtin_powf(Local_Player_Origin[0] - Entity_Origin[0], 2) + __builtin_powf(Local_Player_Origin[1] - Entity_Origin[1], 2) + __builtin_powf(Local_Player_Origin[2] - Entity_Origin[2], 2) }; - if (Equipment == 0) + if (Identifier >= 0) { Sorted_Target_List.push_back(Target); } diff --git a/Perform_Trace.hpp b/Perform_Trace.hpp index ab63326..a612b10 100755 --- a/Perform_Trace.hpp +++ b/Perform_Trace.hpp @@ -133,7 +133,7 @@ void __thiscall Perform_Trace(void* Stack) if (Distance < 100) { - Damage += (4.f * Damage) * __builtin_powf(1.f - Distance / 100.f, 2); + Damage += 4.f * Damage * __builtin_powf(1.f - Distance / 100.f, 2); } } } @@ -237,9 +237,7 @@ void __thiscall Perform_Trace(void* Stack) Damage *= Multipliers[Group]; } - __int32 Raw_Identifier = Get_Identifier(Entity, 1, 0); - - if (Raw_Identifier == 99) + if (Get_Identifier(Entity, 1, 0) == 99) { if (*(__int32*)((unsigned __int32)Entity + 2212) == 5) { @@ -248,18 +246,25 @@ void __thiscall Perform_Trace(void* Stack) } else { - if (Raw_Identifier == 270) //or: Identifier == 270 + if (Group * Identifier == 270) { - /* - 1. CTerrorPlayer::OnTakeDamage - 2. CBaseEntity::TakeDamage - 3. CTongue::OnOwnerTakeDamage - 4. CTerrorPlayer::OnTakeDamage_Alive (m_customAbility) - 5. NextBotPlayer::OnTakeDamage_Alive - 6. CBaseCombatCharacter::OnTakeDamage - 7. CCSPlayer::OnTakeDamage - 8. CTerrorPlayer::OnTakeDamage (recursive) - */ + if (*(void**)((unsigned __int32)Entity + 8040) != INVALID_HANDLE_VALUE) + { + if (Damage > 50) + { + __int8 Competitive = ('v' - Mode[0] ^ Mode[0] - 's') == 3; + + if (__builtin_strlen(Mode) > 8) + { + Competitive = Mode[9] == '8'; + } + + if (Competitive == 0) + { + Damage = __builtin_inff(); + } + } + } } } diff --git a/README.md b/README.md index 9e8c6be..d632cf9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ to achieve least interpolation time: `cl_updaterate -1;cl_interp_ratio 0;cl_interp 0` +to queue extra commands: `bind key +zoom` ``` code: https://github.com/qwertyuiop3/Storm