Mirrors/SanAndreasUnity
2
0
Fork 0
mirror of https://github.com/GTA-ASM/SanAndreasUnity synced 2025-02-16 21:08:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

dont start chasing if there is no weapon or no ammo

Browse source
This commit is contained in:
in0finite 2021-10-17 18:36:30 +02:00
parent e6fa8866a5
commit ade4bf6100
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Assets/Scripts/Behaviours/PedAI/ChaseState.cs
View file

@ -182,5 +182,11 @@ namespace SanAndreasUnity.Behaviours.Peds.AI
return WeaponSlot.Hand;
}
public bool CanStartChasing()
{
int slot = this.GetBestWeaponSlot();
return slot != WeaponSlot.Hand;
}
}
}

7
Assets/Scripts/Behaviours/PedAI/IdleState.cs
View file

@ -29,7 +29,12 @@ namespace SanAndreasUnity.Behaviours.Peds.AI
hitPed.PedDef.DefaultType.IsGangMember()))
{
if (attackerPed != null)
_pedAI.StartChasing();
{
if (_pedAI.StateContainer.GetStateOrThrow<ChaseState>().CanStartChasing())
_pedAI.StartChasing();
else
_pedAI.StartEscaping();
}
}
else
_pedAI.StartEscaping();

11
Assets/Scripts/Behaviours/PedAI/WalkAroundState.cs
View file

@ -9,6 +9,15 @@ namespace SanAndreasUnity.Behaviours.Peds.AI
private readonly PathMovementData _pathMovementData = new PathMovementData();
public PathMovementData PathMovementData => _pathMovementData;
private ChaseState _chaseState;
protected internal override void OnAwake(PedAI pedAI)
{
base.OnAwake(pedAI);
_chaseState = _pedAI.StateContainer.GetStateOrThrow<ChaseState>();
}
public override void OnBecameActive()
{
@ -37,7 +46,7 @@ namespace SanAndreasUnity.Behaviours.Peds.AI
// check if we gained some enemies
_enemyPeds.RemoveDeadObjectsIfNotEmpty();
if (_enemyPeds.Count > 0)
if (_enemyPeds.Count > 0 && _chaseState.CanStartChasing())
{
_pedAI.StartChasing();
return;