From 03767348334dbdf6c88784f762e167ad3f55b748 Mon Sep 17 00:00:00 2001 From: Daniel W <39805490+weluvgoatz@users.noreply.github.com> Date: Fri, 28 Jun 2024 21:55:20 -0700 Subject: [PATCH] Yeti snowball changes [read desc] - No more propagation of movement - Don't break if merging with upwards spikes. This is for some levels. Only break on downwards spikes if they fall hard on them. --- src/object/bigsnowball.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/object/bigsnowball.cpp b/src/object/bigsnowball.cpp index 17b7f4701dc..3f8239b8ebf 100644 --- a/src/object/bigsnowball.cpp +++ b/src/object/bigsnowball.cpp @@ -111,7 +111,9 @@ BigSnowball::update(float dt_sec) } } - if (!Sector::get().is_free_of_tiles(get_bbox().grown(-6.f), false, Tile::HURTS)) { + Rectf spikebox = get_bbox().grown(-6.f); + spikebox.set_bottom(get_bbox().get_bottom() - (m_physic.get_velocity_y() > 300.f ? 6.f : 40.f)); + if (!Sector::get().is_free_of_tiles(spikebox, false, Tile::HURTS)) { spawn_particles(); } @@ -120,7 +122,7 @@ BigSnowball::update(float dt_sec) Vector movement = m_physic.get_movement(dt_sec) * Vector(in_water ? 0.4f : 1.f, in_water ? 0.6f : 1.f); m_sprite->set_angle(m_sprite->get_angle() + movement.x * 3.141592653898f / 2.f); m_col.set_movement(movement); - m_col.propagate_movement(movement); + //m_col.propagate_movement(movement); } HitResponse