thx to a few renaming, simplify the forest macros a lot.

this could easily be changed into some generic overlay macros at some
point

data/core/terrain-graphics/forests.cfg

@@ -1,72 +1,6 @@
 #textdomain wesnoth
 
-#define SINGLE_FOREST_TILE TERRAINLIST PROB IMAGESTEM
-    [terrain_graphics]
-        map="
-,  *
-*,   *
-,  1
-*,   *
-,  *"
-        [tile]
-            pos=1
-            type={TERRAINLIST}
-            no_flag=overlay
-            set_flag=overlay
-        [/tile]
-
-        probability={PROB}
-
-        [image]
-            name={IMAGESTEM}
-            layer=0
-            base=90,144
-            center=90,144
-        [/image]
-    [/terrain_graphics]
-#enddef
-
-#define SINGLE_FOREST_TILE_RESTRICTED TERRAINLIST ADJACENT PROB IMAGESTEM
-    # The ADJACENT argument here was originally RESTRICTING.
-    # It's been changed in order to allow wmlscope to do better type checking.
-    [terrain_graphics]
-        map="
-,  2
-*,   *
-,  1
-*,   *
-,  *"
-        [tile]
-            pos=1
-            type={TERRAINLIST}
-            no_flag=overlay
-            set_flag=overlay
-        [/tile]
-
-        [tile]
-            pos=2
-            type={ADJACENT}
-        [/tile]
-
-        probability={PROB}
-        rotations=n,ne,se,s,sw,nw
-
-        [image]
-            name={IMAGESTEM}
-            layer=0
-            base=90,144
-            center=90,144
-        [/image]
-    [/terrain_graphics]
-#enddef
-
 #define SIMPLE_FOREST_TERRAIN TERRAINLIST ADJACENT IMAGESTEM
-    # The ADJACENT argument here was originally RESTRICTING.
-    # It's been changed in order to allow wmlscope to do better type checking.
-    {SINGLE_FOREST_TILE_RESTRICTED {TERRAINLIST} {ADJACENT}  50 {IMAGESTEM}-small-2}
-    {SINGLE_FOREST_TILE_RESTRICTED {TERRAINLIST} {ADJACENT} 100 {IMAGESTEM}-small}
-    {SINGLE_FOREST_TILE            {TERRAINLIST}                25 {IMAGESTEM}-4}
-    {SINGLE_FOREST_TILE            {TERRAINLIST}                33 {IMAGESTEM}-3}
-    {SINGLE_FOREST_TILE            {TERRAINLIST}                50 {IMAGESTEM}-2}
-    {SINGLE_FOREST_TILE            {TERRAINLIST}               100 {IMAGESTEM}}
+    {OVERLAY_RESTRICTED_RANDOM {TERRAINLIST} {ADJACENT}  {IMAGESTEM}-small}
+    {OVERLAY_RANDOM            {TERRAINLIST}             {IMAGESTEM}}
 #enddef

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

@@ -29,18 +29,6 @@
         [/image]
     [/terrain_graphics]
 #enddef
-#define GENERIC_SINGLE_RANDOM_LFB TERRAIN LAYER FLAG BUILDER IMAGESTEM
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 11  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}9}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 12  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}8}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 14  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}7}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 16  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}6}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 20  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}5}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 25  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}4}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 33  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}3}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 50  {LAYER} {FLAG} {BUILDER} {IMAGESTEM}2}
-    {GENERIC_SINGLE_PLFB ({TERRAIN}) 100 {LAYER} {FLAG} {BUILDER} {IMAGESTEM}}
-#enddef
-
 
 
 #define GENERIC_RESTRICTED_PLFB TERRAIN ADJACENT PROB LAYER FLAG BUILDER IMAGESTEM

data/core/terrain-graphics/overlay.cfg

@@ -36,6 +36,12 @@
 
 #meta-macro OVERLAY_RESTRICTED3 TERRAIN ADJACENT P=PROB=100 L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
 
+#define OVERLAY_RESTRICTED_RANDOM_LFB TERRAIN ADJACENT LAYER FLAG BUILDER IMAGESTEM
+{GENERIC_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
+#enddef
+
+#meta-macro OVERLAY_RESTRICTED_RANDOM TERRAIN ADJACENT L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
+
 #####################################################################################################
 ###############        AUTO GENERATED CODE        ###################################################
 #####################################################################################################
@@ -260,3 +266,28 @@
     {OVERLAY_RESTRICTED3_PLFB ({TERRAIN}) ({ADJACENT}) 100 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
 #enddef
 #end of generated code
+#The following code is autogenerated by expand-terrain-macros.py
+#generated from: #meta-macro OVERLAY_RESTRICTED_RANDOM TERRAIN ADJACENT L=LAYER=0 F=FLAG=overlay B=BUILDER=IMAGE_SINGLE IMAGESTEM
+#Please do not modify
+#define OVERLAY_RESTRICTED_RANDOM_FB TERRAIN ADJACENT FLAG BUILDER IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) 0 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM_LB TERRAIN ADJACENT LAYER BUILDER IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) overlay ({BUILDER}) ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM_B TERRAIN ADJACENT BUILDER IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) 0 overlay ({BUILDER}) ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM_LF TERRAIN ADJACENT LAYER FLAG IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM_F TERRAIN ADJACENT FLAG IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) 0 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM_L TERRAIN ADJACENT LAYER IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) ({LAYER}) overlay IMAGE_SINGLE ({IMAGESTEM})}
+#enddef
+#define OVERLAY_RESTRICTED_RANDOM TERRAIN ADJACENT IMAGESTEM
+    {OVERLAY_RESTRICTED_RANDOM_LFB ({TERRAIN}) ({ADJACENT}) 0 overlay IMAGE_SINGLE ({IMAGESTEM})}
+#enddef
+#end of generated code