Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weapon fix

Browse Source
This commit is contained in:
Sardelka
2022-06-02 10:34:33 +08:00
parent a500a4eeed
commit e2d4ce2159
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Client/Sync/SyncEvents.cs
View File

@ -61,13 +61,6 @@ namespace RageCoop.Client {
{ {
Main.Logger.Trace($"bullet shot:{(WeaponHash)hash}"); Main.Logger.Trace($"bullet shot:{(WeaponHash)hash}");
// Minigun, not working for some reason
if (hash==(uint)WeaponHash.Minigun)
{
hash=(uint)WeaponHash.HeavyRifle;
}
// Valkyire, not working for some reason
if (hash==2756787765) { hash=(uint)WeaponHash.HeavyRifle; }
var start = owner.MainPed.GetMuzzlePosition(); var start = owner.MainPed.GetMuzzlePosition();
if (owner.MainPed.IsOnTurretSeat()) { start=owner.MainPed.Bones[Bone.SkelHead].Position; } if (owner.MainPed.IsOnTurretSeat()) { start=owner.MainPed.Bones[Bone.SkelHead].Position; }
@ -89,10 +82,6 @@ namespace RageCoop.Client {
public static void TriggerVehBulletShot(uint hash, Vehicle veh, SyncedPed owner) public static void TriggerVehBulletShot(uint hash, Vehicle veh, SyncedPed owner)
{ {
if (hash==(uint)VehicleWeaponHash.PlayerBuzzard)
{
hash=(uint)WeaponHash.HeavyRifle;
}
// ANNIHL // ANNIHL
if (veh.Model.Hash==837858166) if (veh.Model.Hash==837858166)
{ {
@ -116,7 +105,7 @@ namespace RageCoop.Client {
#region HANDLE #region HANDLE
private static ParticleEffectAsset CorePFXAsset = default; private static ParticleEffectAsset CorePFXAsset = new ParticleEffectAsset("core");
static WeaponAsset _weaponAsset = default; static WeaponAsset _weaponAsset = default;
static uint _lastWeaponHash; static uint _lastWeaponHash;
@ -168,12 +157,26 @@ namespace RageCoop.Client {
} }
private static void HandleBulletShot(Vector3 start, Vector3 end, uint weaponHash, int ownerID) private static void HandleBulletShot(Vector3 start, Vector3 end, uint weaponHash, int ownerID)
{ {
if (CorePFXAsset==default) { switch (weaponHash)
CorePFXAsset= new ParticleEffectAsset("core"); {
// Minigun, not working for some reason
case (uint)WeaponHash.Minigun:
weaponHash=(uint)WeaponHash.HeavyRifle;
break;
// Valkyire, not working for some reason
case 2756787765:
weaponHash=(uint)WeaponHash.HeavyRifle;
break;
case (uint)VehicleWeaponHash.PlayerBuzzard:
weaponHash=(uint)WeaponHash.HeavyRifle;
break ;
} }
if (!CorePFXAsset.IsLoaded) { CorePFXAsset.Request(); }
var p = EntityPool.GetPedByID(ownerID)?.MainPed; var p = EntityPool.GetPedByID(ownerID)?.MainPed;
if (p == null) { p=Game.Player.Character; Main.Logger.Warning("Failed to find owner for bullet"); } if (p == null) { p=Game.Player.Character; Main.Logger.Warning("Failed to find owner for bullet"); }
if (!CorePFXAsset.IsLoaded) { CorePFXAsset.Request(); }
if (_lastWeaponHash!=weaponHash) if (_lastWeaponHash!=weaponHash)
{ {
_weaponAsset.MarkAsNoLongerNeeded(); _weaponAsset.MarkAsNoLongerNeeded();
@ -182,8 +185,8 @@ namespace RageCoop.Client {
} }
if (!_weaponAsset.IsLoaded) { _weaponAsset.Request(); } if (!_weaponAsset.IsLoaded) { _weaponAsset.Request(); }
World.ShootBullet(start, end, p, _weaponAsset, p.GetWeaponDamage()); World.ShootBullet(start, end, p, _weaponAsset, p.GetWeaponDamage());
var w = p.Weapons.CurrentWeaponObject; Prop w;
if(w != null) if(((w = p.Weapons.CurrentWeaponObject) != null)&&(p.VehicleWeapon==VehicleWeaponHash.Invalid))
{ {
if (p.Weapons.Current.Components.GetSuppressorComponent().Active) if (p.Weapons.Current.Components.GetSuppressorComponent().Active)
{ {
@ -266,7 +269,7 @@ namespace RageCoop.Client {
{ {
if (p.VehicleWeapon!=VehicleWeaponHash.Invalid) if (p.VehicleWeapon!=VehicleWeaponHash.Invalid)
{ {
return 30; return 100;
} }
switch (p.Weapons.Current.Group) switch (p.Weapons.Current.Group)
{ {