Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: TU19 (Dec 2014) Features & Content (#155)

Browse Source 
* 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:
daoge
2026-03-03 03:04:10 +08:00
committed by GitHub
parent 84c31a2331
commit b3feddfef3
2069 changed files with 264842 additions and 139522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Minecraft.World/Squid.cpp
View File

@@ -1,17 +1,16 @@
using namespace std;
#include "stdafx.h"
#include "com.mojang.nbt.h"
#include "net.minecraft.world.level.tile.h"
#include "net.minecraft.world.phys.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.item.h"
#include "net.minecraft.world.entity.h"
#include "net.minecraft.world.entity.ai.attributes.h"
#include "net.minecraft.world.entity.monster.h"
#include "SharedConstants.h"
#include "Squid.h"
#include "..\Minecraft.Client\Textures.h"
void Squid::_init()
{
xBodyRot = xBodyRotO = 0.0f;
@@ -32,19 +31,19 @@ Squid::Squid(Level *level) : WaterAnimal( 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
this->defineSynchedData();
// 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();
registerAttributes();
setHealth(getMaxHealth());
_init();
this->textureIdx = TN_MOB_SQUID; // 4J - was L"/mob/squid.png";
this->setSize(0.95f, 0.95f);
tentacleSpeed = 1 / (random->nextFloat() + 1) * 0.2f;
}
int Squid::getMaxHealth()
void Squid::registerAttributes()
{
return 10;
WaterAnimal::registerAttributes();
getAttribute(SharedMonsterAttributes::MAX_HEALTH)->setBaseValue(10);
}
int Squid::getAmbientSound()
@@ -72,6 +71,11 @@ int Squid::getDeathLoot()
return 0;
}
bool Squid::makeStepSound()
{
return false;
}
void Squid::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel)
{
int count = random->nextInt(3 + playerBonusLevel) + 1;
@@ -136,10 +140,10 @@ void Squid::aiStep()
double horizontalMovement = sqrt(xd * xd + zd * zd);
yBodyRot += ((-(float) atan2(this->xd, this->zd) * 180 / PI) - yBodyRot) * 0.1f;
yBodyRot += ((-(float) atan2(xd, zd) * 180 / PI) - yBodyRot) * 0.1f;
yRot = yBodyRot;
zBodyRot = zBodyRot + (float) PI * rotateSpeed * 1.5f;
xBodyRot += ((-(float) atan2(horizontalMovement, this->yd) * 180 / PI) - xBodyRot) * 0.1f;
xBodyRot += ((-(float) atan2(horizontalMovement, yd) * 180 / PI) - xBodyRot) * 0.1f;
}
else
{