Fix bug where looking too harshly at an inexperienced pilot would cause them to panic and fly in circles.

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@5027 127b21dd-08f5-0310-b4b7-95ae10353056
This commit is contained in:
Chris Morris 2012-06-23 13:31:14 +00:00
parent b7b6d4aa66
commit 362b7b83f8

View File

@ -4364,9 +4364,9 @@ ShipEntity* doOctreesCollide(ShipEntity* prime, ShipEntity* other)
else if(frustration > 0.0) frustration -= delta_t * 0.75;
double aspect = [self approachAspectToPrimaryTarget];
if(frustration > 10 || aspect > 0.75)
if(forward_weapon_type != WEAPON_THARGOID_LASER && (frustration > 10 || aspect > 0.75))
{
behaviour = BEHAVIOUR_ATTACK_TARGET;
behaviour = BEHAVIOUR_ATTACK_FLY_TO_TARGET;
}
// use weaponry