Skip to content

Feature: Add bridge deck overlays #220

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

Merged
zephyris merged 1 commit into from
Dec 2, 2025
Merged

Feature: Add bridge deck overlays #220

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions baseset/nml/extra/extra-bridge-decks.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
// Bridge decks for overlay on NewGRF bridges
if (climate != CLIMATE_TOYLAND) {
replacenew bridge_decks_spr0(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_rail_8bpp.png", 0) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_spr0, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_rail_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_spr0, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_rail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_spr0, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_rail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_spr6(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_monorail_8bpp.png", 6) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_spr6, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_monorail_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_spr6, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_monorail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_spr6, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_monorail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_spr12(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_maglev_8bpp.png", 12) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_spr12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_maglev_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_spr12, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_maglev_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_spr12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_maglev_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_spr18(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_road_8bpp.png", 18) { template_bridgedeckoverlay_road(0, 0, 1) }
#ez alternative_sprites(bridge_decks_spr18, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_road_8bpp.png") { template_bridgedeckoverlay_road(0, 0, 4) }
#32 alternative_sprites(bridge_decks_spr18, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_road_bt32bpp.png") { template_bridgedeckoverlay_road(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_spr18, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_road_bt32bpp.png") { template_bridgedeckoverlay_road(0, 0, 4) }
}
if (climate == CLIMATE_TOYLAND) {
replacenew bridge_decks_toyland_spr0(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_rail_8bpp.png", 0) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_toyland_spr0, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_rail_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_toyland_spr0, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_rail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_toyland_spr0, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_rail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_toyland_spr6(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_monorail_8bpp.png", 6) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_toyland_spr6, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_monorail_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_toyland_spr6, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_monorail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_toyland_spr6, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_monorail_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_toyland_spr12(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_maglev_8bpp.png", 12) { template_bridgedeckoverlay_general(0, 0, 1) }
#ez alternative_sprites(bridge_decks_toyland_spr12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_maglev_8bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
#32 alternative_sprites(bridge_decks_toyland_spr12, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_maglev_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_toyland_spr12, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_maglev_bt32bpp.png") { template_bridgedeckoverlay_general(0, 0, 4) }
replacenew bridge_decks_toyland_spr18(BRIDGE_DECKS, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_road_8bpp.png", 18) { template_bridgedeckoverlay_road(0, 0, 1) }
#ez alternative_sprites(bridge_decks_toyland_spr18, ZOOM_LEVEL_IN_4X, BIT_DEPTH_8BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_road_8bpp.png") { template_bridgedeckoverlay_road(0, 0, 4) }
#32 alternative_sprites(bridge_decks_toyland_spr18, ZOOM_LEVEL_NORMAL, BIT_DEPTH_32BPP, "../graphics/bridges/64/pygen/ramps_deckonly_toyland_road_bt32bpp.png") { template_bridgedeckoverlay_road(0, 0, 1) }
#32 #ez alternative_sprites(bridge_decks_toyland_spr18, ZOOM_LEVEL_IN_4X, BIT_DEPTH_32BPP, "../graphics/bridges/256/pygen/ramps_deckonly_toyland_road_bt32bpp.png") { template_bridgedeckoverlay_road(0, 0, 4) }
}
1 change: 1 addition & 0 deletions baseset/ogfx2e_extra.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include "nml/extra/extra-tram-tracks.pnml"
#include "nml/extra/extra-road-waypoints.pnml"
#include "nml/extra/extra-overlay-rocks.pnml"
#include "nml/extra/extra-bridge-decks.pnml"

// OpenTTD-specific additional sprite sets
#include "nml/extra/extra-openttd-airport.pnml"
Expand Down
3 changes: 3 additions & 0 deletions graphics/bridges/256/bridgeramps_deckonly_32bpp.pdn
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/bridges/256/bridgeramps_deckonly_32bpp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions graphics/bridges/64/bridgeramps_deckonly_32bpp.pdn
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions graphics/bridges/64/bridgeramps_deckonly_32bpp.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions graphics/bridges/bridge_infrastructureoverlay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,14 @@ def infrastructure_bridge_infrastructureoverlay(scale, mode, base_path=".", verb
"ramps_general": "bridgeramps_general_32bpp.png",
"ramps_norecolour": "bridgeramps_norecolour_32bpp.png",
"ramps_wood": "bridgeramps_wood_32bpp.png",
"ramps_deckonly": "bridgeramps_deckonly_32bpp.png",
}
elif mode == "roadramps_toyland" or mode == "railramps_toyland":
bridge_list = {
"ramps_general_toyland": "bridgeramps_general_toyland_32bpp.png",
"ramps_norecolour_toyland": "bridgeramps_norecolour_32bpp.png",
"ramps_wood_toyland": "bridgeramps_wood_toyland_32bpp.png",
"ramps_deckonly_toyland": "bridgeramps_deckonly_32bpp.png",
}
bridgemask = "bridgeramps_deckmask.png"
composite_over = False
Expand Down
21 changes: 21 additions & 0 deletions templates/zoom-sensitive.pnml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,27 @@ template template_bridgeramps_wood(x, y, z) {
[ 1*z+x*z, 1*z+y*z, 64*z, 47*z-1, -31*z, -24*z ]
}

// Template bridges: extra deck overlays
template template_bridgedeckoverlay_general(x, y, z) {
[ 1*z+x*z, 1*z+y*z, 64*z, 47*z-1, -31*z, -16*z ]
[ 131*z+x*z, 1*z+y*z, 64*z, 47*z-1, -31*z, -16*z ]

[ 261*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 456*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 326*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 391*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
}

template template_bridgedeckoverlay_road(x, y, z) {
[ 131*z+x*z, 1*z+y*z, 64*z, 47*z-1, -31*z, -16*z ]
[ 1*z+x*z, 1*z+y*z, 64*z, 47*z-1, -31*z, -16*z ]

[ 261*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 456*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 326*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
[ 391*z+x*z, 1*z+y*z, 64*z, 55*z-1, -31*z, -24*z ]
}

// Template bridges: simple/core bridges
template template_bridge_single_rear(x, y, z) {
[ 1*z+x*z, 1*z+y*z, 64*z, 128*z-1, -31*z, -84*z ]
Expand Down