feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -4,19 +4,20 @@
|
||||
#include "net.minecraft.world.entity.animal.h"
|
||||
#include "net.minecraft.world.level.h"
|
||||
#include "net.minecraft.world.phys.h"
|
||||
#include "BasicTypeContainers.h"
|
||||
#include "BreedGoal.h"
|
||||
#include "ExperienceOrb.h"
|
||||
|
||||
#include "GenericStats.h"
|
||||
|
||||
BreedGoal::BreedGoal(Animal *animal, float speed)
|
||||
BreedGoal::BreedGoal(Animal *animal, double speedModifier)
|
||||
{
|
||||
partner = weak_ptr<Animal>();
|
||||
loveTime = 0;
|
||||
|
||||
this->animal = animal;
|
||||
this->level = animal->level;
|
||||
this->speed = speed;
|
||||
this->speedModifier = speedModifier;
|
||||
setRequiredControlFlags(Control::MoveControlFlag | Control::LookControlFlag);
|
||||
}
|
||||
|
||||
@@ -41,26 +42,28 @@ void BreedGoal::stop()
|
||||
void BreedGoal::tick()
|
||||
{
|
||||
animal->getLookControl()->setLookAt(partner.lock(), 10, animal->getMaxHeadXRot());
|
||||
animal->getNavigation()->moveTo(partner.lock(), speed);
|
||||
animal->getNavigation()->moveTo(partner.lock(), speedModifier);
|
||||
++loveTime;
|
||||
if (loveTime == 20 * 3) breed();
|
||||
if (loveTime >= 20 * 3 && animal->distanceToSqr(partner.lock()) < 3*3) breed();
|
||||
}
|
||||
|
||||
shared_ptr<Animal> BreedGoal::getFreePartner()
|
||||
{
|
||||
float r = 8;
|
||||
vector<shared_ptr<Entity> > *others = level->getEntitiesOfClass(typeid(*animal), animal->bb->grow(r, r, r));
|
||||
double dist = Double::MAX_VALUE;
|
||||
shared_ptr<Animal> partner = nullptr;
|
||||
for(AUTO_VAR(it, others->begin()); it != others->end(); ++it)
|
||||
{
|
||||
shared_ptr<Animal> p = dynamic_pointer_cast<Animal>(*it);
|
||||
if (animal->canMate(p))
|
||||
if (animal->canMate(p) && animal->distanceToSqr(p) < dist)
|
||||
{
|
||||
delete others;
|
||||
return p;
|
||||
partner = p;
|
||||
dist = animal->distanceToSqr(p);
|
||||
}
|
||||
}
|
||||
delete others;
|
||||
return nullptr;
|
||||
return partner;
|
||||
}
|
||||
|
||||
void BreedGoal::breed()
|
||||
@@ -97,7 +100,7 @@ void BreedGoal::breed()
|
||||
partner.lock()->setAge(5 * 60 * 20);
|
||||
animal->resetLove();
|
||||
partner.lock()->resetLove();
|
||||
offspring->setAge(-20 * 60 * 20);
|
||||
offspring->setAge(AgableMob::BABY_START_AGE);
|
||||
offspring->moveTo(animal->x, animal->y, animal->z, 0, 0);
|
||||
offspring->setDespawnProtected();
|
||||
level->addEntity(offspring);
|
||||
|
||||
Reference in New Issue
Block a user