diff --git a/src/entity/Entity.php b/src/entity/Entity.php index f3a635f9..6293a201 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1,5 +1,7 @@ level->rayTraceBlocks(new Vector($this->x, $this->y + $this->getEyeHeight(), $this->z), new Vector($e->x, $e->y + $e->getEyeHeight(), $e->z)) == null; + } + /** * Can entity be collided with or not * @return boolean diff --git a/src/entity/ai/EntityAI.php b/src/entity/ai/EntityAI.php index e6ec6f67..1552ee27 100644 --- a/src/entity/ai/EntityAI.php +++ b/src/entity/ai/EntityAI.php @@ -24,6 +24,12 @@ class EntityAI $this->mobController = new MobController($entity); } + + public function canSee(Entity $entity){ + //TODO caches + return $this->entity->canSee($entity); + } + /** * Add a task for entity * @param TaskBase $task diff --git a/src/entity/ai/tasks/TaskLookAround.php b/src/entity/ai/tasks/TaskLookAround.php index bb25edc5..a931d98a 100644 --- a/src/entity/ai/tasks/TaskLookAround.php +++ b/src/entity/ai/tasks/TaskLookAround.php @@ -19,7 +19,7 @@ class TaskLookAround extends TaskBase public function canBeExecuted(EntityAI $ai) { - return !$ai->entity->inPanic && !$ai->entity->isMoving() && lcg_value() < 0.02 && !$ai->isStarted("TaskLookAtPlayer") && !$ai->isStarted("TaskMate") && !$ai->isStarted("TaskTempt") && !$ai->entity->hasPath(); /*Vanilla value*/ + return !$ai->entity->inPanic && !$ai->entity->isMoving() && lcg_value() < 0.02 && !$ai->isStarted("TaskLookAtPlayer") && !$ai->isStarted("TaskAttackPlayer") && !$ai->isStarted("TaskMate") && !$ai->isStarted("TaskTempt") && !$ai->entity->hasPath(); /*Vanilla value*/ } public function onUpdate(EntityAI $ai) diff --git a/src/entity/ai/tasks/TaskRandomWalk.php b/src/entity/ai/tasks/TaskRandomWalk.php index ad64ad61..4b68a746 100644 --- a/src/entity/ai/tasks/TaskRandomWalk.php +++ b/src/entity/ai/tasks/TaskRandomWalk.php @@ -26,7 +26,7 @@ class TaskRandomWalk extends TaskBase public function onUpdate(EntityAI $ai) { - if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->isStarted("TaskTempt") || $ai->isStarted("TaskFollowParent") ) { + if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->isStarted("TaskTempt") || $ai->isStarted("TaskFollowParent") || $ai->isStarted("TaskRangedAttack")) { $this->reset(); return false; //TODO Better way: block movement } @@ -37,7 +37,7 @@ class TaskRandomWalk extends TaskBase public function canBeExecuted(EntityAI $ai) { - if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->entity->hasPath() || $ai->isStarted("TaskTempt") ||$ai->isStarted("TaskAttackPlayer")) { + if(($ai->entity instanceof Creeper && $ai->entity->isIgnited()) || $ai->entity->hasPath() || $ai->isStarted("TaskTempt") || $ai->isStarted("TaskAttackPlayer") || $ai->isStarted("TaskRangedAttack")) { return false; } // i really need mutexBits return !$ai->entity->inPanic && !$ai->isStarted("TaskMate") && !$ai->isStarted("TaskEatTileGoal") && !$ai->isStarted("TaskLookAround") && !$ai->isStarted("TaskFollowParent") && !$ai->isStarted("TaskLookAtPlayer") && mt_rand(0, 120) == 0; diff --git a/src/entity/ai/tasks/TaskRangedAttack.php b/src/entity/ai/tasks/TaskRangedAttack.php new file mode 100644 index 00000000..161cde28 --- /dev/null +++ b/src/entity/ai/tasks/TaskRangedAttack.php @@ -0,0 +1,147 @@ +speedMultiplier = $speed; + $this->rangeSquared = $range*$range; + $this->server = ServerAPI::request(); + } + + public function onStart(EntityAI $ai) + { + $this->selfCounter = 1; + $this->ticksNoSeen = 0; + } + + public function onEnd(EntityAI $ai) + { + $ai->entity->target = false; + + } + + public function onUpdate(EntityAI $ai) + { + if(!$this->isTargetValid($ai)){ + $this->reset(); + $this->onEnd($ai); + return false; + } + --$this->attackCounter; + //if(!$ai->canSee($ai->entity->target)){ useless without pathfinder =< + // ++$this->ticksNoSeen; + //}else{ + // $this->ticksNoSeen = 0; + //} + + $dist = $ai->entity->distanceSquared($ai->entity->target); + + if($dist > 100){ + $ai->mobController->setMovingTarget($ai->entity->target->x, $ai->entity->target->y, $ai->entity->target->z, $this->speedMultiplier); + } + + $ai->mobController->setLookPosition($ai->entity->target->x, $ai->entity->target->y + 0.12, $ai->entity->target->z, 10, $ai->entity->getVerticalFaceSpeed()); + + if($this->attackCounter <= 0){ + $this->rangedAttack($ai->entity, $ai->entity->target); + $this->attackCounter = 60; + } + } + + public function rangedAttack($selfEntity, $target){ + $d = [ + "x" => $selfEntity->x, + "y" => $selfEntity->y + 1.6, + "z" => $selfEntity->z, + "yaw" => $selfEntity->yaw, + "pitch" => $selfEntity->pitch + ]; + /** + * @var Arrow $arrow + */ + $arrow = $this->server->api->entity->add($selfEntity->level, ENTITY_OBJECT, OBJECT_ARROW, $d); + $arrow->shotByEntity = true; + $arrow->shooterEID = $selfEntity->eid; + $posY = ($target->y + $target->getEyeHeight() - 0.1); + $diffX = $target->x - $selfEntity->x; + $diffY = ($target->boundingBox->minY + ($target->height / 3)) - $posY; + $diffZ = $target->z - $selfEntity->z; + $v12 = sqrt($diffX * $diffX + $diffZ * $diffZ); + //if($v12 >= 1.0e-7){ + $yaw = ((atan2($diffZ, $diffX) * 180) / M_PI) - 90; + $pitch = -((atan2($diffY, $v12) * 180) / M_PI); + $v16 = $diffX / $v12; + $v18 = $diffZ / $v12; + $arrow->x = $selfEntity->x + $v16; + $arrow->y = $posY; + $arrow->z = $selfEntity->z + $v18; + $arrow->yaw = $yaw; + $arrow->pitch = $pitch; + $v20 = $v12 * 0.2; + $arrow->shoot($diffX, $diffY + $v20, $diffZ, 1.6, 12); + $this->server->api->entity->spawnToAll($arrow); + //} + } + + + public function isTargetValid(EntityAI $ai){ + $e = $ai->entity; + if($e->target instanceof Entity && !$e->target->closed){ + $t = $e->target; + $xDiff = ($t->x - $e->x); + $yDiff = ($t->y - $e->y); + $zDiff = ($t->z - $e->z); + return ($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= $this->rangeSquared; + } + return false; + } + + public function tryTargeting(EntityAI $ai){ + $e = $ai->entity; + if($e->target instanceof Entity){ + $t = $e->target; + $xDiff = ($t->x - $e->x); + $yDiff = ($t->y - $e->y); + $zDiff = ($t->z - $e->z); + if(($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff) <= $this->rangeSquared){ + return true; + } + } + $bestTargetDistance = INF; + $closestTarget = null; + foreach($e->level->players as $p){ + if($p->spawned){ + $pt = $p->entity; + $xDiff = $pt->x - $e->x; + $yDiff = $pt->y - $e->y; + $zDiff = $pt->z - $e->z; + $d = ($xDiff*$xDiff + $yDiff*$yDiff + $zDiff*$zDiff); + if($d <= $this->rangeSquared){ + if($bestTargetDistance >= $d){ + $closestTarget = $pt; + $bestTargetDistance = $d; + } + } + } + } + + if($closestTarget != null){ + $e->target = $closestTarget; //TODO dont save entity object ? + return true; + } + return false; + } + + + public function canBeExecuted(EntityAI $ai) + { + return $this->tryTargeting($ai); + } + +} + diff --git a/src/entity/monster/Skeleton.php b/src/entity/monster/Skeleton.php index 8b275661..5d90b4d3 100644 --- a/src/entity/monster/Skeleton.php +++ b/src/entity/monster/Skeleton.php @@ -8,11 +8,11 @@ class Skeleton extends Monster{ $this->setName("Skeleton"); $this->ai->removeTask("TaskAttackPlayer"); $this->setSpeed(0.25); - //$this->ai->addTask(new TaskDestroyServerPerformance()); $this->ai->addTask(new TaskRandomWalk(1.0)); $this->ai->addTask(new TaskLookAround()); $this->ai->addTask(new TaskSwimming()); + $this->ai->addTask(new TaskRangedAttack(1.0, 16)); } public function getAttackDamage(){