mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-09-27 12:40:48 +00:00
chore: format Minecraft.World
This commit is contained in:
@@ -9,76 +9,78 @@
|
||||
#include "../MobCategory.h"
|
||||
#include "../../Util/AABB.h"
|
||||
|
||||
MushroomCow::MushroomCow(Level* level) : Cow(level) {
|
||||
// 4J Stu - This function call had to be moved here from the Entity ctor to
|
||||
// ensure that the derived version of the function is called
|
||||
health = getMaxHealth();
|
||||
|
||||
|
||||
MushroomCow::MushroomCow(Level *level) : Cow(level)
|
||||
{
|
||||
// 4J Stu - This function call had to be moved here from the Entity ctor to ensure that the derived version of the function is called
|
||||
health = getMaxHealth();
|
||||
|
||||
this->textureIdx = TN_MOB_RED_COW;// 4J was "/mob/redcow.png";
|
||||
this->setSize(0.9f, 1.3f);
|
||||
this->textureIdx = TN_MOB_RED_COW; // 4J was "/mob/redcow.png";
|
||||
this->setSize(0.9f, 1.3f);
|
||||
}
|
||||
|
||||
bool MushroomCow::interact(std::shared_ptr<Player> player)
|
||||
{
|
||||
std::shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
if (item != NULL && item->id == Item::bowl_Id && getAge() >= 0)
|
||||
{
|
||||
if (item->count == 1)
|
||||
{
|
||||
player->inventory->setItem(player->inventory->selected, std::shared_ptr<ItemInstance>( new ItemInstance(Item::mushroomStew) ) );
|
||||
return true;
|
||||
}
|
||||
bool MushroomCow::interact(std::shared_ptr<Player> player) {
|
||||
std::shared_ptr<ItemInstance> item = player->inventory->getSelected();
|
||||
if (item != NULL && item->id == Item::bowl_Id && getAge() >= 0) {
|
||||
if (item->count == 1) {
|
||||
player->inventory->setItem(
|
||||
player->inventory->selected,
|
||||
std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::mushroomStew)));
|
||||
return true;
|
||||
}
|
||||
|
||||
if (player->inventory->add(std::shared_ptr<ItemInstance>(new ItemInstance(Item::mushroomStew))) && !player->abilities.instabuild)
|
||||
{
|
||||
player->inventory->removeItem(player->inventory->selected, 1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (item != NULL && item->id == Item::shears_Id && getAge() >= 0)
|
||||
{
|
||||
remove();
|
||||
level->addParticle(eParticleType_largeexplode, x, y + bbHeight / 2, z, 0, 0, 0);
|
||||
if(!level->isClientSide)
|
||||
{
|
||||
// 4J Stu - We don't need to check spawn limits when adding the new cow, as we are removing the MushroomCow
|
||||
remove();
|
||||
std::shared_ptr<Cow> cow = std::shared_ptr<Cow>( new Cow(level) );
|
||||
cow->moveTo(x, y, z, yRot, xRot);
|
||||
cow->setHealth(getHealth());
|
||||
cow->yBodyRot = yBodyRot;
|
||||
level->addEntity(cow);
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
level->addEntity( std::shared_ptr<ItemEntity>( new ItemEntity(level, x, y + bbHeight, z, std::shared_ptr<ItemInstance>( new ItemInstance(Tile::mushroom2))) ));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return Cow::interact(player);
|
||||
if (player->inventory->add(std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Item::mushroomStew))) &&
|
||||
!player->abilities.instabuild) {
|
||||
player->inventory->removeItem(player->inventory->selected, 1);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (item != NULL && item->id == Item::shears_Id && getAge() >= 0) {
|
||||
remove();
|
||||
level->addParticle(eParticleType_largeexplode, x, y + bbHeight / 2, z,
|
||||
0, 0, 0);
|
||||
if (!level->isClientSide) {
|
||||
// 4J Stu - We don't need to check spawn limits when adding the new
|
||||
// cow, as we are removing the MushroomCow
|
||||
remove();
|
||||
std::shared_ptr<Cow> cow = std::shared_ptr<Cow>(new Cow(level));
|
||||
cow->moveTo(x, y, z, yRot, xRot);
|
||||
cow->setHealth(getHealth());
|
||||
cow->yBodyRot = yBodyRot;
|
||||
level->addEntity(cow);
|
||||
for (int i = 0; i < 5; i++) {
|
||||
level->addEntity(std::shared_ptr<ItemEntity>(
|
||||
new ItemEntity(level, x, y + bbHeight, z,
|
||||
std::shared_ptr<ItemInstance>(
|
||||
new ItemInstance(Tile::mushroom2)))));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return Cow::interact(player);
|
||||
}
|
||||
|
||||
// 4J - added so that mushroom cows have more of a chance of spawning, they can now spawn on mycelium as well as grass - seems a bit odd that they don't already really
|
||||
bool MushroomCow::canSpawn()
|
||||
{
|
||||
int xt = Mth::floor(x);
|
||||
int yt = Mth::floor(bb->y0);
|
||||
int zt = Mth::floor(z);
|
||||
return ( level->getTile(xt, yt - 1, zt) == Tile::grass_Id || level->getTile(xt, yt - 1, zt) == Tile::mycel_Id ) && level->getDaytimeRawBrightness(xt, yt, zt) > 8 && PathfinderMob::canSpawn();
|
||||
// 4J - added so that mushroom cows have more of a chance of spawning, they can
|
||||
// now spawn on mycelium as well as grass - seems a bit odd that they don't
|
||||
// already really
|
||||
bool MushroomCow::canSpawn() {
|
||||
int xt = Mth::floor(x);
|
||||
int yt = Mth::floor(bb->y0);
|
||||
int zt = Mth::floor(z);
|
||||
return (level->getTile(xt, yt - 1, zt) == Tile::grass_Id ||
|
||||
level->getTile(xt, yt - 1, zt) == Tile::mycel_Id) &&
|
||||
level->getDaytimeRawBrightness(xt, yt, zt) > 8 &&
|
||||
PathfinderMob::canSpawn();
|
||||
}
|
||||
|
||||
std::shared_ptr<AgableMob> MushroomCow::getBreedOffspring(std::shared_ptr<AgableMob> target)
|
||||
{
|
||||
// 4J - added limit to number of animals that can be bred
|
||||
if( level->canCreateMore( GetType(), Level::eSpawnType_Breed) )
|
||||
{
|
||||
return std::shared_ptr<MushroomCow>( new MushroomCow(level) );
|
||||
}
|
||||
else
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
std::shared_ptr<AgableMob> MushroomCow::getBreedOffspring(
|
||||
std::shared_ptr<AgableMob> target) {
|
||||
// 4J - added limit to number of animals that can be bred
|
||||
if (level->canCreateMore(GetType(), Level::eSpawnType_Breed)) {
|
||||
return std::shared_ptr<MushroomCow>(new MushroomCow(level));
|
||||
} else {
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user