flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2148 from SafwatHalaby/easy

Browse Source 
AI - Saner Livestock
This commit is contained in:
worktycho 2015-05-27 17:46:11 +01:00
commit 7c028b87bc
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Mobs/Monster.cpp
View File

@ -196,7 +196,15 @@ bool cMonster::TickPathFinding(cChunk & a_Chunk)
{ {
if (m_NoMoreWayPoints || (--m_GiveUpCounter == 0)) if (m_NoMoreWayPoints || (--m_GiveUpCounter == 0))
{ {
ResetPathFinding(); // Try to calculate a path again. if (m_EMState == ATTACKING)
{
ResetPathFinding(); // Try to calculate a path again.
// This results in mobs hanging around an unreachable target (player).
}
else
{
StopMovingToPosition(); // Find a different place to go to.
}
return false; return false;
} }
else if (!m_Path->IsLastPoint()) // Have we arrived at the next cell, as denoted by m_NextWayPointPosition? else if (!m_Path->IsLastPoint()) // Have we arrived at the next cell, as denoted by m_NextWayPointPosition?
@ -391,6 +399,7 @@ void cMonster::MoveToPosition(const Vector3d & a_Position)
void cMonster::StopMovingToPosition() void cMonster::StopMovingToPosition()
{ {
m_IsFollowingPath = false; m_IsFollowingPath = false;
ResetPathFinding();
} }
@ -520,7 +529,7 @@ void cMonster::SetPitchAndYawFromDestination()
double HeadRotation, HeadPitch; double HeadRotation, HeadPitch;
Distance.Normalize(); Distance.Normalize();
VectorToEuler(Distance.x, Distance.y, Distance.z, HeadRotation, HeadPitch); VectorToEuler(Distance.x, Distance.y, Distance.z, HeadRotation, HeadPitch);
if (std::abs(BodyRotation - HeadRotation) < 120) if (std::abs(BodyRotation - HeadRotation) < 90)
{ {
SetHeadYaw(HeadRotation); SetHeadYaw(HeadRotation);
SetPitch(-HeadPitch); SetPitch(-HeadPitch);