Skip to content

Fixes #3215: Ice isn't slippery for rocks #3226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes #3215: Ice isn't slippery for rocks #3226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
55c0583
Fix #3215: Ice isn't slippery for rocks
goncalof148 Mar 27, 2025
e77cd08
Fix different types of ice
goncalof148 Apr 10, 2025
789ecd9
This commit fixes what wasn't working before. There is no more jitter…
goncalof148 May 30, 2025
1143704
Fix non-ice friction
goncalof148 May 31, 2025
3d6d5bb
Fix identation
goncalof148 Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions data/images/tiles.strf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6304,17 +6304,17 @@
5230 5231 0 0 0 0 0 0 0
)
(attributes
257 257 257 257 257 17 17 17 17
257 257 257 257 257 17 17 17 17
257 257 257 257 257 17 17 17 17
257 257 257 257 257 17 17 17 17
257 257 0 257 257 0 0 17 17
257 257 257 257 257 0 0 17 17
257 257 257 257 257 0 0 0 0
257 257 257 257 257 0 0 0 0
257 257 257 0 0 0 0 0 0
257 257 257 0 0 0 0 0 0
257 257 0 0 0 0 0 0 0
257 257 257 257 257 273 273 273 273
257 257 257 257 257 273 273 273 273
257 257 257 257 257 273 273 273 273
257 257 257 257 257 273 273 273 273
257 257 0 257 257 0 0 273 273
257 257 257 257 257 0 0 273 273
257 257 257 257 257 0 0 0 0
257 257 257 257 257 0 0 0 0
257 257 257 0 0 0 0 0 0
257 257 257 0 0 0 0 0 0
257 257 0 0 0 0 0 0 0
)
(datas
0 0 0 0 0 18 34 32 16
Expand Down
2 changes: 1 addition & 1 deletion src/object/rock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ Rock::collision_solid(const CollisionHit& hit)

if (m_on_ground || (hit.bottom && m_on_ice)) {
// Full friction!
m_physic.set_velocity_x(m_physic.get_velocity_x() * (1.f - (GROUND_FRICTION * (m_on_ice ? 0.5f : 1.f))));
m_physic.set_velocity_x(m_physic.get_velocity_x() * (1.f - (GROUND_FRICTION * (m_on_ice ? 0.3f : 1.f))));
}
}

Expand Down
Loading