Misc patches

This commit is contained in:
Er2
2024-03-28 14:39:40 +03:00
parent c9b4449bac
commit b8c01e085f
119 changed files with 1414 additions and 794 deletions

View File

@@ -28,7 +28,7 @@ void ItemEntity::_init(ItemInstance* itemInstance, float x, float y, float z)
{
_init(itemInstance);
field_C8 = RENDER_ITEM;
m_renderType = RENDER_ITEM;
setPos(x, y, z);
m_yaw = 360.0f * Mth::random();
@@ -103,7 +103,7 @@ void ItemEntity::tick()
dragFactor = 0.588f;
TileID tile = m_pLevel->getTile(Mth::floor(m_pos.x), Mth::floor(m_hitbox.min.y) - 1, Mth::floor(m_pos.z));
if (tile > 0)
dragFactor = Tile::tiles[tile]->field_30 * 0.98f;
dragFactor = Tile::tiles[tile]->m_acceleration * 0.98f;
}
m_vel.x *= dragFactor;
@@ -149,6 +149,7 @@ void ItemEntity::checkInTile(float x, float y, float z)
if (!solidYP && 1.0f - ydiff < mindist) mindist = 1.0f - ydiff, mindir = 3;
if (!solidZN && zdiff < mindist) mindist = zdiff, mindir = 4;
if (!solidZP && 1.0f - zdiff < mindist) mindist = 1.0f - zdiff, mindir = 5;
(void)mindist; // LMAO
// the -1 case will be handled accordingly
float force = 0.1f + 0.2f * sharedRandom.nextFloat();