0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve transitions between bridges and rails in same direction

Browse source
This commit is contained in:
Simon Forsyth 2012-02-14 22:47:33 +00:00
parent 288ffbce06
commit 59bb405b0c
1 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
data/core/terrain-graphics.cfg
View file

@ -49,36 +49,34 @@
# TRACK LAYOUT MUST STAY ON TOP
# they set flags that will be used by other macros later.
# they don't set any image by themselves.
{LAYOUT_TRACKS_F *^Bw\* *^Bw|* *^Bw/* overlay}
{LAYOUT_TRACKS_F *^Br\ *^Br| *^Br/ overlay}
{LAYOUT_TRACKS_STRAIGHT_F *^Bsb\ *^Bsb| *^Bsb/ overlay}
#{TRACK_TEST_FLAG (*^Br\,*^Br|,*^Br/) overlay-connect}
# basic images for the bridge
{TRACK_COMPLETE *^Bw\ *^Bw| *^Bw/ overlay bridge/wood}
{TRACK_COMPLETE *^Bw\r *^Bw|r *^Bw/r overlay bridge/wood-rotting}
# add transition bridges<->bridges wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (*^Bw|*,*^Bw/*,*^Bw/*) 100 -80 overlay bridge/wood-end}
# add dock-style ends to bridges ending in water
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (W*^,Ss^,Ai^) 100 -80 overlay bridge/wood-dock}
# add ramps where straight bridges end on land
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (!,C*,K*) 100 -80 overlay bridge/wood-end}
{LAYOUT_TRACKS_F *^Bw\* *^Bw|* *^Bw/* track_wood}
{LAYOUT_TRACKS_F *^Br\ *^Br| *^Br/ track_rail}
{LAYOUT_TRACKS_STRAIGHT_F *^Bsb\ *^Bsb| *^Bsb/ track_stone}
# Mine rail tracks
{TRACK_COMPLETE *^Br\ *^Br| *^Br/ overlay misc/rails}
{TRACK_COMPLETE *^Br\ *^Br| *^Br/ track_rail misc/rails}
# add transition rail<->rail wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*^Br/,*^Br\) *^Br| 100 -80 overlay misc/rails-switch-ns}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/) *^Br\ 100 -80 overlay misc/rails-switch-nwse}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br\) *^Br/ 100 -80 overlay misc/rails-switch-nesw}
{TRACK_BORDER_RESTRICTED_PLF (*^Br/,*^Br\) *^Br| 100 -80 track_rail misc/rails-switch-ns}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/) *^Br\ 100 -80 track_rail misc/rails-switch-nwse}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br\) *^Br/ 100 -80 track_rail misc/rails-switch-nesw}
#add transitions at rail end
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/,*^Br\) (!,C*,K*) 100 -80 overlay misc/rails-end}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * W* 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-dock}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * (C*,K*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*) * (C*,K*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-both}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*) * * 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-single}
{TRACK_COMPLETE *^Bsb\ *^Bsb| *^Bsb/ overlay bridge/stonebridge}
#{TRACK_TEST_FLAG (*^Bsb|,*^Bsb/,*^Bsb\) overlay-connected}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/,*^Br\) (!,C*,K*) 100 -80 track_rail misc/rails-end}
# basic images for the bridge
{TRACK_COMPLETE *^Bw\ *^Bw| *^Bw/ track_wood bridge/wood}
{TRACK_COMPLETE *^Bw\r *^Bw|r *^Bw/r track_wood bridge/wood-rotting}
# add transition bridges<->bridges wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (*^Bw|*,*^Bw/*,*^Bw/*) 100 -80 track_wood bridge/wood-end}
# add dock-style ends to bridges ending in water
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (W*^,Ss^,Ai^) 100 -80 track_wood bridge/wood-dock}
# add ramps where straight bridges end on land
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|*,*^Bw/*,*^Bw\*) (!,C*,K*) 100 -80 track_wood bridge/wood-end}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * W* 100 -80 track_stone IMAGE_SINGLE bridge/stonebridge-dock}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * (C*,K*) 100 -80 track_stone IMAGE_SINGLE bridge/stonebridge-small}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*) * (C*,K*) 100 -80 track_stone IMAGE_SINGLE bridge/stonebridge-small-both}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*) * * 100 -80 track_stone IMAGE_SINGLE bridge/stonebridge-small-single}
{TRACK_COMPLETE *^Bsb\ *^Bsb| *^Bsb/ track_stone bridge/stonebridge}
# Forests