From 52b41a6c65f2b4c6e7cc8d7f01778a6888423ac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Rosen?= Date: Wed, 26 May 2010 19:55:42 +0000 Subject: [PATCH] thx to a few renaming, simplify the forest macros a lot. this could easily be changed into some generic overlay macros at some point --- ...parse-2.png => deciduous-fall-sparse2.png} | Bin ...parse-3.png => deciduous-fall-sparse3.png} | Bin ...ciduous-fall-2.png => deciduous-fall2.png} | Bin ...ciduous-fall-3.png => deciduous-fall3.png} | Bin ...rse-2.png => deciduous-summer-sparse2.png} | Bin ...rse-3.png => deciduous-summer-sparse3.png} | Bin ...ous-summer-2.png => deciduous-summer2.png} | Bin ...ous-summer-3.png => deciduous-summer3.png} | Bin ...ous-summer-4.png => deciduous-summer4.png} | Bin ....png => deciduous-winter-snow-sparse2.png} | Bin ....png => deciduous-winter-snow-sparse3.png} | Bin ...-snow-2.png => deciduous-winter-snow2.png} | Bin ...rse-2.png => deciduous-winter-sparse2.png} | Bin ...rse-3.png => deciduous-winter-sparse3.png} | Bin ...ous-winter-2.png => deciduous-winter2.png} | Bin ...ll-sparse-2.png => mixed-fall-sparse2.png} | Bin .../{mixed-fall-2.png => mixed-fall2.png} | Bin ...-sparse-2.png => mixed-summer-sparse2.png} | Bin .../{mixed-summer-2.png => mixed-summer2.png} | Bin ...se-2.png => mixed-winter-snow-sparse2.png} | Bin ...nter-snow-2.png => mixed-winter-snow2.png} | Bin ...-sparse-2.png => mixed-winter-sparse2.png} | Bin .../{mixed-winter-2.png => mixed-winter2.png} | Bin .../{mushrooms-2.png => mushrooms2.png} | Bin .../{mushrooms-3.png => mushrooms3.png} | Bin .../{mushrooms-4.png => mushrooms4.png} | Bin .../{mushrooms-5.png => mushrooms5.png} | Bin .../{pine-small-2.png => pine-small2.png} | Bin .../{pine-sparse-2.png => pine-sparse2.png} | Bin .../{pine-sparse-3.png => pine-sparse3.png} | Bin .../{pine-sparse-4.png => pine-sparse4.png} | Bin .../terrain/forest/{pine-2.png => pine2.png} | Bin .../terrain/forest/{pine-3.png => pine3.png} | Bin .../terrain/forest/{pine-4.png => pine4.png} | Bin ...t-sparse-2.png => snow-forest-sparse2.png} | Bin ...t-sparse-3.png => snow-forest-sparse3.png} | Bin ...t-sparse-4.png => snow-forest-sparse4.png} | Bin .../{snow-forest-2.png => snow-forest2.png} | Bin .../{snow-forest-3.png => snow-forest3.png} | Bin .../{snow-forest-4.png => snow-forest4.png} | Bin .../forest/{tropical-2.png => tropical2.png} | Bin .../forest/{tropical-3.png => tropical3.png} | Bin .../forest/{tropical-4.png => tropical4.png} | Bin data/core/terrain-graphics/forests.cfg | 70 +----------------- .../terrain-graphics/internal-generic.cfg | 12 --- data/core/terrain-graphics/overlay.cfg | 31 ++++++++ 46 files changed, 33 insertions(+), 80 deletions(-) rename data/core/images/terrain/forest/{deciduous-fall-sparse-2.png => deciduous-fall-sparse2.png} (100%) rename data/core/images/terrain/forest/{deciduous-fall-sparse-3.png => deciduous-fall-sparse3.png} (100%) rename data/core/images/terrain/forest/{deciduous-fall-2.png => deciduous-fall2.png} (100%) rename data/core/images/terrain/forest/{deciduous-fall-3.png => deciduous-fall3.png} (100%) rename data/core/images/terrain/forest/{deciduous-summer-sparse-2.png => deciduous-summer-sparse2.png} (100%) rename data/core/images/terrain/forest/{deciduous-summer-sparse-3.png => deciduous-summer-sparse3.png} (100%) rename data/core/images/terrain/forest/{deciduous-summer-2.png => deciduous-summer2.png} (100%) rename data/core/images/terrain/forest/{deciduous-summer-3.png => deciduous-summer3.png} (100%) rename data/core/images/terrain/forest/{deciduous-summer-4.png => deciduous-summer4.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-snow-sparse-2.png => deciduous-winter-snow-sparse2.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-snow-sparse-3.png => deciduous-winter-snow-sparse3.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-snow-2.png => deciduous-winter-snow2.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-sparse-2.png => deciduous-winter-sparse2.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-sparse-3.png => deciduous-winter-sparse3.png} (100%) rename data/core/images/terrain/forest/{deciduous-winter-2.png => deciduous-winter2.png} (100%) rename data/core/images/terrain/forest/{mixed-fall-sparse-2.png => mixed-fall-sparse2.png} (100%) rename data/core/images/terrain/forest/{mixed-fall-2.png => mixed-fall2.png} (100%) rename data/core/images/terrain/forest/{mixed-summer-sparse-2.png => mixed-summer-sparse2.png} (100%) rename data/core/images/terrain/forest/{mixed-summer-2.png => mixed-summer2.png} (100%) rename data/core/images/terrain/forest/{mixed-winter-snow-sparse-2.png => mixed-winter-snow-sparse2.png} (100%) rename data/core/images/terrain/forest/{mixed-winter-snow-2.png => mixed-winter-snow2.png} (100%) rename data/core/images/terrain/forest/{mixed-winter-sparse-2.png => mixed-winter-sparse2.png} (100%) rename data/core/images/terrain/forest/{mixed-winter-2.png => mixed-winter2.png} (100%) rename data/core/images/terrain/forest/{mushrooms-2.png => mushrooms2.png} (100%) rename data/core/images/terrain/forest/{mushrooms-3.png => mushrooms3.png} (100%) rename data/core/images/terrain/forest/{mushrooms-4.png => mushrooms4.png} (100%) rename data/core/images/terrain/forest/{mushrooms-5.png => mushrooms5.png} (100%) rename data/core/images/terrain/forest/{pine-small-2.png => pine-small2.png} (100%) rename data/core/images/terrain/forest/{pine-sparse-2.png => pine-sparse2.png} (100%) rename data/core/images/terrain/forest/{pine-sparse-3.png => pine-sparse3.png} (100%) rename data/core/images/terrain/forest/{pine-sparse-4.png => pine-sparse4.png} (100%) rename data/core/images/terrain/forest/{pine-2.png => pine2.png} (100%) rename data/core/images/terrain/forest/{pine-3.png => pine3.png} (100%) rename data/core/images/terrain/forest/{pine-4.png => pine4.png} (100%) rename data/core/images/terrain/forest/{snow-forest-sparse-2.png => snow-forest-sparse2.png} (100%) rename data/core/images/terrain/forest/{snow-forest-sparse-3.png => snow-forest-sparse3.png} (100%) rename data/core/images/terrain/forest/{snow-forest-sparse-4.png => snow-forest-sparse4.png} (100%) rename data/core/images/terrain/forest/{snow-forest-2.png => snow-forest2.png} (100%) rename data/core/images/terrain/forest/{snow-forest-3.png => snow-forest3.png} (100%) rename data/core/images/terrain/forest/{snow-forest-4.png => snow-forest4.png} (100%) rename data/core/images/terrain/forest/{tropical-2.png => tropical2.png} (100%) rename data/core/images/terrain/forest/{tropical-3.png => tropical3.png} (100%) rename data/core/images/terrain/forest/{tropical-4.png => tropical4.png} (100%) diff --git a/data/core/images/terrain/forest/deciduous-fall-sparse-2.png b/data/core/images/terrain/forest/deciduous-fall-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-fall-sparse-2.png rename to data/core/images/terrain/forest/deciduous-fall-sparse2.png diff --git a/data/core/images/terrain/forest/deciduous-fall-sparse-3.png b/data/core/images/terrain/forest/deciduous-fall-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-fall-sparse-3.png rename to data/core/images/terrain/forest/deciduous-fall-sparse3.png diff --git a/data/core/images/terrain/forest/deciduous-fall-2.png b/data/core/images/terrain/forest/deciduous-fall2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-fall-2.png rename to data/core/images/terrain/forest/deciduous-fall2.png diff --git a/data/core/images/terrain/forest/deciduous-fall-3.png b/data/core/images/terrain/forest/deciduous-fall3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-fall-3.png rename to data/core/images/terrain/forest/deciduous-fall3.png diff --git a/data/core/images/terrain/forest/deciduous-summer-sparse-2.png b/data/core/images/terrain/forest/deciduous-summer-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-summer-sparse-2.png rename to data/core/images/terrain/forest/deciduous-summer-sparse2.png diff --git a/data/core/images/terrain/forest/deciduous-summer-sparse-3.png b/data/core/images/terrain/forest/deciduous-summer-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-summer-sparse-3.png rename to data/core/images/terrain/forest/deciduous-summer-sparse3.png diff --git a/data/core/images/terrain/forest/deciduous-summer-2.png b/data/core/images/terrain/forest/deciduous-summer2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-summer-2.png rename to data/core/images/terrain/forest/deciduous-summer2.png diff --git a/data/core/images/terrain/forest/deciduous-summer-3.png b/data/core/images/terrain/forest/deciduous-summer3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-summer-3.png rename to data/core/images/terrain/forest/deciduous-summer3.png diff --git a/data/core/images/terrain/forest/deciduous-summer-4.png b/data/core/images/terrain/forest/deciduous-summer4.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-summer-4.png rename to data/core/images/terrain/forest/deciduous-summer4.png diff --git a/data/core/images/terrain/forest/deciduous-winter-snow-sparse-2.png b/data/core/images/terrain/forest/deciduous-winter-snow-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-snow-sparse-2.png rename to data/core/images/terrain/forest/deciduous-winter-snow-sparse2.png diff --git a/data/core/images/terrain/forest/deciduous-winter-snow-sparse-3.png b/data/core/images/terrain/forest/deciduous-winter-snow-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-snow-sparse-3.png rename to data/core/images/terrain/forest/deciduous-winter-snow-sparse3.png diff --git a/data/core/images/terrain/forest/deciduous-winter-snow-2.png b/data/core/images/terrain/forest/deciduous-winter-snow2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-snow-2.png rename to data/core/images/terrain/forest/deciduous-winter-snow2.png diff --git a/data/core/images/terrain/forest/deciduous-winter-sparse-2.png b/data/core/images/terrain/forest/deciduous-winter-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-sparse-2.png rename to data/core/images/terrain/forest/deciduous-winter-sparse2.png diff --git a/data/core/images/terrain/forest/deciduous-winter-sparse-3.png b/data/core/images/terrain/forest/deciduous-winter-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-sparse-3.png rename to data/core/images/terrain/forest/deciduous-winter-sparse3.png diff --git a/data/core/images/terrain/forest/deciduous-winter-2.png b/data/core/images/terrain/forest/deciduous-winter2.png similarity index 100% rename from data/core/images/terrain/forest/deciduous-winter-2.png rename to data/core/images/terrain/forest/deciduous-winter2.png diff --git a/data/core/images/terrain/forest/mixed-fall-sparse-2.png b/data/core/images/terrain/forest/mixed-fall-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-fall-sparse-2.png rename to data/core/images/terrain/forest/mixed-fall-sparse2.png diff --git a/data/core/images/terrain/forest/mixed-fall-2.png b/data/core/images/terrain/forest/mixed-fall2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-fall-2.png rename to data/core/images/terrain/forest/mixed-fall2.png diff --git a/data/core/images/terrain/forest/mixed-summer-sparse-2.png b/data/core/images/terrain/forest/mixed-summer-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-summer-sparse-2.png rename to data/core/images/terrain/forest/mixed-summer-sparse2.png diff --git a/data/core/images/terrain/forest/mixed-summer-2.png b/data/core/images/terrain/forest/mixed-summer2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-summer-2.png rename to data/core/images/terrain/forest/mixed-summer2.png diff --git a/data/core/images/terrain/forest/mixed-winter-snow-sparse-2.png b/data/core/images/terrain/forest/mixed-winter-snow-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-winter-snow-sparse-2.png rename to data/core/images/terrain/forest/mixed-winter-snow-sparse2.png diff --git a/data/core/images/terrain/forest/mixed-winter-snow-2.png b/data/core/images/terrain/forest/mixed-winter-snow2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-winter-snow-2.png rename to data/core/images/terrain/forest/mixed-winter-snow2.png diff --git a/data/core/images/terrain/forest/mixed-winter-sparse-2.png b/data/core/images/terrain/forest/mixed-winter-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-winter-sparse-2.png rename to data/core/images/terrain/forest/mixed-winter-sparse2.png diff --git a/data/core/images/terrain/forest/mixed-winter-2.png b/data/core/images/terrain/forest/mixed-winter2.png similarity index 100% rename from data/core/images/terrain/forest/mixed-winter-2.png rename to data/core/images/terrain/forest/mixed-winter2.png diff --git a/data/core/images/terrain/forest/mushrooms-2.png b/data/core/images/terrain/forest/mushrooms2.png similarity index 100% rename from data/core/images/terrain/forest/mushrooms-2.png rename to data/core/images/terrain/forest/mushrooms2.png diff --git a/data/core/images/terrain/forest/mushrooms-3.png b/data/core/images/terrain/forest/mushrooms3.png similarity index 100% rename from data/core/images/terrain/forest/mushrooms-3.png rename to data/core/images/terrain/forest/mushrooms3.png diff --git a/data/core/images/terrain/forest/mushrooms-4.png b/data/core/images/terrain/forest/mushrooms4.png similarity index 100% rename from data/core/images/terrain/forest/mushrooms-4.png rename to data/core/images/terrain/forest/mushrooms4.png diff --git a/data/core/images/terrain/forest/mushrooms-5.png b/data/core/images/terrain/forest/mushrooms5.png similarity index 100% rename from data/core/images/terrain/forest/mushrooms-5.png rename to data/core/images/terrain/forest/mushrooms5.png diff --git a/data/core/images/terrain/forest/pine-small-2.png b/data/core/images/terrain/forest/pine-small2.png similarity index 100% rename from data/core/images/terrain/forest/pine-small-2.png rename to data/core/images/terrain/forest/pine-small2.png diff --git a/data/core/images/terrain/forest/pine-sparse-2.png b/data/core/images/terrain/forest/pine-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/pine-sparse-2.png rename to data/core/images/terrain/forest/pine-sparse2.png diff --git a/data/core/images/terrain/forest/pine-sparse-3.png b/data/core/images/terrain/forest/pine-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/pine-sparse-3.png rename to data/core/images/terrain/forest/pine-sparse3.png diff --git a/data/core/images/terrain/forest/pine-sparse-4.png b/data/core/images/terrain/forest/pine-sparse4.png similarity index 100% rename from data/core/images/terrain/forest/pine-sparse-4.png rename to data/core/images/terrain/forest/pine-sparse4.png diff --git a/data/core/images/terrain/forest/pine-2.png b/data/core/images/terrain/forest/pine2.png similarity index 100% rename from data/core/images/terrain/forest/pine-2.png rename to data/core/images/terrain/forest/pine2.png diff --git a/data/core/images/terrain/forest/pine-3.png b/data/core/images/terrain/forest/pine3.png similarity index 100% rename from data/core/images/terrain/forest/pine-3.png rename to data/core/images/terrain/forest/pine3.png diff --git a/data/core/images/terrain/forest/pine-4.png b/data/core/images/terrain/forest/pine4.png similarity index 100% rename from data/core/images/terrain/forest/pine-4.png rename to data/core/images/terrain/forest/pine4.png diff --git a/data/core/images/terrain/forest/snow-forest-sparse-2.png b/data/core/images/terrain/forest/snow-forest-sparse2.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-sparse-2.png rename to data/core/images/terrain/forest/snow-forest-sparse2.png diff --git a/data/core/images/terrain/forest/snow-forest-sparse-3.png b/data/core/images/terrain/forest/snow-forest-sparse3.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-sparse-3.png rename to data/core/images/terrain/forest/snow-forest-sparse3.png diff --git a/data/core/images/terrain/forest/snow-forest-sparse-4.png b/data/core/images/terrain/forest/snow-forest-sparse4.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-sparse-4.png rename to data/core/images/terrain/forest/snow-forest-sparse4.png diff --git a/data/core/images/terrain/forest/snow-forest-2.png b/data/core/images/terrain/forest/snow-forest2.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-2.png rename to data/core/images/terrain/forest/snow-forest2.png diff --git a/data/core/images/terrain/forest/snow-forest-3.png b/data/core/images/terrain/forest/snow-forest3.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-3.png rename to data/core/images/terrain/forest/snow-forest3.png diff --git a/data/core/images/terrain/forest/snow-forest-4.png b/data/core/images/terrain/forest/snow-forest4.png similarity index 100% rename from data/core/images/terrain/forest/snow-forest-4.png rename to data/core/images/terrain/forest/snow-forest4.png diff --git a/data/core/images/terrain/forest/tropical-2.png b/data/core/images/terrain/forest/tropical2.png similarity index 100% rename from data/core/images/terrain/forest/tropical-2.png rename to data/core/images/terrain/forest/tropical2.png diff --git a/data/core/images/terrain/forest/tropical-3.png b/data/core/images/terrain/forest/tropical3.png similarity index 100% rename from data/core/images/terrain/forest/tropical-3.png rename to data/core/images/terrain/forest/tropical3.png diff --git a/data/core/images/terrain/forest/tropical-4.png b/data/core/images/terrain/forest/tropical4.png similarity index 100% rename from data/core/images/terrain/forest/tropical-4.png rename to data/core/images/terrain/forest/tropical4.png diff --git a/data/core/terrain-graphics/forests.cfg b/data/core/terrain-graphics/forests.cfg index 85067f98e40..0de4ad4f263 100644 --- a/data/core/terrain-graphics/forests.cfg +++ b/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 diff --git a/data/core/terrain-graphics/internal-generic.cfg b/data/core/terrain-graphics/internal-generic.cfg index 400a6d41ad2..1e36d7ecfa4 100644 --- a/data/core/terrain-graphics/internal-generic.cfg +++ b/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 diff --git a/data/core/terrain-graphics/overlay.cfg b/data/core/terrain-graphics/overlay.cfg index a9e495aab6b..2be691edf96 100644 --- a/data/core/terrain-graphics/overlay.cfg +++ b/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