From dd4264998d9f0f81d621f741913fbfcd440367b1 Mon Sep 17 00:00:00 2001 From: GameHerobrine Date: Sun, 8 Jan 2023 02:07:45 +0300 Subject: [PATCH] jump test for pathfinder --- src/astarnavigator/TileNavigator.php | 8 +++---- .../providers/MCDiagonalProvider.php | 22 +++++++++++++++---- src/entity/Entity.php | 2 +- src/entity/Living.php | 5 ++--- src/entity/ai/MobController.php | 6 ++--- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/astarnavigator/TileNavigator.php b/src/astarnavigator/TileNavigator.php index 55f70d94..fb45bd05 100644 --- a/src/astarnavigator/TileNavigator.php +++ b/src/astarnavigator/TileNavigator.php @@ -58,10 +58,10 @@ class TileNavigator implements ITileNavigator } $visited[(string)$neighbor] = $neighbor; - if ($this->blockedProvider->isBlocked($neighbor)) - { - continue; - } + //if ($this->blockedProvider->isBlocked($neighbor)) shouldnt be neccessary now + //{ + // continue; + //} $distbetweenCost = $this->distanceAlgorithm->calculate($current, $neighbor); $tentativeG = $gScore[(string) $current] + $distbetweenCost; $tentativeF = $distbetweenCost + $this->heuristicAlgorithm->calculate($neighbor, $to); diff --git a/src/astarnavigator/providers/MCDiagonalProvider.php b/src/astarnavigator/providers/MCDiagonalProvider.php index 3fa5aeb2..febb5b63 100644 --- a/src/astarnavigator/providers/MCDiagonalProvider.php +++ b/src/astarnavigator/providers/MCDiagonalProvider.php @@ -2,14 +2,28 @@ class MCDiagonalProvider implements INeighborProvider { - private static $neighbors = array([ 0, 0, -1 ], [ 1, 0, 0 ], [ 0, 0, 1 ], [ -1, 0, 0 ], [ -1, 0, -1 ], [ 1, 0, -1 ], [ 1, 0, 1 ], [ -1, 0, 1 ]); + private static $neighbors = array([ 0, 0, -1 ], [ 1, 0, 0 ], [ 0, 0, 1 ], [ -1, 0, 0 ]); + private static $jumpOffset = [0, 1, 0]; + private static $moveDownOffset = [0, -1, 0]; public function getNeighbors(PathTile $tile) { if($tile instanceof PathTileXYZ){ - return array_map(function($offset) use($tile){ - return $tile->addOffset($offset); - }, MCDiagonalProvider::$neighbors); + $pnts = []; + foreach(MCDiagonalProvider::$neighbors as $offset){ + $pnt = $tile->addOffset($offset); + if(!$tile->level->getBlockWithoutVector($pnt->x, $pnt->y, $pnt->z)->isSolid){ + if(!$tile->level->getBlockWithoutVector($pnt->x, $pnt->y - 1, $pnt->z)->isSolid){ + --$pnt->y; + } + $pnts[] = $pnt; + }else{ + if(!$tile->level->getBlockWithoutVector($pnt->x, $pnt->y + 1, $pnt->z)->isSolid){ + $pnts[] = $pnt->addOffset(self::$jumpOffset); + } + } + } + return $pnts; } return []; } diff --git a/src/entity/Entity.php b/src/entity/Entity.php index 2126cf9c..908b6b5e 100644 --- a/src/entity/Entity.php +++ b/src/entity/Entity.php @@ -1368,7 +1368,7 @@ class Entity extends Position public function moveEntityWithOffset($oX, $oY, $oZ) { $oX = $oX === 0 ? $this->speedX : $this->getSpeedModifer() * $oX * $this->getSpeed(); - $oY = $oY === 0 ? $this->speedY : $this->getSpeedModifer() * $oY * $this->getSpeed(); + $oY = $oY <= 0 ? $this->speedY : (0.5); $oZ = $oZ === 0 ? $this->speedZ : $this->getSpeedModifer() * $oZ * $this->getSpeed(); $this->setVelocity($oX, $oY, $oZ); } diff --git a/src/entity/Living.php b/src/entity/Living.php index cc9f1edf..352b60bb 100644 --- a/src/entity/Living.php +++ b/src/entity/Living.php @@ -7,7 +7,7 @@ abstract class Living extends Entity implements Damageable, Pathfindable{ public function __construct(Level $level, $eid, $class, $type = 0, $data = array()){ $this->target = false; $this->ai = new EntityAI($this); - $this->pathFinder = new TileNavigator(new MCBlockedProvider(), new MCDiagonalProvider(), new ManhattanHeuristic3D(), new ManhattanHeuristic3D()); + $this->pathFinder = new TileNavigator(new MCBlockedProvider(), new MCDiagonalProvider(), new Pythagoras3D(), new ManhattanHeuristic3D()); $this->pathFollower = new PathFollower($this); parent::__construct($level, $eid, $class, $type, $data); $this->canBeAttacked = true; @@ -30,10 +30,9 @@ abstract class Living extends Entity implements Damageable, Pathfindable{ if(Entity::$allowedAI && $this->idleTime <= 0) { $this->ai->updateTasks(); } - if($this->onGround){ //if(!$this->hasPath() && $this->pathFinder instanceof ITileNavigator){ // mt_rand(0, 120) === 0){ - // $this->path = $this->pathFinder->navigate(new PathTileXYZ($this->x, $this->y, $this->z, $this->level), new PathTileXYZ($this->x + mt_rand(-10, 10), $this->y, $this->z + mt_rand(-10, 10), $this->level), 10); + // $this->path = $this->pathFinder->navigate(new PathTileXYZ($this->x, $this->y, $this->z, $this->level), new PathTileXYZ($this->x + mt_rand(-10, 10), $this->y + mt_rand(-1, 1), $this->z + mt_rand(-10, 10), $this->level), 10); //} $this->pathFollower->followPath(); } diff --git a/src/entity/ai/MobController.php b/src/entity/ai/MobController.php index 364960bf..9b857112 100644 --- a/src/entity/ai/MobController.php +++ b/src/entity/ai/MobController.php @@ -33,14 +33,14 @@ class MobController $dx = $d->x; $dz = $d->z; - $tan = $dz == 0 ? ($dx < 0 ? 180 : 0) : (90 - rad2deg($dx / $dz)); - $thetaOffset = $dz <= 0 ? 90 : 270; + $tan = $dz == 0 ? ($dx < 0 ? 180 : 0) : (90 - rad2deg(atan($dx / $dz))); + $thetaOffset = $dz < 0 ? 90 : 270; $this->entity->yaw = $this->entity->headYaw = ($thetaOffset + $tan); } public function lookOffset($x, $y, $z, $pitch = true){ $tan = $z == 0 ? ($x < 0 ? 180 : 0) : (90 - rad2deg(atan($x / $z))); /*arctan(infinity) = pi/2 = (90deg) - 90 = 0*/ - $thetaOffset = $z <= 0 ? 90 : 270; + $thetaOffset = $z < 0 ? 90 : 270; $calcYaw = $tan + $thetaOffset; $this->entity->headYaw = $calcYaw; if($pitch){