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

ped can not be damaged by explosion while he is in vehicle

Browse source
This commit is contained in:
in0finite 2020-06-29 17:50:33 +02:00
parent e5c6144706
commit 99c1cf8ecc
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Assets/Scripts/Behaviours/Ped/States/VehicleSittingState.cs
View file

@ -195,6 +195,17 @@ namespace SanAndreasUnity.Behaviours.Peds.States
return base.GetCameraFocusPos();
}
public override void OnDamaged(DamageInfo damageInfo)
{
if (damageInfo.damageType == DamageType.Explosion)
{
// ped should not be damaged by explosion while he is in vehicle
return;
}
base.OnDamaged(damageInfo);
}
}
}

3
Assets/Scripts/Behaviours/Vehicles/Vehicle_Damage.cs
View file

@ -187,7 +187,8 @@ namespace SanAndreasUnity.Behaviours.Vehicles
explosionCenter,
VehicleManager.Instance.explosionDamageRadius,
Mathf.Pow(this.HandlingData.Mass, VehicleManager.Instance.explosionMassToDamageExponent),
VehicleManager.Instance.explosionDamageOverDistanceCurve);
VehicleManager.Instance.explosionDamageOverDistanceCurve,
DamageType.Explosion);
// create explosion effect

4
Assets/Scripts/Utilities/Damageable.cs
View file

@ -53,7 +53,7 @@ namespace SanAndreasUnity.Utilities
}
public static void InflictDamageToObjectsInArea(
Vector3 center, float radius, float damageAmount, AnimationCurve damageOverDistanceCurve)
Vector3 center, float radius, float damageAmount, AnimationCurve damageOverDistanceCurve, string damageType)
{
Collider[] overlappingColliders = Physics.OverlapSphere(center, radius);
@ -102,7 +102,7 @@ namespace SanAndreasUnity.Utilities
float distanceFactor = damageOverDistanceCurve.Evaluate(Mathf.Clamp01(distance / radius));
float damageAmountBasedOnDistance = damageAmount * distanceFactor;
F.RunExceptionSafe(() => damageable.Damage(new DamageInfo() { amount = damageAmountBasedOnDistance }));
F.RunExceptionSafe(() => damageable.Damage(new DamageInfo() { amount = damageAmountBasedOnDistance, damageType = damageType }));
}
}