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

Expand GENERIC_SINGLEHEX_PLFB into TERRAIN_BASE_PLFB and variants

Browse source 
Allows the single-hex macro to be used without directly accessing the
internal macros

terrain-graphics.cfg updated to use non-internal macros

Satisfies comment at start of internal-* files
This commit is contained in:
Simon Forsyth 2011-09-23 22:11:59 +00:00
parent ad9a382658
commit f2b4eb2eff
2 changed files with 62 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -451,16 +451,16 @@
#ANIMATED
# experimental macro using 1-hex rule to optimize water animation
{GENERIC_SINGLEHEX_PLFB (Wo) 100 -1000 base ANIMATION_15_SLOW water/ocean}
{ANIMATED_WATER_15 (Wot) "~CS(-45,-5,25)" 150 water/ocean} # Tropical Ocean color
{ANIMATED_WATER_15 (Wog) "~CS(15,0,-30)" 150 water/ocean} # Grey Ocean color
{TERRAIN_BASE_SINGLEHEX_B (Wo) ANIMATION_15_SLOW water/ocean}
{ANIMATED_WATER_15 (Wot) "~CS(-45,-5,25)" 150 water/ocean} # Tropical Ocean color
{ANIMATED_WATER_15 (Wog) "~CS(15,0,-30)" 150 water/ocean} # Grey Ocean color
{ANIMATED_WATER_15 (Ww,Wwr,Wwf) "~CS(40,0,-30)" 110 water/coast-tropical} # Medium water color
{ANIMATED_WATER_15 (Wwg,Wwrg) "~CS(60,0,-55)" 110 water/coast-tropical} # Grey Water color
{GENERIC_SINGLEHEX_PLFB (Wwt,Wwrt) 100 -1000 base ANIMATION_15 water/coast-tropical}
{ANIMATED_WATER_15 (Ww,Wwr,Wwf) "~CS(40,0,-30)" 110 water/coast-tropical} # Medium water color
{ANIMATED_WATER_15 (Wwg,Wwrg) "~CS(60,0,-55)" 110 water/coast-tropical} # Grey Water color
{TERRAIN_BASE_SINGLEHEX_B (Wwt,Wwrt) ANIMATION_15 water/coast-tropical}
# water animation under swamp is not really visible, so we disable it for now
{GENERIC_SINGLEHEX_PLFB (S*) 100 -1000 base ANIMATION_01 swamp/water}
{TERRAIN_BASE_SINGLEHEX_B (S*) ANIMATION_01 swamp/water}
#temporary disabled normal multihex macro
#{TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}

55
data/core/terrain-graphics/base.cfg
View file

@ -17,6 +17,12 @@
#meta-macro TERRAIN_BASE_RANDOM TERRAINLIST L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
#define TERRAIN_BASE_SINGLEHEX_PLFB TERRAIN PROB LAYER FLAG BUILDER IMAGESTEM
{GENERIC_SINGLEHEX_PLFB ({TERRAIN}) ({PROB}) ({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#meta-macro TERRAIN_BASE_SINGLEHEX TERRAINLIST P=PROB=100 L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
###############################
# Needs one neighbour #
###############################
@ -189,6 +195,55 @@
#enddef
#end of generated code
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro TERRAIN_BASE_SINGLEHEX TERRAINLIST P=PROB=100 L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
#Please do not modify
#define TERRAIN_BASE_SINGLEHEX_LFB TERRAINLIST LAYER FLAG BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PFB TERRAINLIST PROB FLAG BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) -1000 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_FB TERRAINLIST FLAG BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 -1000 ({FLAG}) ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PLB TERRAINLIST PROB LAYER BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) base ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_LB TERRAINLIST LAYER BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 ({LAYER}) base ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PB TERRAINLIST PROB BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) -1000 base ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_B TERRAINLIST BUILDER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 -1000 base ({BUILDER}) ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PLF TERRAINLIST PROB LAYER FLAG IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_LF TERRAINLIST LAYER FLAG IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 ({LAYER}) ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PF TERRAINLIST PROB FLAG IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) -1000 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_F TERRAINLIST FLAG IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 -1000 ({FLAG}) IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_PL TERRAINLIST PROB LAYER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) ({LAYER}) base IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_L TERRAINLIST LAYER IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 ({LAYER}) base IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX_P TERRAINLIST PROB IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) ({PROB}) -1000 base IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#define TERRAIN_BASE_SINGLEHEX TERRAINLIST IMAGESTEM
{TERRAIN_BASE_SINGLEHEX_PLFB ({TERRAINLIST}) 100 -1000 base IMAGE_SINGLE ({IMAGESTEM})}
#enddef
#end of generated code
#The following code is autogenerated by expand-terrain-macros.py
#generated from: #meta-macro TERRAIN_BASE_RESTRICTED TERRAIN ADJACENT P=PROB=100 L=LAYER=-1000 F=FLAG=base B=BUILDER=IMAGE_SINGLE IMAGESTEM
#Please do not modify
#define TERRAIN_BASE_RESTRICTED_LFB TERRAIN ADJACENT LAYER FLAG BUILDER IMAGESTEM