mirror of
https://github.com/oldminecraftcommunity/NostalgiaCore.git
synced 2026-11-22 20:49:43 +00:00
movement tweaks
This commit is contained in:
parent
efca0f8398
commit
90d1865cb1
4 changed files with 18 additions and 9 deletions
|
|
@ -22,6 +22,7 @@ abstract class Animal extends Creature implements Ageable, Breedable{
|
||||||
public function harm($dmg, $cause = "generic", $force = false){
|
public function harm($dmg, $cause = "generic", $force = false){
|
||||||
$ret = parent::harm($dmg, $cause, $force);
|
$ret = parent::harm($dmg, $cause, $force);
|
||||||
$this->inPanic |= ($ret && is_numeric($cause));
|
$this->inPanic |= ($ret && is_numeric($cause));
|
||||||
|
$this->inLove = false;
|
||||||
return $ret;
|
return $ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -32,7 +33,7 @@ abstract class Animal extends Creature implements Ageable, Breedable{
|
||||||
public function breed(){
|
public function breed(){
|
||||||
$c = $this->spawnChild();
|
$c = $this->spawnChild();
|
||||||
if($this->server->dhandle("entity.animal.breed", ["parent" => $this, "child" => $c]) !== false){
|
if($this->server->dhandle("entity.animal.breed", ["parent" => $this, "child" => $c]) !== false){
|
||||||
$c->parent = &$this;
|
$c->parent = $this;
|
||||||
$this->server->api->entity->spawnToAll($c);
|
$this->server->api->entity->spawnToAll($c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ abstract class Creature extends Living{
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getSpeedModifer(){
|
public function getSpeedModifer(){
|
||||||
return $this->speedModifer * ($this->inPanic ? 1.0 : 0.7);
|
return $this->speedModifer * ($this->inPanic ? 1.5 : 1.0);
|
||||||
}
|
}
|
||||||
public function getArmorValue(){
|
public function getArmorValue(){
|
||||||
return 2;
|
return 2;
|
||||||
|
|
|
||||||
|
|
@ -579,7 +579,7 @@ class Entity extends Position
|
||||||
for($z = $z0; $z < $z1; ++$z){
|
for($z = $z0; $z < $z1; ++$z){
|
||||||
$pos = new Vector3($x, $y, $z);
|
$pos = new Vector3($x, $y, $z);
|
||||||
$b = $this->level->getBlock($pos);
|
$b = $this->level->getBlock($pos);
|
||||||
if(($b->y == ($y1 - 1) && $b->getID() === WATER) || $b->getID() === STILL_WATER){
|
if($b->y == ($y1 - 1) && ($b->getID() === WATER || $b->getID() === STILL_WATER)){
|
||||||
$water = true;
|
$water = true;
|
||||||
}
|
}
|
||||||
if($b != false && $b->isSolid){
|
if($b != false && $b->isSolid){
|
||||||
|
|
@ -603,6 +603,15 @@ class Entity extends Position
|
||||||
$horizontalMultiplyFactor = $b->slipperiness * 0.91;
|
$horizontalMultiplyFactor = $b->slipperiness * 0.91;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if($this->inWater){
|
||||||
|
$this->speedX *= 0.8;
|
||||||
|
$this->speedY *= 0.8;
|
||||||
|
$this->speedZ *= 0.8;
|
||||||
|
}else{
|
||||||
|
$this->speedX *= $horizontalMultiplyFactor;
|
||||||
|
$this->speedY *= 0.98;
|
||||||
|
$this->speedZ *= $horizontalMultiplyFactor;
|
||||||
|
}
|
||||||
if($this->speedX != 0){
|
if($this->speedX != 0){
|
||||||
$this->x += $this->speedX;
|
$this->x += $this->speedX;
|
||||||
$update = true;
|
$update = true;
|
||||||
|
|
@ -639,9 +648,10 @@ class Entity extends Position
|
||||||
$update = true;
|
$update = true;
|
||||||
}
|
}
|
||||||
$this->onGround = $support;
|
$this->onGround = $support;
|
||||||
|
|
||||||
|
|
||||||
if($this->hasGravity){
|
if($this->hasGravity){
|
||||||
$this->speedY -= ($this->class === ENTITY_FALLING) ? 0.04 : ($this->class === ENTITY_ITEM ? 0.06 : 0.08); // TODO: replace with $gravity
|
$this->speedY -= $this->inWater ? 0.02 : (($this->class === ENTITY_FALLING) ? 0.04 : ($this->class === ENTITY_ITEM ? 0.06 : 0.08)); // TODO: replace with $gravity
|
||||||
$update = true;
|
$update = true;
|
||||||
} elseif($this->lastX != $this->x || $this->lastZ != $this->z || $this->lastY != $this->z){
|
} elseif($this->lastX != $this->x || $this->lastZ != $this->z || $this->lastY != $this->z){
|
||||||
// $this->speedX = 0;
|
// $this->speedX = 0;
|
||||||
|
|
@ -659,9 +669,7 @@ class Entity extends Position
|
||||||
$this->server->api->handle("entity.motion", $this);
|
$this->server->api->handle("entity.motion", $this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$this->speedX *= $horizontalMultiplyFactor;
|
|
||||||
$this->speedY *= 0.98;
|
|
||||||
$this->speedZ *= $horizontalMultiplyFactor;
|
|
||||||
} elseif($this->player instanceof Player){
|
} elseif($this->player instanceof Player){
|
||||||
if($isFlying === true and ($this->player->gamemode & 0x01) === 0x00){
|
if($isFlying === true and ($this->player->gamemode & 0x01) === 0x00){
|
||||||
if($this->fallY === false or $this->fallStart === false){
|
if($this->fallY === false or $this->fallStart === false){
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ class TaskPanic extends TaskBase
|
||||||
protected $randX = 2, $randZ = 2;
|
protected $randX = 2, $randZ = 2;
|
||||||
public function onStart(EntityAI $ai)
|
public function onStart(EntityAI $ai)
|
||||||
{
|
{
|
||||||
$this->selfCounter = mt_rand(60, 120);
|
$this->selfCounter = 60;
|
||||||
$this->regenerateRandXZ();
|
$this->regenerateRandXZ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue