diff --git a/RageCoop.Client/Main.cs b/RageCoop.Client/Main.cs index affa0c4..a5b68c5 100644 --- a/RageCoop.Client/Main.cs +++ b/RageCoop.Client/Main.cs @@ -110,6 +110,20 @@ namespace RageCoop.Client private bool _lastDead; private void OnTick(object sender, EventArgs e) { + /* + unsafe + { + var stationName = Function.Call(Hash.GET_RADIO_STATION_NAME, Game.RadioStation); + + //_GET_CURRENT_RADIO_TRACK_NAME + var currentTrack = Function.Call((Hash)0x34D66BC058019CE0, stationName); + Function.Call(Hash.SET_RADIO_TRACK, "RADIO_03_HIPHOP_NEW", "ARM1_RADIO_STARTS"); + return currentTrack; + + var h1 = Function.Call(Hash._GET_CURRENT_RADIO_STATION_HASH); + return $"{h1},{h2},{s},{s1}"; + } + */ P= Game.Player.Character; PlayerPosition=P.ReadPosition(); FPS=Game.FPS; @@ -190,18 +204,8 @@ namespace RageCoop.Client _lastDead=P.IsDead; Ticked++; } - float p1; - float p2; private void OnKeyDown(object sender, KeyEventArgs e) { - if (e.KeyCode==Keys.Right) - { - p1+=0.05f; - } - if (e.KeyCode==Keys.Up) - { - p2+=0.05f; - } if (MainChat.Focused) { MainChat.OnKeyDown(e.KeyCode); diff --git a/RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs b/RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs index 43a7fe4..e1621f5 100644 --- a/RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs +++ b/RageCoop.Client/Sync/Entities/Ped/SyncedPed.cs @@ -767,13 +767,9 @@ namespace RageCoop.Client Function.Call(Hash.TASK_DRIVE_BY, MainPed, 0, 0, AimCoords.X, AimCoords.Y, AimCoords.Z, 1, 100, 1, FiringPattern.SingleShot); } } - else + else if (_lastDriveBy || MainPed.IsTaskActive(TaskType.CTaskAimGunVehicleDriveBy)) { - if (MainPed.IsTaskActive(TaskType.CTaskAimGunVehicleDriveBy)) - { - - MainPed.Task.ClearAll(); - } + MainPed.Task.ClearAll(); _lastDriveBy=false; } diff --git a/RageCoop.Client/Util/WeaponUtil.cs b/RageCoop.Client/Util/WeaponUtil.cs index 6a52fa4..a2ac021 100644 --- a/RageCoop.Client/Util/WeaponUtil.cs +++ b/RageCoop.Client/Util/WeaponUtil.cs @@ -79,6 +79,18 @@ namespace RageCoop.Client BulletsShot++; switch (v.Model.Hash) { + // BRUISER3 + case -2042350822: + return BulletsShot%2==0 ? 52 : 50; + + // BRUTUS3 + case 2038858402: + return 84; + + // MONSTER5 + case -715746948: + return BulletsShot%2==0 ? 63 : 65; + // JB7002 case 394110044: return BulletsShot%2==0 ? 54 : 53; @@ -193,7 +205,15 @@ namespace RageCoop.Client return -1; } } + public static int GetMuzzleTurret(this Vehicle v) + { + switch (v.Model.Hash) + { + default: + return 0; + } + } public static bool IsUsingProjectileWeapon(this Ped p) { var vp = p.VehicleWeapon;