new track layout system, works for tracks, stonebridge, woodbridge,

...and allows easier plugin of images within a bridge structure. The
basic macros are here but all the random variations etc are not.

data/core/terrain-graphics.cfg

@@ -16,28 +16,40 @@
 # NOTE the terrain _off^_usr gets its definition from the code since it's
 # themable
 
+ # 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} 	 
 
- # Bridges must be on top because they set some flags depending on their orientation that might be used by other macros later
- {TRACK               *^Bw\ *^Bw| *^Bw/                   bridge/wood}
+ {TRACK_TEST_FLAG      (*^Br\,*^Br|,*^Br/)  overlay-connect} 	 
+
+
+ # basic images for the bridge
+ {TRACK_COMPLETE      *^Bw\ *^Bw| *^Bw/  overlay bridge/wood} 	 
  # add transition bridges<->bridges wherever images are missing 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*Bw|,*^Bw/,*^Bw\) (*^Bw|,*^Bw/,*^Bw/) bridge/wood-end} 	 
+ {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_RANDOM (*^Bw|,*^Bw/,*^Bw\) (W*^,Ss^,Ai^) bridge/wood-dock} 	 
+ {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_RANDOM (*^Bw|,*^Bw/,*^Bw\) (!,C*,K*,*^F*) bridge/wood-end} 	 
+ {TRACK_BORDER_RESTRICTED_PLF (*^Bw|,*^Bw/,*^Bw\) (!,C*,K*,*^F*) 100 -80 overlay bridge/wood-end} 	 
   	 
  # Mine rail tracks
- {TRACK              *^Br\ *^Br| *^Br/  misc/rails} 	 
+ {TRACK_COMPLETE              *^Br\ *^Br| *^Br/  overlay misc/rails} 	 
  # add transition rail<->rail wherever images are missing 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*^Br/,*^Br\) *^Br| misc/rails-switch-ns} 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*^Br|,*^Br/) *^Br\ misc/rails-switch-nwse} 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*^Br|,*^Br\) *^Br/ misc/rails-switch-nesw} 	 
+ {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} 	 
  #add transitions at rail end 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*^Br|,*^Br/,*^Br\) * misc/rails-end} 	 
+ {TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/,*^Br\) * 100 -80 overlay misc/rails-end} 	 
 
- #{TRACK              *^Bsb\ *^Bsb| *^Bsb/  test/test} 	 
- {TRACK              *^Bsb\ *^Bsb| *^Bsb/  bridge/stonebridge} 	 
- {TRACK_BORDER_RESTRICTED_RANDOM (*^Bsb|,*^Bsb/,*^Bsb\) (!,C*,K*,S*,W*,M*) bridge/stonebridge-end}
+ {TRACK_RESTRICTED_PLFB  (*^Bsb|,*^Bsb/,*^Bsb\) * * W* 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-dock}
+ {TRACK_RESTRICTED_PLFB  (*^Bsb|,*^Bsb/,*^Bsb\) * * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small}
+ {TRACK_SINGLE_PLFB  (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-both}
+ {TRACK_SINGLE_PLFB  (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * * 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}
 
 
 # Forests

data/core/terrain-graphics/internal-complex-tracks.cfg

@@ -1,90 +0,0 @@
-#textdomain wesnoth
-
-#define TRACK_CORNER_RANDOM_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM SUFFIX A1 A2 A3 A4 A5 A6 S0 S1 S2 S3 S4 S5
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_CORNER_PLF ({TERRAIN}) ({ADJACENT}) 100 {LAYER} {FLAG} {IMAGESTEM}   {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-#enddef
-
-#define TRACK_Y_RANDOM_LF TERRAIN ADJACENT1 ADJACENT2 LAYER FLAG IMAGESTEM SUFFIX A1 A2 A3 A4 A5 A6 S0 S1 S2 S3 S4 S5
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-    {TRACK_Y_PLF ({TERRAIN}) ({ADJACENT1}) ({ADJACENT2}) 100 {LAYER} {FLAG} {IMAGESTEM}   {SUFFIX} {A1} {A2} {A3} {A4} {A5} {A6} {S0} {S1} {S2} {S3} {S4} {S5}}
-#enddef
-
-
-
-#define TRACK_STRAIGHT_RANDOM_LF TERRAIN LAYER FLAG IMAGESTEM SUFFIX R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
-    {TRACK_STRAIGHT_PLF ({TERRAIN})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-    {TRACK_STRAIGHT_PLF ({TERRAIN}) 100 {LAYER} {FLAG} {IMAGESTEM}   {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-#enddef
-
-
-#define TRACK_BORDER_RESTRICTED_RANDOM_LF TERRAINLIST ADJACENT LAYER FLAG IMAGESTEM
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT})  9  {LAYER} {FLAG} {IMAGESTEM}11}
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 10  {LAYER} {FLAG} {IMAGESTEM}10}
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 11  {LAYER} {FLAG} {IMAGESTEM}9 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 12  {LAYER} {FLAG} {IMAGESTEM}8 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 14  {LAYER} {FLAG} {IMAGESTEM}7 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 16  {LAYER} {FLAG} {IMAGESTEM}6 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 20  {LAYER} {FLAG} {IMAGESTEM}5 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 25  {LAYER} {FLAG} {IMAGESTEM}4 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 33  {LAYER} {FLAG} {IMAGESTEM}3 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 50  {LAYER} {FLAG} {IMAGESTEM}2 }
-{TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 {LAYER} {FLAG} {IMAGESTEM}  }
-#enddef
-
-
-#define TRACK_ALONE_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM SUFFIX R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
-{TRACK_ALONE_PLF ({TERRAINLIST})  9  {LAYER} {FLAG} {IMAGESTEM}11 {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_ALONE_PLF ({TERRAINLIST}) 100 {LAYER} {FLAG} {IMAGESTEM}   {SUFFIX} {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-#enddef
-
-
-#define TRACK_DEADEND_RANDOM_LF TERRAINLIST LAYER FLAG IMAGESTEM R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
-{TRACK_DEADEND_PLF ({TERRAINLIST})  9  {LAYER} {FLAG} {IMAGESTEM}11 {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 10  {LAYER} {FLAG} {IMAGESTEM}10 {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 11  {LAYER} {FLAG} {IMAGESTEM}9  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 12  {LAYER} {FLAG} {IMAGESTEM}8  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 14  {LAYER} {FLAG} {IMAGESTEM}7  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 16  {LAYER} {FLAG} {IMAGESTEM}6  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 20  {LAYER} {FLAG} {IMAGESTEM}5  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 25  {LAYER} {FLAG} {IMAGESTEM}4  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 33  {LAYER} {FLAG} {IMAGESTEM}3  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 50  {LAYER} {FLAG} {IMAGESTEM}2  {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-{TRACK_DEADEND_PLF ({TERRAINLIST}) 100 {LAYER} {FLAG} {IMAGESTEM}   {R0} {R1} {R2} {R3} {R4} {R5} {S0} {S1} {S2} {S3} {S4} {S5} }
-#enddef

data/core/terrain-graphics/internal-tracks.cfg

@@ -1,16 +1,8 @@
 #textdomain wesnoth
-# macros for bridges/rails and anything overlayed that is path-like
-
-#define IMAGEC_LN LAYER NAME SUFFIX
-    [image]
-        layer={LAYER}
-	center=90,144
-        name={BUILD_IMAGE IMAGE_SINGLE {NAME} {SUFFIX}}
-    [/image]
-#enddef
-
-# this macro keeps colinear bridges connected, it does not add images
-#define TRACK_CONNECT_F TERRAINLIST FLAG R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
+###########################################
+#######   LAYOUT   ########################
+###########################################
+#define TRACK_CONNECT TERRAINLIST FLAG R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
     [terrain_graphics]
         map="
 ,  {S1}
@@ -31,49 +23,7 @@
     [/terrain_graphics]
 #enddef
 
-# this macro produces Y intersections
-#define TRACK_Y_PLF TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER FLAG IMAGESTEM SUFFIX R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
-    [terrain_graphics]
-        map="
-,  {S1}
-{S0},   {S2}
-,  1
-{S5},   {S3}
-,  {S4}"
-        [tile]
-	    #main track
-            pos=1
-            type={TERRAINLIST}
-            no_flag={FLAG},{FLAG}-connect-{R0}
-            set_flag={FLAG},{FLAG}-connect-{R1},{FLAG}-connect-{R5},{FLAG}-connect-{R3},{FLAG}-away-{R0}
-        [/tile]
-        [tile]
-	    #out track
-            pos=2
-            no_flag={FLAG}-connect-{R3},{FLAG}-connect-{R1}
-            set_flag={FLAG}-connect-{R2}
-            type={ADJACENT1}
-        [/tile]
-        [tile]
-	    #out track
-            pos=3
-            no_flag={FLAG}-connect-{R3},{FLAG}-connect-{R5}
-            set_flag={FLAG}-connect-{R4}
-            type={ADJACENT2}
-        [/tile]
-        [tile]
-	    #middle of both out track
-            pos=4
-            type=!,{TERRAINLIST}
-            set_flag={FLAG}-away-{R3}
-        [/tile]
-        probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} {SUFFIX}}
-    [/terrain_graphics]
-#enddef
-
-# this macro handles the normal corners
-#define TRACK_CORNER_PLF TERRAINLIST ADJACENT PROB LAYER FLAG IMAGESTEM SUFFIX R1 R2 R3 R4 R5 R6 S0 S1 S2 S3 S4 S5
+#define TRACK_AWAY TERRAINLIST ADJACENT FLAG R1 R2 R3 R4 R5 R6 S0 S1 S2 S3 S4 S5
     [terrain_graphics]
         map="
 ,  {S1}
@@ -86,14 +36,13 @@
             pos=1
             type={TERRAINLIST}
             no_flag={FLAG},{FLAG}-connect-{R4}
-            set_flag={FLAG},{FLAG}-connect-{R1},{FLAG}-connect-{R2},{FLAG}-away-{R4}
+            set_flag={FLAG}-away-{R4}
         [/tile]
         [tile]
             #exit side
             pos=2
             type={ADJACENT}
-            no_flag={FLAG}-connect-{R1},{FLAG}-connect-{R6},{FLAG}-away-{R3}
-            set_flag={FLAG}-connect-{R3}
+            no_flag={FLAG}-away-{R3}
         [/tile]
         [tile]
 	    #side where we should have exited, but don't
@@ -101,13 +50,10 @@
             set_flag={FLAG}-away-{R1}
 	    no_flag={FLAG}-connect-{R1}
         [/tile]
-        probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} {SUFFIX}}
     [/terrain_graphics]
 #enddef
 
-#mark the bridges that finish in a dead end
-#define TRACK_DEADEND_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
+#define TRACK_CONNECT_ALL TERRAINLIST FLAG R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
     [terrain_graphics]
         map="
 ,  {S1}
@@ -115,20 +61,633 @@
 ,  1
 {S5},   {S3}
 ,  {S4}"
+        [tile]
+            #exit side
+            pos=2
+            no_flag={FLAG}-away-{R3}
+        [/tile]
         [tile]
 	    #main bridge
 	    pos=1
             type={TERRAINLIST}
-	    no_flag={FLAG},{FLAG}-connect-{R0}
-            set_flag={FLAG},{FLAG}-connect-{R0}
+            set_flag={FLAG}-connect-{R0}
+	    no_flag={FLAG}-away-{R0}
         [/tile]
-        probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} -{R3}}
     [/terrain_graphics]
 #enddef
 
-#mark the bridges that are alone
-#define TRACK_ALONE_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM SUFFIX R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
+#define TRACK_FINAL TERRAIN FLAG
+    [terrain_graphics]
+        map="
+, 2
+* , *
+, 1
+* , *
+, *"
+
+        [tile]
+            pos=2
+            type={TERRAIN}
+            has_flag={FLAG}-connect-@R3
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            set_flag={FLAG}-connect-@R0
+        [/tile]
+        rotations=n,ne,se,s,sw,nw
+    [/terrain_graphics]
+#enddef
+
+
+
+###########################################
+#######   DRAWING   #######################
+###########################################
+
+
+#define TRACK_SINGLE_PLFB TERRAIN ADJACENT1 ADJACENT2 ADJACENT3 PROB LAYER FLAG BUILDER IMAGESTEM 
+    [terrain_graphics]
+        map="
+, 2
+3 , 3
+, 1
+3 , 3
+, 4"
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+	    no_flag={FLAG}-connect-@R3
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=4
+            type={ADJACENT3}
+	    no_flag={FLAG}-connect-@R0
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R3
+            set_flag={FLAG}
+        [/tile]
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0@R3}
+            layer={LAYER}
+            center=90,144
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+
+#define TRACK_RESTRICTED_PLFB TERRAIN ADJACENT1 ADJACENT2 ADJACENT3 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   3
+,  1
+3,   3
+,  4"
+
+        [tile]
+	    # bridge connected side
+            pos=2
+            type={ADJACENT1}
+	    has_flag={FLAG}-connect-@R3
+        [/tile]
+        [tile]
+	    # not connected side
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+	    # opposite of connection
+            pos=4
+            type={ADJACENT3}
+	    no_flag={FLAG}-connect-@R0
+        [/tile]
+
+        [tile]
+            pos=1
+            type={TERRAIN}
+	    #The layout don't decide where to put terminations, we put them where termination should go, but the exit side isn't a bridge
+	    #terminations only go where straight bridge should have gone
+            no_flag={FLAG},{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R3
+            set_flag={FLAG},{FLAG}-connected-@R0
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+
+
+
+#define TRACK_RESTRICTED2_N_NE_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+3,   3
+,  3"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R2,{FLAG}-connect-@R3,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1
+
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED2_N_SE_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   3
+,  1
+3,   2
+,  3"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R1,{FLAG}-connect-@R3,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+            has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R2
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R2
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R2}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED2_N_S_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   3
+,  1
+3,   3
+,  4"
+
+   
+        [tile]
+            pos=2
+            type={ADJACENT1}
+	    has_flag={FLAG}-connect-@R3
+        [/tile]
+        [tile]
+	    #here we must be a bit more restrictive to detect bridge termination properly
+	    #but the emergency catchups will solve any problem anyway
+            pos=4
+            type={ADJACENT1}
+	    has_flag={FLAG}-connect-@R0
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R3
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R3
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R3}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#
+# TERRAIN is next to at least two ADJACENT-hexes
+#
+#define TRACK_RESTRICTED2_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    {TRACK_RESTRICTED2_N_NE_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED2_N_SE_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED2_N_S_PLFB  ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+#enddef
+
+
+
+
+
+#define TRACK_RESTRICTED3_N_NE_SE_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM 
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+3,   2
+,  3"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R3,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R2
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R2
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R2}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED3_N_NE_S_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+3,   3
+,  2"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+	    has_flag={FLAG}-connect-@R3
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R2,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R3
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R3
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R3}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED3_N_NE_SW_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+2,   3
+,  3"
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R2,{FLAG}-connect-@R3,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R4
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R4}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED3_N_SE_SW_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   3
+,  1
+2,   2
+,  3"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R1,{FLAG}-connect-@R3,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R2,{FLAG}-connect-@R4
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R2,{FLAG}-connected-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R2-@R4}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#
+# TERRAIN ist next to at least three ADJACENT-hexes
+#
+#define TRACK_RESTRICTED3_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    {TRACK_RESTRICTED3_N_NE_SE_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED3_N_NE_S_PLFB  ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED3_N_NE_SW_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED3_N_SE_SW_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+#enddef
+
+
+
+
+
+#define TRACK_RESTRICTED4_N_NE_SE_S_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+3,   2
+,  2"
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R4,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R3
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R2,{FLAG}-connected-@R3
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R2-@R3}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED4_N_NE_SE_SW_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+2,   2
+,  3"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R3,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R4
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R2,{FLAG}-connected-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R2-@R4}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_RESTRICTED4_N_NE_S_SW_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+2,   3
+,  2"
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+       [tile]
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG},{FLAG}-connect-@R2,{FLAG}-connect-@R5
+	    has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R3,{FLAG}-connect-@R4
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R3,{FLAG}-connected-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0-@R1-@R3-@R4}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#
+# TERRAIN is next to at least two ADJACENT-hexes
+#
+#define TRACK_RESTRICTED4_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    {TRACK_RESTRICTED4_N_NE_SE_S_PLFB  ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED4_N_NE_SE_SW_PLFB ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+    {TRACK_RESTRICTED4_N_NE_S_SW_PLFB  ({TERRAIN}) {ADJACENT1} {ADJACENT2} {PROB} {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
+#enddef
+
+
+#define TRACK_RESTRICTED5_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+3,   2
+,  1
+2,   2
+,  2"
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+
+
+        [tile]
+            pos=3
+            type={ADJACENT2}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+	    no_flag={FLAG},{FLAG}-connect-@R5
+            has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R3,{FLAG}-connect-@R4
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R2,{FLAG}-connected-@R3,{FLAG}-connected-@R4
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+
+#define TRACK_RESTRICTED6_PLFB TERRAIN ADJACENT1 ADJACENT2 PROB LAYER FLAG BUILDER IMAGESTEM
+    [terrain_graphics]
+        map="
+,  2
+2,   2
+,  1
+2,   2
+,  2"
+
+
+        [tile]
+            pos=2
+            type={ADJACENT1}
+        [/tile]
+        [tile]
+            pos=1
+            type={TERRAIN}
+	    no_flag={FLAG}
+            has_flag={FLAG}-connect-@R0,{FLAG}-connect-@R1,{FLAG}-connect-@R2,{FLAG}-connect-@R3,{FLAG}-connect-@R4,{FLAG}-connect-@R5
+            set_flag={FLAG},{FLAG}-connected-@R0,{FLAG}-connected-@R1,{FLAG}-connected-@R2,{FLAG}-connected-@R3,{FLAG}-connected-@R4,{FLAG}-connected-@R5
+        [/tile]
+
+        probability={PROB}
+        rotations=n,ne,se,s,sw,nw
+
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -@R0}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+
+#define TRACK_EMERGENCY_PLFB TERRAIN PROB LAYER FLAG BUILDER R0 R3 IMAGESTEM
     [terrain_graphics]
         map="
 ,  *
@@ -137,19 +696,63 @@
 *,   *
 ,  *"
         [tile]
-	    #main bridge
-	    pos=1
-            type={TERRAINLIST}
-	    no_flag={FLAG},{FLAG}-connect-{R0},{FLAG}-connect-{R3}
-            set_flag={FLAG},{FLAG}-connect-{R0},{FLAG}-connect-{R3}
+            pos=1
+            type={TERRAIN}
+            no_flag={FLAG}
+            set_flag={FLAG},{FLAG}-connected-{R0},{FLAG}-connected-{R3}
         [/tile]
+
         probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} {SUFFIX}}
+        [image]
+            name={BUILD_IMAGE {BUILDER} {IMAGESTEM} -{R0}-{R3}}
+            center=90,144
+            layer={LAYER}
+        [/image]
+    [/terrain_graphics]
+#enddef
+#define TRACK_COMPLETE SE_NW_VALUE N_S_VALUE NE_SW_VALUE FLAG IMAGESTEM
+{TRACK_RESTRICTED6_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * *   100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_RESTRICTED5_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * *   100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_RESTRICTED4_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * *   100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_RESTRICTED3_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * *   100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_RESTRICTED2_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * *   100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_RESTRICTED_PLFB  ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * * * 100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+{TRACK_SINGLE_PLFB ({SE_NW_VALUE},{N_S_VALUE},{NE_SW_VALUE}) * * * 100 -80 {FLAG} IMAGE_SINGLE {IMAGESTEM}}
+
+#emergency catch all (mainly for missing images)
+{TRACK_EMERGENCY_PLFB {SE_NW_VALUE} 100 -80 {FLAG} IMAGE_SINGLE se nw misc/rails}
+{TRACK_EMERGENCY_PLFB {N_S_VALUE}   100 -80 {FLAG} IMAGE_SINGLE n  s  misc/rails}
+{TRACK_EMERGENCY_PLFB {NE_SW_VALUE} 100 -80 {FLAG} IMAGE_SINGLE ne sw misc/rails}
+#{TRACK_EMERGENCY_PLFB {SE_NW_VALUE} 100 -80 {FLAG} IMAGE_SINGLE se nw {IMAGESTEM}}
+#{TRACK_EMERGENCY_PLFB {N_S_VALUE}   100 -80 {FLAG} IMAGE_SINGLE n  s  {IMAGESTEM}}
+#{TRACK_EMERGENCY_PLFB {NE_SW_VALUE} 100 -80 {FLAG} IMAGE_SINGLE ne sw {IMAGESTEM}}
+#enddef
+
+#define TRACK_TEST_FLAG TERRAIN FLAG
+    [terrain_graphics]
+        map="
+, *
+* , *
+, 1
+* , *
+, *"
+
+        [tile]
+            pos=1
+            type={TERRAIN}
+            has_flag={FLAG}-@R0
+            [image]
+                name={BUILD_IMAGE IMAGE_SINGLE test/test -@R0}
+                layer=40
+            [/image]
+        [/tile]
+        rotations=n,ne,se,s,sw,nw
     [/terrain_graphics]
 #enddef
 
-
-
+###########################################
+#######   TRANSITIONS   ###################
+###########################################
 #define TRACK_BORDER_RESTRICTED_PLF TERRAINLIST ADJACENT PROB LAYER FLAG IMAGESTEM
     [terrain_graphics]
         map="
@@ -161,38 +764,21 @@
         [tile]
             pos=1
             type={ADJACENT}
-            no_flag={FLAG}-connect-@R0
+	    no_flag={FLAG}-@R0,{FLAG}-connected-@R0
+	    set_flag={FLAG}-@R0
         [/tile]
         [tile]
             pos=2
             type={TERRAINLIST}
-	    has_flag={FLAG}-connect-@R3
+	    has_flag={FLAG}-connected-@R3
         [/tile]
 
-        {IMAGEC_LN {LAYER} {IMAGESTEM} -@R0}
+        [image]
+            layer={LAYER}
+            center=90,144
+            name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0}
+        [/image]
         probability={PROB}
         rotations=n,ne,se,s,sw,nw
     [/terrain_graphics]
 #enddef
-
-
-#define TRACK_STRAIGHT_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM SUFFIX R0 R1 R2 R3 R4 R5 S0 S1 S2 S3 S4 S5
-    [terrain_graphics]
-        map="
-,  {S1}
-{S0},   {S2}
-,  1
-{S5},   {S3}
-,  {S4}"
-        [tile]
-            pos=1
-            type={TERRAINLIST}
-            no_flag={FLAG},{FLAG}-away-{R0},{FLAG}-away-{R3}
-            set_flag={FLAG},{FLAG}-connect-{R0},{FLAG}-connect-{R3}
-        [/tile]
-
-        probability={PROB}
-        {IMAGEC_LN {LAYER}  {IMAGESTEM} {SUFFIX}}
-    [/terrain_graphics]
-#enddef
-

data/core/terrain-graphics/tracks.cfg

@@ -1,123 +1,62 @@
 #textdomain wesnoth
 # This file handles transitions involving bridges
 
-# macros to make things shorter
-# the main macro, called from terrain-graphics.cfg
-#define TRACK_LF SE_NW_VALUE N_S_VALUE NE_SW_VALUE LAYER FLAG IMAGESTEM
 
-    # make sure that colinear adjacent bridges stay connected
-    {TRACK_CONNECT_F {N_S_VALUE}   {FLAG} n ne se s sw nw * 2 * * * *}
-    {TRACK_CONNECT_F {NE_SW_VALUE} {FLAG} ne se s sw nw n * * 2 * * *}
-    {TRACK_CONNECT_F {SE_NW_VALUE} {FLAG} se s sw nw n ne * * * 2 * *}
-    {TRACK_CONNECT_F {N_S_VALUE}   {FLAG} s sw nw n ne se * * * * 2 *}
-    {TRACK_CONNECT_F {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2}
-    {TRACK_CONNECT_F {SE_NW_VALUE} {FLAG} nw n ne se s sw 2 * * * * *}
+#place the flags in the track hex so we can do all drawing later
+#define LAYOUT_TRACKS_F SE_NW_VALUE N_S_VALUE NE_SW_VALUE FLAG
+    # mark -connect- for colinear bridges
+    {TRACK_CONNECT {SE_NW_VALUE} {FLAG} nw n ne se s sw 2 * * * * *}
+    {TRACK_CONNECT {N_S_VALUE}   {FLAG} n ne se s sw nw * 2 * * * *}
+    {TRACK_CONNECT {NE_SW_VALUE} {FLAG} ne se s sw nw n * * 2 * * *}
+    {TRACK_CONNECT {SE_NW_VALUE} {FLAG} se s sw nw n ne * * * 2 * *}
+    {TRACK_CONNECT {N_S_VALUE}   {FLAG} s sw nw n ne se * * * * 2 *}
+    {TRACK_CONNECT {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2}
 
-    # find Y intersections
-    {TRACK_Y_RANDOM_LF {N_S_VALUE} {SE_NW_VALUE} {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-s-nw n ne se s sw nw 2 4 3 * * *}
-    {TRACK_Y_RANDOM_LF {NE_SW_VALUE} {N_S_VALUE} {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -n-se-sw ne se s sw nw n * 2 4 3 * *}
-    {TRACK_Y_RANDOM_LF {SE_NW_VALUE} {NE_SW_VALUE} {N_S_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-s-nw se s sw nw n ne * * 2 4 3 *}
-    {TRACK_Y_RANDOM_LF {N_S_VALUE} {SE_NW_VALUE} {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -n-se-sw s sw nw n ne se * * * 2 4 3}
-    {TRACK_Y_RANDOM_LF {NE_SW_VALUE} {N_S_VALUE} {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-s-nw sw nw n ne se s 3 * * * 2 4}
-    {TRACK_Y_RANDOM_LF {SE_NW_VALUE} {NE_SW_VALUE} {N_S_VALUE} {LAYER} {FLAG} {IMAGESTEM} -n-se-sw nw n ne se s sw 4 3 * * * 2}
 
-    # normal corners
-    {TRACK_CORNER_RANDOM_LF {N_S_VALUE}   {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -s-nw  s  nw se n  sw ne 2 3 * * * *}
-    {TRACK_CORNER_RANDOM_LF {N_S_VALUE}   {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-s  s  ne sw n  se nw * 3 2 * * *}
-    {TRACK_CORNER_RANDOM_LF {NE_SW_VALUE} {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -n-sw  sw n  s  ne nw se * 2 3 * * *}
-    {TRACK_CORNER_RANDOM_LF {NE_SW_VALUE} {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -se-sw sw se nw ne s  n  * * 3 2 * *}
-    {TRACK_CORNER_RANDOM_LF {SE_NW_VALUE} {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-nw nw ne sw se n  s  * * 2 3 * *}
-    {TRACK_CORNER_RANDOM_LF {SE_NW_VALUE} {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -s-nw  nw s  n  se sw ne * * * 3 2 *}
-    {TRACK_CORNER_RANDOM_LF {N_S_VALUE}   {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -n-se  n  se nw s  ne sw * * * 2 3 *}
-    {TRACK_CORNER_RANDOM_LF {N_S_VALUE}   {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -n-sw  n  sw ne s  nw se * * * * 3 2}
-    {TRACK_CORNER_RANDOM_LF {NE_SW_VALUE} {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -ne-s  ne s  n  sw se nw * * * * 2 3}
-    {TRACK_CORNER_RANDOM_LF {NE_SW_VALUE} {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-nw ne nw se sw n  s  2 * * * * 3}
-    {TRACK_CORNER_RANDOM_LF {SE_NW_VALUE} {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -se-sw se sw ne nw s  n  3 * * * * 2}
-    {TRACK_CORNER_RANDOM_LF {SE_NW_VALUE} {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -n-se  se n  s  nw ne sw 3 2 * * * *}
+    # mark -away- on sides where we should have exited but didnt
+    {TRACK_AWAY {N_S_VALUE}   {SE_NW_VALUE} {FLAG} s  nw se n  sw ne 2 3 * * * *}
+    {TRACK_AWAY {N_S_VALUE}   {NE_SW_VALUE} {FLAG} s  ne sw n  se nw * 3 2 * * *}
+    {TRACK_AWAY {NE_SW_VALUE} {N_S_VALUE}   {FLAG} sw n  s  ne nw se * 2 3 * * *}
+    {TRACK_AWAY {NE_SW_VALUE} {SE_NW_VALUE} {FLAG} sw se nw ne s  n  * * 3 2 * *}
+    {TRACK_AWAY {SE_NW_VALUE} {NE_SW_VALUE} {FLAG} nw ne sw se n  s  * * 2 3 * *}
+    {TRACK_AWAY {SE_NW_VALUE} {N_S_VALUE}   {FLAG} nw s  n  se sw ne * * * 3 2 *}
+    {TRACK_AWAY {N_S_VALUE}   {SE_NW_VALUE} {FLAG} n  se nw s  ne sw * * * 2 3 *}
+    {TRACK_AWAY {N_S_VALUE}   {NE_SW_VALUE} {FLAG} n  sw ne s  nw se * * * * 3 2}
+    {TRACK_AWAY {NE_SW_VALUE} {N_S_VALUE}   {FLAG} ne s  n  sw se nw * * * * 2 3}
+    {TRACK_AWAY {NE_SW_VALUE} {SE_NW_VALUE} {FLAG} ne nw se sw n  s  2 * * * * 3}
+    {TRACK_AWAY {SE_NW_VALUE} {NE_SW_VALUE} {FLAG} se sw ne nw s  n  3 * * * * 2}
+    {TRACK_AWAY {SE_NW_VALUE} {N_S_VALUE}   {FLAG} se n  s  nw ne sw 3 2 * * * *}
 
-    # Mark lonely tiles
-    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -ns n ne se s sw nw * 2 * * * *}
-    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -nesw ne se s sw nw n * * 2 * * *}
-    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -senw se s sw nw n ne * * * 2 * *}
-    {TRACK_ALONE_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -ns s sw nw n ne se * * * * 2 *}
-    {TRACK_ALONE_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -nesw sw nw n ne se s * * * * * 2}
-    {TRACK_ALONE_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -senw nw n ne se s sw 2 * * * * *}
-
-    # At this point, we mark "dead end bridges"
-    {TRACK_DEADEND_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} n ne se s sw nw * 2 * * * *}
-    {TRACK_DEADEND_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} ne se s sw nw n * * 2 * * *}
-    {TRACK_DEADEND_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} se s sw nw n ne * * * 2 * *}
-    {TRACK_DEADEND_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} s sw nw n ne se * * * * 2 *}
-    {TRACK_DEADEND_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} sw nw n ne se s * * * * * 2}
-    {TRACK_DEADEND_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} nw n ne se s sw 2 * * * * *}
-
-    # these 3 macros define the default straight bridges wherever there is some space left
-    {TRACK_STRAIGHT_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -n-s   n ne se s sw nw * 2 * * * *}
-    {TRACK_STRAIGHT_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-sw ne se s sw nw n * * 2 * * *}
-    {TRACK_STRAIGHT_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -se-nw se s sw nw n ne * * * 2 * *}
-    {TRACK_STRAIGHT_RANDOM_LF {N_S_VALUE}   {LAYER} {FLAG} {IMAGESTEM} -n-s   s sw nw n ne se * * * * 2 *}
-    {TRACK_STRAIGHT_RANDOM_LF {NE_SW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -ne-sw sw nw n ne se s * * * * * 2}
-    {TRACK_STRAIGHT_RANDOM_LF {SE_NW_VALUE} {LAYER} {FLAG} {IMAGESTEM} -se-nw nw n ne se s sw 2 * * * * *}
+    # mark -connect- on all logically connected sides of bridges that are not -away-
+    {TRACK_CONNECT_ALL {N_S_VALUE}   {FLAG} n ne se s sw nw * 2 * * * *}	
+    {TRACK_CONNECT_ALL {N_S_VALUE}   {FLAG} s sw nw n ne se * * * * 2 *}	
+    {TRACK_CONNECT_ALL {NE_SW_VALUE} {FLAG} ne se s sw nw n * * 2 * * *}	
+    {TRACK_CONNECT_ALL {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2}	
+    {TRACK_CONNECT_ALL {SE_NW_VALUE} {FLAG} se s sw nw n ne * * * 2 * *}	
+    {TRACK_CONNECT_ALL {SE_NW_VALUE} {FLAG} nw n ne se s sw 2 * * * * *}	
 
+    # mark -connect- non logical sides of bridges who have a connect on the other side of hex
+    {TRACK_FINAL ({N_S_VALUE},{NE_SW_VALUE},{SE_NW_VALUE}) {FLAG}}
 #enddef
-#
 
+#define LAYOUT_TRACKS_STRAIGHT_F SE_NW_VALUE N_S_VALUE NE_SW_VALUE FLAG
+    # mark -connect- for colinear bridges
+    {TRACK_CONNECT {SE_NW_VALUE} {FLAG} nw n ne se s sw 2 * * * * *}
+    {TRACK_CONNECT {N_S_VALUE}   {FLAG} n ne se s sw nw * 2 * * * *}
+    {TRACK_CONNECT {NE_SW_VALUE} {FLAG} ne se s sw nw n * * 2 * * *}
+    {TRACK_CONNECT {SE_NW_VALUE} {FLAG} se s sw nw n ne * * * 2 * *}
+    {TRACK_CONNECT {N_S_VALUE}   {FLAG} s sw nw n ne se * * * * 2 *}
+    {TRACK_CONNECT {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2}
 
-#meta-macro TRACK SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_BORDER_RESTRICTED TERRAINLIST ADJACENT P=PROB=100 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#meta-macro TRACK_BORDER_RESTRICTED_RANDOM TERRAINLIST ADJACENT L=LAYER=-80 F=FLAG=overlay IMAGESTEM
+    # mark -connect- on all logically connected sides of bridges that are not -away-
+    {TRACK_CONNECT_ALL {N_S_VALUE}   {FLAG} n ne se s sw nw * 2 * * * *}	
+    {TRACK_CONNECT_ALL {N_S_VALUE}   {FLAG} s sw nw n ne se * * * * 2 *}	
+    {TRACK_CONNECT_ALL {NE_SW_VALUE} {FLAG} ne se s sw nw n * * 2 * * *}	
+    {TRACK_CONNECT_ALL {NE_SW_VALUE} {FLAG} sw nw n ne se s * * * * * 2}	
+    {TRACK_CONNECT_ALL {SE_NW_VALUE} {FLAG} se s sw nw n ne * * * 2 * *}	
+    {TRACK_CONNECT_ALL {SE_NW_VALUE} {FLAG} nw n ne se s sw 2 * * * * *}	
+#enddef
 
 #####################################################################################################
 ###############        AUTO GENERATED CODE        ###################################################
 #####################################################################################################
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_F SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN FLAG IMAGESTEM
-    {TRACK_LF ({SE_NW_TERRAIN}) ({N_S_TERRAIN}) ({NE_SW_TERRAIN}) -80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_L SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN LAYER IMAGESTEM
-    {TRACK_LF ({SE_NW_TERRAIN}) ({N_S_TERRAIN}) ({NE_SW_TERRAIN}) ({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK SE_NW_TERRAIN N_S_TERRAIN NE_SW_TERRAIN IMAGESTEM
-    {TRACK_LF ({SE_NW_TERRAIN}) ({N_S_TERRAIN}) ({NE_SW_TERRAIN}) -80 overlay ({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_BORDER_RESTRICTED TERRAINLIST ADJACENT P=PROB=100 L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_BORDER_RESTRICTED_LF TERRAINLIST ADJACENT LAYER FLAG IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_PF TERRAINLIST ADJACENT PROB FLAG IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) -80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_F TERRAINLIST ADJACENT FLAG IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 -80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) ({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_L TERRAINLIST ADJACENT LAYER IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 ({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_P TERRAINLIST ADJACENT PROB IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) ({PROB}) -80 overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED TERRAINLIST ADJACENT IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_PLF ({TERRAINLIST}) ({ADJACENT}) 100 -80 overlay ({IMAGESTEM})}
-#enddef
-#end of generated code
-#The following code is autogenerated by expand-terrain-macros.py
-#generated from: #meta-macro TRACK_BORDER_RESTRICTED_RANDOM TERRAINLIST ADJACENT L=LAYER=-80 F=FLAG=overlay IMAGESTEM
-#Please do not modify
-#define TRACK_BORDER_RESTRICTED_RANDOM_F TERRAINLIST ADJACENT FLAG IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_RANDOM_LF ({TERRAINLIST}) ({ADJACENT}) -80 ({FLAG}) ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_RANDOM_L TERRAINLIST ADJACENT LAYER IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_RANDOM_LF ({TERRAINLIST}) ({ADJACENT}) ({LAYER}) overlay ({IMAGESTEM})}
-#enddef
-#define TRACK_BORDER_RESTRICTED_RANDOM TERRAINLIST ADJACENT IMAGESTEM
-    {TRACK_BORDER_RESTRICTED_RANDOM_LF ({TERRAINLIST}) ({ADJACENT}) -80 overlay ({IMAGESTEM})}
-#enddef
-#end of generated code

data/core/terrain.cfg

@@ -1667,7 +1667,7 @@
 #  ######## Basic Stone Bridge
 
 [terrain_type]
-    symbol_image=bridge/stone-basic-s-n-tile
+    symbol_image=bridge/stonebridge-n-s-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb|
@@ -1678,7 +1678,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/stone-basic-se-nw-tile
+    symbol_image=bridge/stonebridge-se-nw-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb\
@@ -1689,7 +1689,7 @@
 [/terrain_type]
 
 [terrain_type]
-    symbol_image=bridge/stone-basic-sw-ne-tile
+    symbol_image=bridge/stonebridge-ne-sw-tile
     id=stone_bridge
     name= _ "Bridge"
     string=^Bsb/

data/core/units/humans/Mage_of_Light.cfg

@@ -7,7 +7,13 @@
     image="units/human-magi/white-cleric.png"
     {MAGENTA_IS_THE_TEAM_COLOR}
     profile="portraits/humans/mage-light.png"
+    #halo=halo/illuminates-aura.png
+[standing_anim]
+      [frame]
+    image="units/human-magi/white-cleric.png"
     halo=halo/illuminates-aura.png
+        [/frame]
+  [/standing_anim]
     hitpoints=47
     movement_type=smallfoot
     movement=5

src/builder.cpp

@@ -329,6 +329,7 @@ bool terrain_builder::rule_valid(const building_rule &rule) const
 				if(s.find(".png") == std::string::npos && image::precached_file_exists(s + ".png")){
 					lg::wml_error << "Terrain image '" << s << "' misses the '.png' extension\n";
 				}
+				//printf("not found %s\n",s.c_str());
 				return false;
 			}
 		}