Skip to content

Commit

Permalink
Fix trigger 3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@UnrealKaraulov
UnrealKaraulov committed Jun 7, 2024
1 parent d13dcc1 commit 8a3359a
Showing 1 changed file with 23 additions and 20 deletions.
43 changes: 23 additions & 20 deletions UnrealDemoScanner/UnrealDemoScanner.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace DemoScanner.DG
public static class DemoScanner
{
public const string PROGRAMNAME = "Unreal Demo Scanner";
public const string PROGRAMVERSION = "1.72.5b";
public const string PROGRAMVERSION = "1.72.6b";

public static bool DEMOSCANNER_HLTV = false;

Expand Down Expand Up @@ -227,7 +227,8 @@ public MyTreeNode(string text)
public static WeaponIdType CurrentWeapon = WeaponIdType.WEAPON_NONE;
public static WeaponIdType StrikesWeapon = WeaponIdType.WEAPON_NONE;
public static bool WeaponChanged;
public static bool IsAttack;
public static int IsAttack;
public static bool IsInAttack(){ return IsAttack > 0; }
public static bool IsAttack2;
public static int AmmoCount;
public static int AttackErrors;
Expand Down Expand Up @@ -1528,7 +1529,8 @@ public static void CheckConsoleCommand(string s2, bool isstuff = false)
NeedSearchViewAnglesAfterAttack++;
LerpBeforeAttack = CurrentFrameLerp;
NeedDetectLerpAfterAttack = true;
if (IsAttack)

if (IsInAttack())
{
AttackErrors++;
LastAttackHack = CurrentTime;
Expand All @@ -1545,7 +1547,7 @@ public static void CheckConsoleCommand(string s2, bool isstuff = false)

Aim2AttackDetected = false;
NeedSearchAim2 = true;
IsAttack = true;
IsAttack = 5;
IsAttackLastTime = CurrentTime;
}
else
Expand All @@ -1556,7 +1558,7 @@ public static void CheckConsoleCommand(string s2, bool isstuff = false)
NeedSearchViewAnglesAfterAttack = 0;
Aim2AttackDetected = false;
NeedSearchAim2 = false;
IsAttack = true;
IsAttack = 5;
IsAttackLastTime = 0.0f;
}

Expand Down Expand Up @@ -1591,7 +1593,7 @@ public static void CheckConsoleCommand(string s2, bool isstuff = false)
// Если игрок жив, атакует, время атаки больше чем 150мс, атака остановлена на 2 кадра раньше чем нажат -attack
if (IsUserAlive() && !IsCmdChangeWeapon() && !IsRealChangeWeapon() && abs(CurrentTime) > EPSILON &&
abs(CurrentTime - IsAttackLastTime) > 0.15 && abs(CurrentTime - IsNoAttackLastTime) > 0.15 &&
abs(IsAttackLastTime - CurrentTime) > EPSILON && IsAttack &&
abs(IsAttackLastTime - CurrentTime) > EPSILON && IsInAttack() &&
CurrentNetMsgFrameId - StopAttackBtnFrameId > 2 && StopAttackBtnFrameId != 0 && NeedSearchAim3)
{
NeedSearchAim3 = false;
Expand All @@ -1605,7 +1607,7 @@ public static void CheckConsoleCommand(string s2, bool isstuff = false)
NeedWriteAim = 0;
IsNoAttackLastTime = CurrentTime;
IsNoAttackLastTime2 = CurrentTime2;
IsAttack = false;
IsAttack = 0;
AttackCheck = -1;
Aim2AttackDetected = false;
SelectSlot--;
Expand Down Expand Up @@ -4187,7 +4189,7 @@ следующий кадр изменение и 5 кадров нет движ
FrameUnattackStrike = 0;
CurrentFrameAttacked = true;
LastAttackPressed = CurrentTime;
if (!IsAttack && NeedIgnoreAttackFlag > 0)
if (!IsInAttack() && NeedIgnoreAttackFlag > 0)
{
if (CurrentFrameDuplicated <= 0)
NeedIgnoreAttackFlag += 2;
Expand All @@ -4198,7 +4200,7 @@ следующий кадр изменение и 5 кадров нет движ
{
LastEventDetectTime = 0.0f;
}
if (abs(LastEventDetectTime) > EPSILON && abs(LastAttackPressed - LastEventDetectTime) > 0.25)
if (!IsInAttack() && abs(LastEventDetectTime) > EPSILON && abs(LastAttackPressed - LastEventDetectTime) > 0.25)
{
DemoScanner_AddWarn("[BETA] [TRIGGER TYPE 3." + (LastEventId < 0 ? 2 : 1) + " " + CurrentWeapon + "] at (" + CurrentTime + ") " +
CurrentTimeString, false);
Expand All @@ -4221,6 +4223,7 @@ следующий кадр изменение и 5 кадров нет движ
}
else
{
IsAttack--;
FrameUnattackStrike++;
FrameAttackStrike = 0;
if (!NeedSearchAim3 && PreviousFrameAttacked && RealAlive &&
Expand All @@ -4238,7 +4241,7 @@ следующий кадр изменение и 5 кадров нет движ
NeedSearchAim3 = false;
}

if (!IsAttack) NeedIgnoreAttackFlag = 0;
if (!IsInAttack()) NeedIgnoreAttackFlag = 0;

CurrentFrameAttacked = false;
}
Expand Down Expand Up @@ -4675,7 +4678,7 @@ следующий кадр изменение и 5 кадров нет движ
}
}

if (IsAttack)
if (IsInAttack())
{
if (PreviousFrameAttacked && !CurrentFrameAttacked)
{
Expand Down Expand Up @@ -5471,7 +5474,7 @@ следующий кадр изменение и 5 кадров нет движ
// // ;// Console.WriteLine("PREVATT");
// //else if (!CurrentFrameOnGround)
// // ;// Console.WriteLine("NOGROUND");
// //else if (CurrentTime - IsAttackLastTime < 3.0f || IsAttack)
// //else if (CurrentTime - IsAttackLastTime < 3.0f || IsInAttack())
// // ;// Console.WriteLine("LASTATTACK");
// //else
// //{
Expand Down Expand Up @@ -5698,7 +5701,7 @@ следующий кадр изменение и 5 кадров нет движ
//Console.WriteLine("Aim3 1:" + ViewanglesXBeforeAttack + ":" + ViewanglesYBeforeAttack);
NeedSearchViewAnglesAfterAttack++;
}
else if (NeedSearchViewAnglesAfterAttack == 2 && IsAttack && RealAlive)
else if (NeedSearchViewAnglesAfterAttack == 2 && IsInAttack() && RealAlive)
{
if (CurrentWeapon == WeaponIdType.WEAPON_C4 ||
CurrentWeapon == WeaponIdType.WEAPON_HEGRENADE ||
Expand All @@ -5720,7 +5723,7 @@ следующий кадр изменение и 5 кадров нет движ
else
{
NeedSearchViewAnglesAfterAttack = 0;
if (NeedSearchViewAnglesAfterAttackNext && RealAlive && IsAttack)
if (NeedSearchViewAnglesAfterAttackNext && RealAlive && IsInAttack())
{
NeedSearchViewAnglesAfterAttackNext = false;
ViewanglesXAfterAttackNext = CDFRAME_ViewAngles.X;
Expand Down Expand Up @@ -6072,7 +6075,7 @@ следующий кадр изменение и 5 кадров нет движ
}
}

if (ShotFound > 0 && !IsReload && IsAttack && RealAlive && SelectSlot <= 0)
if (ShotFound > 0 && !IsReload && IsInAttack() && RealAlive && SelectSlot <= 0)
{
}
else
Expand Down Expand Up @@ -6149,7 +6152,7 @@ следующий кадр изменение и 5 кадров нет движ
}
}

if (!IsPlayerBtnAttackedPressed() && !IsAttack && NeedIgnoreAttackFlag == 0)
if (!IsPlayerBtnAttackedPressed() && !IsInAttack() && NeedIgnoreAttackFlag == 0)
if (!TriggerAttackFound && CurrentFrameAttacked && FirstAttack)
{
if (CurrentWeapon == WeaponIdType.WEAPON_C4 ||
Expand Down Expand Up @@ -6285,7 +6288,7 @@ следующий кадр изменение и 5 кадров нет движ

if (AttackCheck > -1)
{
if (!CurrentFrameAttacked && !IsReload && SelectSlot <= 0 && IsAttack && RealAlive &&
if (!CurrentFrameAttacked && !IsReload && SelectSlot <= 0 && IsInAttack() && RealAlive &&
IsRealWeapon() && CurrentWeapon != WeaponIdType.WEAPON_KNIFE &&
CurrentWeapon != WeaponIdType.WEAPON_C4 &&
CurrentWeapon != WeaponIdType.WEAPON_HEGRENADE &&
Expand Down Expand Up @@ -6333,7 +6336,7 @@ следующий кадр изменение и 5 кадров нет движ
//{
// //if (SelectSlot > 0)
// // Console.WriteLine("select slot...");
// //if (!IsAttack)
// //if (!IsInAttack())
// // Console.WriteLine("not in attack...");
// //if (!UserAlive)
// // Console.WriteLine("user invalid blya...");
Expand Down Expand Up @@ -12593,13 +12596,13 @@ public void ReadDelta(BitBuffer bitBuffer, HalfLifeDelta delta, ref byte[] bitma
//if (LastWatchWeapon == CurrentWeapon && UserAlive && AmmoCount > 0 && ammocount > 0 && AmmoCount - ammocount > 0 && AmmoCount - ammocount < 4)
//{
// SkipNextAttack2--;
// if (IsAttack || CurrentTime - IsNoAttackLastTime < 0.1)
// if (IsInAttack() || CurrentTime - IsNoAttackLastTime < 0.1)
// {
// if (CurrentWeapon == WeaponIdType.WEAPON_FAMAS)
// SkipNextAttack2 = 3;
// // Console.WriteLine("Attack");
// }
// else if (!IsAttack && !IsReload && SkipNextAttack2 <= 0)
// else if (!IsInAttack() && !IsReload && SkipNextAttack2 <= 0)
// {
// // ShotFound = true;
// TextComments.Add("Detected [TRIGGER BOT] at (" + CurrentTime + ") " + CurrentTimeString);
Expand Down

0 comments on commit 8a3359a

Please sign in to comment.