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

Made NEW:GENERIC_CORNER_TRANSITION take arguments for mask and mask IPF

Browse source
This commit is contained in:
ln-zookeeper 2016-03-06 23:35:55 +02:00
parent 4b5d0734e8
commit 16b3cd6127
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -850,8 +850,8 @@
#{NEW:WATER_342_180_TRANSITION Wwg,Wwrg Xv,_off^_usr -553 "~CS(10,-5,-10)" water/water 17}
#{NEW:WATER_342_180_TRANSITION Ww,Wwf,Wwr Xv,_off^_usr -554 "" water/water 17}
#{NEW:WATER_342_180_TRANSITION Wwt,Wwrt Xv,_off^_usr -555 "~CS(5,20,10)" water/water 17}
{NEW:GENERIC_CORNER_TRANSITION Xv W*,Sm -513 void/void}
{NEW:GENERIC_CORNER_TRANSITION _off^_usr W*,Sm -514 off-map/border}
{NEW:GENERIC_CORNER_TRANSITION Xv W*,Sm -513 void/void masks/long ()}
{NEW:GENERIC_CORNER_TRANSITION _off^_usr W*,Sm -514 off-map/border masks/long ()}
# chasm to abyss ecetera transition
{TRANSITION_COMPLETE_LF Qxu,Qxe Qxua,Xv,_off^_usr -600 depths chasm/depths}

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

@ -1475,7 +1475,7 @@
[/terrain_graphics]
#enddef
#define NEW:GENERIC_CORNER_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM
#define NEW:GENERIC_CORNER_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM MASKSTEM MASKIPF
[terrain_graphics]
map="
, 2
@ -1487,7 +1487,7 @@
pos=1
type={ADJACENT}
[image]
name={IMAGESTEM}.png~MASK(terrain/masks/long-concave-2-@R0.png)
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png{MASKIPF})
layer={LAYER}
[/image]
[/tile]
@ -1513,7 +1513,7 @@
pos=2
type={ADJACENT}
[image]
name={IMAGESTEM}.png~MASK(terrain/masks/long-convex-@R0-@R5.png)
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-convex-@R0-@R5.png{MASKIPF})
layer={LAYER}
[/image]
[/tile]
@ -1543,7 +1543,7 @@
pos=3
type={ADJACENT}
[image]
name={IMAGESTEM}.png~MASK(terrain/masks/long-convex-@R0-@R1.png)
name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-convex-@R0-@R1.png{MASKIPF})
layer={LAYER}
[/image]
[/tile]