diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 3fb90dc3..e1dd9c88 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -197,7 +197,11 @@ class Entity extends Position public function isType(){ return in_array($this->type, func_get_args()); } - + /** + * @param Entity $entity + * @param int $distance + * @return boolean + */ public function attackEntity($entity, $distance){ return false; } diff --git a/src/entity/Monster.php b/src/entity/Monster.php index 58743128..fdba067f 100644 --- a/src/entity/Monster.php +++ b/src/entity/Monster.php @@ -8,9 +8,16 @@ class Monster extends Creature{ public function getAttackDamage(){ return 2; } - + /** + * + * @see Entity::attackEntity() + */ public function attackEntity($entity, $distance){ - $entity->harm($this->getAttackDamage(), $this->eid); - return true; + if($distance < 2.0 && $entity->boundingBox->maxX > $this->boundingBox->minY && $entity->boundingBox->minY < $this->boundingBox->maxY){ + $entity->harm($this->getAttackDamage(), $this->eid); + return true; + }else{ + return false; + } } } diff --git a/src/entity/ai/tasks/TaskAttackPlayer.php b/src/entity/ai/tasks/TaskAttackPlayer.php index bdb5f7cf..28b8cd39 100644 --- a/src/entity/ai/tasks/TaskAttackPlayer.php +++ b/src/entity/ai/tasks/TaskAttackPlayer.php @@ -22,6 +22,7 @@ class TaskAttackPlayer extends TaskBase { if(!$this->isTargetValid($ai)){ $this->reset(); + $this->onEnd($ai); return false; } $ai->mobController->setMovingTarget($ai->entity->target->x, $ai->entity->target->y, $ai->entity->target->z, $this->speedMultiplier); @@ -100,7 +101,7 @@ class TaskAttackPlayer extends TaskBase public function onEnd(EntityAI $ai) { - + $ai->entity->target = false; } } diff --git a/src/entity/ai/tasks/TaskTempt.php b/src/entity/ai/tasks/TaskTempt.php index 4fd664ca..824d90e4 100644 --- a/src/entity/ai/tasks/TaskTempt.php +++ b/src/entity/ai/tasks/TaskTempt.php @@ -4,6 +4,7 @@ class TaskTempt extends TaskBase { public function __construct($speed){ $this->speedMultiplier = $speed; + $this->targetDistance = 10*10; } public function onStart(EntityAI $ai) @@ -13,12 +14,14 @@ class TaskTempt extends TaskBase public function onEnd(EntityAI $ai) { + $ai->entity->target = false; } public function onUpdate(EntityAI $ai) { if(!$this->isTargetValid($ai) || $ai->entity->inPanic || $ai->isStarted("TaskMate")){ $this->reset(); + $this->onEnd($ai); return false; } @@ -42,7 +45,7 @@ class TaskTempt extends TaskBase $xDiff = ($t->x - $e->x); $yDiff = ($t->y - $e->y); $zDiff = ($t->z - $e->z); - return ($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= 36; + return ($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= $this->targetDistance; } return false; } @@ -59,7 +62,7 @@ class TaskTempt extends TaskBase $xDiff = ($t->x - $e->x); $yDiff = ($t->y - $e->y); $zDiff = ($t->z - $e->z); - if(($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= 36){ + if(($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= $this->targetDistance){ return true; } } @@ -72,7 +75,7 @@ class TaskTempt extends TaskBase $yDiff = $pt->y - $e->y; $zDiff = $pt->z - $e->z; $d = ($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff); - if($d <= 36){ + if($d <= $this->targetDistance){ if($bestTargetDistance >= $d){ $closestTarget = $pt; $bestTargetDistance = $d; diff --git a/src/entity/monster/Spider.php b/src/entity/monster/Spider.php index 45a6ca26..7ebeddf4 100644 --- a/src/entity/monster/Spider.php +++ b/src/entity/monster/Spider.php @@ -27,7 +27,7 @@ class Spider extends Monster{ $this->speedY = 0.4; } return false; - }elseif($distance <= 2.0){ + }else{ return parent::attackEntity($entity, $distance); }