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.

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

Jump to bottom

Fix: Incorrect mask files for NE river slopes #11503

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Fix: Incorrect mask files for NE river slopes #11503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file modified media/baseset/orig_extra.grf
View file
Open in desktop
Binary file not shown.
32 changes: 16 additions & 16 deletions media/baseset/orig_extra/rivers/rapids.nfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
| sprites/rapids.png mask 90 10
-1 sprites/rapids.png 8bpp 170 10 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 10 64 23 -31 0 normal
| sprites/rapids.png mask 10 10
| sprites/rapids.png mask 170 10
-1 sprites/rapids.png 8bpp 250 10 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 10 64 39 -31 -8 normal
| sprites/rapids.png mask 250 10
Expand All @@ -28,7 +28,7 @@
| sprites/rapids.png mask 90 60
-1 sprites/rapids.png 8bpp 170 60 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 60 64 23 -31 0 normal
| sprites/rapids.png mask 10 60
| sprites/rapids.png mask 170 60
-1 sprites/rapids.png 8bpp 250 60 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 60 64 39 -31 -8 normal
| sprites/rapids.png mask 250 60
Expand All @@ -43,7 +43,7 @@
| sprites/rapids.png mask 90 110
-1 sprites/rapids.png 8bpp 170 110 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 110 64 23 -31 0 normal
| sprites/rapids.png mask 10 110
| sprites/rapids.png mask 170 110
-1 sprites/rapids.png 8bpp 250 110 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 110 64 39 -31 -8 normal
| sprites/rapids.png mask 250 110
Expand All @@ -58,7 +58,7 @@
| sprites/rapids.png mask 90 160
-1 sprites/rapids.png 8bpp 170 160 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 160 64 23 -31 0 normal
| sprites/rapids.png mask 10 160
| sprites/rapids.png mask 170 160
-1 sprites/rapids.png 8bpp 250 160 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 160 64 39 -31 -8 normal
| sprites/rapids.png mask 250 160
Expand All @@ -73,7 +73,7 @@
| sprites/rapids.png mask 90 210
-1 sprites/rapids.png 8bpp 170 210 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 210 64 23 -31 0 normal
| sprites/rapids.png mask 10 210
| sprites/rapids.png mask 170 210
-1 sprites/rapids.png 8bpp 250 210 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 210 64 39 -31 -8 normal
| sprites/rapids.png mask 250 210
Expand All @@ -88,7 +88,7 @@
| sprites/rapids.png mask 90 260
-1 sprites/rapids.png 8bpp 170 260 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 260 64 23 -31 0 normal
| sprites/rapids.png mask 10 260
| sprites/rapids.png mask 170 260
-1 sprites/rapids.png 8bpp 250 260 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 260 64 39 -31 -8 normal
| sprites/rapids.png mask 250 260
Expand All @@ -103,7 +103,7 @@
| sprites/rapids.png mask 90 310
-1 sprites/rapids.png 8bpp 170 310 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 310 64 23 -31 0 normal
| sprites/rapids.png mask 10 310
| sprites/rapids.png mask 170 310
-1 sprites/rapids.png 8bpp 250 310 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 310 64 39 -31 -8 normal
| sprites/rapids.png mask 250 310
Expand All @@ -118,7 +118,7 @@
| sprites/rapids.png mask 90 360
-1 sprites/rapids.png 8bpp 170 360 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 360 64 23 -31 0 normal
| sprites/rapids.png mask 10 360
| sprites/rapids.png mask 170 360
-1 sprites/rapids.png 8bpp 250 360 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 360 64 39 -31 -8 normal
| sprites/rapids.png mask 250 360
Expand All @@ -133,7 +133,7 @@
| sprites/rapids.png mask 90 410
-1 sprites/rapids.png 8bpp 170 410 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 410 64 23 -31 0 normal
| sprites/rapids.png mask 10 410
| sprites/rapids.png mask 170 410
-1 sprites/rapids.png 8bpp 250 410 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 410 64 39 -31 -8 normal
| sprites/rapids.png mask 250 410
Expand All @@ -148,7 +148,7 @@
| sprites/rapids.png mask 90 460
-1 sprites/rapids.png 8bpp 170 460 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 460 64 23 -31 0 normal
| sprites/rapids.png mask 10 460
| sprites/rapids.png mask 170 460
-1 sprites/rapids.png 8bpp 250 460 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 460 64 39 -31 -8 normal
| sprites/rapids.png mask 250 460
Expand All @@ -163,7 +163,7 @@
| sprites/rapids.png mask 90 510
-1 sprites/rapids.png 8bpp 170 510 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 510 64 23 -31 0 normal
| sprites/rapids.png mask 10 510
| sprites/rapids.png mask 170 510
-1 sprites/rapids.png 8bpp 250 510 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 510 64 39 -31 -8 normal
| sprites/rapids.png mask 250 510
Expand All @@ -178,7 +178,7 @@
| sprites/rapids.png mask 90 560
-1 sprites/rapids.png 8bpp 170 560 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 560 64 23 -31 0 normal
| sprites/rapids.png mask 10 560
| sprites/rapids.png mask 170 560
-1 sprites/rapids.png 8bpp 250 560 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 560 64 39 -31 -8 normal
| sprites/rapids.png mask 250 560
Expand All @@ -193,7 +193,7 @@
| sprites/rapids.png mask 90 610
-1 sprites/rapids.png 8bpp 170 610 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 610 64 23 -31 0 normal
| sprites/rapids.png mask 10 610
| sprites/rapids.png mask 170 610
-1 sprites/rapids.png 8bpp 250 610 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 610 64 39 -31 -8 normal
| sprites/rapids.png mask 250 610
Expand All @@ -208,7 +208,7 @@
| sprites/rapids.png mask 90 660
-1 sprites/rapids.png 8bpp 170 660 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 660 64 23 -31 0 normal
| sprites/rapids.png mask 10 660
| sprites/rapids.png mask 170 660
-1 sprites/rapids.png 8bpp 250 660 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 660 64 39 -31 -8 normal
| sprites/rapids.png mask 250 660
Expand All @@ -223,7 +223,7 @@
| sprites/rapids.png mask 90 710
-1 sprites/rapids.png 8bpp 170 710 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 710 64 23 -31 0 normal
| sprites/rapids.png mask 10 710
| sprites/rapids.png mask 170 710
-1 sprites/rapids.png 8bpp 250 710 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 710 64 39 -31 -8 normal
| sprites/rapids.png mask 250 710
Expand All @@ -238,7 +238,7 @@
| sprites/rapids.png mask 90 760
-1 sprites/rapids.png 8bpp 170 760 64 23 -31 0 normal
| sprites/rapids_shading.png 32bpp 170 760 64 23 -31 0 normal
| sprites/rapids.png mask 10 760
| sprites/rapids.png mask 170 760
-1 sprites/rapids.png 8bpp 250 760 64 39 -31 -8 normal
| sprites/rapids_shading.png 32bpp 250 760 64 39 -31 -8 normal
| sprites/rapids.png mask 250 760
Expand Down