Skip to content
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.

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

Fix: Add shading to river slopes #11491

Merged
merged 1 commit into from Nov 26, 2023

Conversation

zephyris
Copy link
Contributor

@zephyris zephyris commented Nov 25, 2023

Adds a 32bpp shading to the river rapids/slopes to make them more visible. Fixes #9031
slopeshadig

Motivation / Problem

Water slopes on rivers are not readily visible as sloped, making it confusing why ships cannot sail through them.

Description

This fix adds 32bpp sloped river water sprites to the orig_extra.grf. By using the 8bpp sprite as a mask, this adds shading to the slope while retaining the animation and 8bit style. Requires a bump of original graphics grfs to use container version 2.

Limitations

Does not work with 8bpp blitters.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, game_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@TrueBrain
Copy link
Member

This is very cool, and will really help me when playing with Rivers. Thank you for this :D

Adds a 32bpp shading to the river rapids/slopes to make them more visible. Requires a bump of original graphics grfs to use container version 2. Fixes OpenTTD#9031
@PeterN
Copy link
Member

PeterN commented Nov 26, 2023

Can't read sprites/rapids_shading.png

Existing bug I guess, the project needed to be reconfigured, it would not copy this file otherwise.

@PeterN
Copy link
Member

PeterN commented Nov 26, 2023

I think it's acceptable that it does not work on 8bpp -- that would require some changing the palette animation definitions to use otherwise unused palette entries, which could cause compatibility issues. Nothing is broken with 8bpp, you just need to use 32bpp to see the difference.

Whereas this solution already works (even if I'd forgotten I'd made it possible...!) and just needs the graphics.

@rubidium42 rubidium42 merged commit 2b92577 into OpenTTD:master Nov 26, 2023
20 checks passed
@zephyris zephyris deleted the river-slope-shading branch February 27, 2024 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rivers going uphill are nearly impossible to distinguish from flat river
4 participants