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

Elinminate the redundant TERRAIN_PATTERN formal in favor of TERRAINLIST.

Browse source
This commit is contained in:
Eric S. Raymond 2010-06-18 17:15:32 +00:00
parent 0e731f1ca7
commit dfb4239d83
3 changed files with 136 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

266
data/core/terrain-graphics/misc.cfg
View file

@ -272,7 +272,7 @@
#enddef
## this is defined separately for random variations for -n walls
#define WALL_1_VARIATION PROB TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_1_VARIATION PROB TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
, 2
@ -282,7 +282,7 @@
, *"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
@ -295,18 +295,18 @@
[/terrain_graphics]
#enddef
#define WALL_ADJACENT_1 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_1 TERRAINLIST ADJACENT BUILDER IMAGESTEM
## *-n wall uses up to 9 random variations, if present
{WALL_1_VARIATION 10 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}9}
{WALL_1_VARIATION 12 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}8}
{WALL_1_VARIATION 14 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}7}
{WALL_1_VARIATION 17 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}6}
{WALL_1_VARIATION 20 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}5}
{WALL_1_VARIATION 25 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}4}
{WALL_1_VARIATION 33 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}3}
{WALL_1_VARIATION 50 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}2}
{WALL_1_VARIATION 100 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_1_VARIATION 10 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}9}
{WALL_1_VARIATION 12 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}8}
{WALL_1_VARIATION 14 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}7}
{WALL_1_VARIATION 17 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}6}
{WALL_1_VARIATION 20 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}5}
{WALL_1_VARIATION 25 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}4}
{WALL_1_VARIATION 33 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}3}
{WALL_1_VARIATION 50 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}2}
{WALL_1_VARIATION 100 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
[terrain_graphics]
map="
@ -317,7 +317,7 @@
, *"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
@ -337,7 +337,7 @@
, *"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
@ -357,7 +357,7 @@
, 2"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
@ -377,7 +377,7 @@
, *"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
@ -397,7 +397,7 @@
, *"
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
@ -410,7 +410,7 @@
#enddef
## for random variations in n-ne and nw-n walls
#define WALL_2_VARIATION PROB TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_2_VARIATION PROB TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
, 3
@ -424,13 +424,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
@ -451,13 +451,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
@ -466,18 +466,18 @@
[/terrain_graphics]
#enddef
#define WALL_ADJACENT_2 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_2 TERRAINLIST ADJACENT BUILDER IMAGESTEM
## *-nw-n and *-n-ne facing use up to 9 random variations, if present
{WALL_2_VARIATION 10 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}9}
{WALL_2_VARIATION 12 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}8}
{WALL_2_VARIATION 14 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}7}
{WALL_2_VARIATION 17 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}6}
{WALL_2_VARIATION 20 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}5}
{WALL_2_VARIATION 25 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}4}
{WALL_2_VARIATION 33 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}3}
{WALL_2_VARIATION 50 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}2}
{WALL_2_VARIATION 100 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_2_VARIATION 10 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}9}
{WALL_2_VARIATION 12 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}8}
{WALL_2_VARIATION 14 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}7}
{WALL_2_VARIATION 17 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}6}
{WALL_2_VARIATION 20 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}5}
{WALL_2_VARIATION 25 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}4}
{WALL_2_VARIATION 33 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}3}
{WALL_2_VARIATION 50 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}2}
{WALL_2_VARIATION 100 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
[terrain_graphics]
map="
@ -492,13 +492,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
@ -518,13 +518,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
@ -544,13 +544,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
@ -570,13 +570,13 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
@ -585,7 +585,7 @@
#enddef
#define WALL_ADJACENT_3 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_3 TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
@ -600,19 +600,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
@ -632,19 +632,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
@ -664,19 +664,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
@ -696,19 +696,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
@ -728,19 +728,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
@ -760,19 +760,19 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
@ -781,7 +781,7 @@
#enddef
#define WALL_ADJACENT_4 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_4 TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
@ -796,25 +796,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
@ -834,25 +834,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
@ -872,25 +872,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
@ -910,25 +910,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
@ -948,25 +948,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
@ -986,25 +986,25 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
@ -1013,7 +1013,7 @@
#enddef
#define WALL_ADJACENT_5 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_5 TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
@ -1028,31 +1028,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
@ -1072,31 +1072,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
@ -1116,31 +1116,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
@ -1160,31 +1160,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
@ -1204,31 +1204,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-n
set_flag=wall-n
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
@ -1248,31 +1248,31 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-ne
set_flag=wall-ne
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-se
set_flag=wall-se
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-s
set_flag=wall-s
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-sw
set_flag=wall-sw
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
no_flag=wall-nw
set_flag=wall-nw
[/tile]
@ -1281,7 +1281,7 @@
#enddef
#define WALL_ADJACENT_6 TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM
#define WALL_ADJACENT_6 TERRAINLIST ADJACENT BUILDER IMAGESTEM
[terrain_graphics]
map="
@ -1296,32 +1296,32 @@
[/tile]
[tile]
pos=2
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-s
[/tile]
[tile]
pos=3
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-sw
[/tile]
[tile]
pos=4
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-nw
[/tile]
[tile]
pos=5
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-n
[/tile]
[tile]
pos=6
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-ne
[/tile]
[tile]
pos=7
type={TERRAIN_PATTERN}
type={TERRAINLIST}
set_flag=wall-se
[/tile]
{IMAGE_N_NE_SE_S_SW_NW {BUILDER} {IMAGESTEM}}
@ -1352,21 +1352,21 @@
[/terrain_graphics]
#enddef
#define WALL_ADJACENT TERRAIN_PATTERN ADJACENT BUILDER IMAGESTEM BASE_NAME
#define WALL_ADJACENT TERRAINLIST ADJACENT BUILDER IMAGESTEM BASE_NAME
{DISABLE_TRANSITIONS ({TERRAIN_PATTERN})}
{KEEP_BASE ({TERRAIN_PATTERN}) {BASE_NAME}}
{DISABLE_TRANSITIONS ({TERRAINLIST})}
{KEEP_BASE ({TERRAINLIST}) {BASE_NAME}}
{WALL_ADJACENT_6 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_5 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_4 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_3 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_2 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_1 ({TERRAIN_PATTERN}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_6 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_5 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_4 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_3 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_2 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
{WALL_ADJACENT_1 ({TERRAINLIST}) ({ADJACENT}) {BUILDER} {IMAGESTEM}}
# disable castle walls and cave
# note: commented out until these macros exist in trunk
#{DISABLE_CASTLES ({TERRAIN_PATTERN}) ({ADJACENT})}
#{DISABLE_CAVEWALL ({TERRAIN_PATTERN}) ({ADJACENT})}
#{DISABLE_CASTLES ({TERRAINLIST}) ({ADJACENT})}
#{DISABLE_CAVEWALL ({TERRAINLIST}) ({ADJACENT})}
#enddef

4
data/multiplayer/scenarios/ANL_utils/ANL_special_macros.cfg
View file

@ -13,14 +13,14 @@
[/gold]
#enddef
#define ANL_SHOW_IF TYPE TERRAIN_PATTERN
#define ANL_SHOW_IF TYPE TERRAINLIST
[show_if]
[have_unit]
side=$side_number
x,y=$x1,$y1
type={TYPE}
[filter_location]
terrain={TERRAIN_PATTERN}
terrain={TERRAINLIST}
[/filter_location]
[/have_unit]
[/show_if]

2
data/tools/wesnoth/wmltools.py
View file

@ -163,7 +163,7 @@ def formaltype(f):
ftype = "alignment"
elif f in ("TYPES",):
ftype = "types"
elif f.startswith("ADJACENT") or f.startswith("TERRAINLIST") or f.endswith("TERRAIN_PATTERN") or f == "RESTRICTING":
elif f.startswith("ADJACENT") or f.startswith("TERRAINLIST") or f == "RESTRICTING":
ftype = "terrain_pattern"
elif f.startswith("TERRAIN") or f.endswith("TERRAIN"):
ftype = "terrain_code"