Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2024-11-15 00:37:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

extract function

Browse source
This commit is contained in:
in0finite 2022-01-01 22:42:31 +01:00
parent bdabcfe8cd
commit 126b8e60b4
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Assets/Scripts/Behaviours/Ped/States/BaseAimMovementState.cs
View file

@ -259,17 +259,8 @@ namespace SanAndreasUnity.Behaviours.Peds.States
{
this.UpdateAimAnim (state);
GetEffectiveFirePosAndDir(m_ped, WeaponAttackParams.Default, out Vector3 pos, out Vector3 dir);
Damageable damagable = m_weapon.ProjectileRaycastForDamagable(
pos, dir, WeaponAttackParams.Default, out bool attackWillBeConducted, out DamageInfo damageInfo);
if (attackWillBeConducted && damagable != null)
{
var targetPed = damagable.GetComponent<Ped>();
if (targetPed != null)
{
targetPed.OnUnderAimOfOtherPed(damageInfo);
}
}
// do this right after UpdateAimAnim(), because that's the state when weapon conducts attack
UpdateUnderAimDetection(m_ped);
}
}
@ -380,6 +371,21 @@ namespace SanAndreasUnity.Behaviours.Peds.States
}
public static void UpdateUnderAimDetection(Ped ped)
{
GetEffectiveFirePosAndDir(ped, WeaponAttackParams.Default, out Vector3 pos, out Vector3 dir);
Damageable damagable = ped.CurrentWeapon.ProjectileRaycastForDamagable(
pos, dir, WeaponAttackParams.Default, out bool attackWillBeConducted, out DamageInfo damageInfo);
if (attackWillBeConducted && damagable != null)
{
var targetPed = damagable.GetComponent<Ped>();
if (targetPed != null)
{
targetPed.OnUnderAimOfOtherPed(damageInfo);
}
}
}
protected virtual void UpdateArmTransformsForAWA()
{
BaseAimMovementState.UpdateArmTransformsForAWA (