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

terrain-graphics - de-link flagging of Eff and Eqf (#5408)

Browse source
This commit is contained in:
doofus-01 2021-01-03 09:22:04 -08:00 • committed by GitHub
parent b3e77a656f
commit 4ca64655cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 63 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -355,7 +355,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# Fence
{NEW:FENCE *^Eff embellishments/fence}
# Iron Fence is also a barrier, hence the 'q'
{NEW:FENCE *^Eqf embellishments/fence-iron LAYER=0 BASE=108,144 CENTER=90,168 ALTERNATE=*^P*,X*}
{NEW:FENCE *^Eqf embellishments/fence-iron LAYER=0 BASE=108,144 CENTER=90,168 FLAG=ironfence ALTERNATE=*^P*,X*}
# Illuminated caves
{NEW:OVERLAY (*^Ufi,*^Ii,*^Tfi) cave/beam FLAG=light LAYER=1}

121
data/core/terrain-graphics/new-macros.cfg
View file

@ -1604,6 +1604,9 @@ corner#endarg
#arg CENTER
90,144#endarg
#arg FLAG
fence#endarg
# leaving blank appears to mean all terrains
#arg ALTERNATE
_fak#endarg
@ -1618,8 +1621,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,se,sw,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,se,sw,nw]
[/tile]
[tile]
@ -1645,8 +1648,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,se,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,se,nw]
[/tile]
[tile]
@ -1672,8 +1675,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[se,sw,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[se,sw,nw]
[/tile]
[tile]
@ -1699,8 +1702,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,se,sw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,se,sw]
[/tile]
[tile]
@ -1726,8 +1729,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,sw,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,sw,nw]
[/tile]
[tile]
@ -1753,8 +1756,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,se]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,se]
[/tile]
[tile]
@ -1780,8 +1783,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[sw,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[sw,nw]
[/tile]
[tile]
@ -1807,8 +1810,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[se,sw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[se,sw]
[/tile]
[tile]
@ -1834,8 +1837,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,nw]
[/tile]
[tile]
@ -1861,14 +1864,14 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-@R4
no_flag={FLAG}
set_flag={FLAG},{FLAG}-@R4
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-@R4
has_flag={FLAG}-@R4
[/tile]
rotations=n,ne,se,s,sw,nw
@ -1894,8 +1897,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-@R4
no_flag={FLAG}
set_flag={FLAG},{FLAG}-@R4
[/tile]
[tile]
@ -1926,8 +1929,8 @@ _fak#endarg
[tile]
pos=1
type={TERRAINLIST}
no_flag=fence
set_flag=fence,fence-[ne,se,sw,nw]
no_flag={FLAG}
set_flag={FLAG},{FLAG}-[ne,se,sw,nw]
[/tile]
[tile]
@ -1954,12 +1957,12 @@ _fak#endarg
[tile]
pos=1
type=X*,*^V*
set_flag=fence-X-hack
set_flag={FLAG}-X-hack
[/tile]
[tile]
pos=2
type=*^Eqf
type={TERRAINLIST}
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
@ -1973,14 +1976,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-ne
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-ne
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-sw
has_flag={FLAG}-sw
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -1992,14 +1995,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-ne
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-ne
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-ne
has_flag={FLAG}-ne
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2011,7 +2014,7 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack-ne
has_flag={FLAG}-X-hack-ne
[/tile]
[image]
@ -2032,14 +2035,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-nw
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-nw
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-se
has_flag={FLAG}-se
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2051,14 +2054,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-nw
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-nw
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-nw
has_flag={FLAG}-nw
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2070,7 +2073,7 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack-nw
has_flag={FLAG}-X-hack-nw
[/tile]
[image]
@ -2091,14 +2094,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-sw
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-sw
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-ne
has_flag={FLAG}-ne
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2110,14 +2113,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-sw
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-sw
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-sw
has_flag={FLAG}-sw
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2129,7 +2132,7 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack-sw
has_flag={FLAG}-X-hack-sw
[/tile]
[image]
@ -2150,14 +2153,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-se
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-se
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-nw
has_flag={FLAG}-nw
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2169,14 +2172,14 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack
set_flag=fence-X-hack-se
has_flag={FLAG}-X-hack
set_flag={FLAG}-X-hack-se
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-se
has_flag={FLAG}-se
[/tile]
[/terrain_graphics]
[terrain_graphics]
@ -2188,7 +2191,7 @@ _fak#endarg
, *"
[tile]
pos=1
has_flag=fence-X-hack-se
has_flag={FLAG}-X-hack-se
[/tile]
[image]
@ -2211,13 +2214,13 @@ _fak#endarg
[tile]
pos=1
type=!,{TERRAINLIST}
no_flag=fence-X-hack
no_flag={FLAG}-X-hack
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-@R4
has_flag={FLAG}-@R4
[/tile]
rotations=n,ne,se,s,sw,nw
@ -2245,13 +2248,13 @@ _fak#endarg
[tile]
pos=1
type={ALTERNATE}
no_flag=fence-X-hack
no_flag={FLAG}-X-hack
[/tile]
[tile]
pos=2
type={TERRAINLIST}
has_flag=fence-@R1
has_flag={FLAG}-@R1
[/tile]
rotations=n,ne,se,s,sw,nw