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

Draw Dwarven Castle <-> Chasm transitons under bridges

Browse source 
This isn't a perfect solution, since it still results in bridges drawing "over" caslte walls (except Stone Bridges),
which have special bridge <-> castle transitions). That was one of the reasons for 81659462eb, but this at least
prevents transitions from bring cut off. All bridges still draw under non-dwarven castles. In order to properly
get this effect with dwarven castles, the dwarven castle <-> chasm transition images would need to be split into
Castle and Chasm components (currently they're all one image).
This commit is contained in:
Charles Dang 2016-11-08 10:38:25 +11:00
parent e8ee1803c2
commit 0a6a1ab80e
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -724,9 +724,9 @@
#dwarven castle transitions
{WALL_TRANSITION3 (Cud,Kud) Ql* Qx* unwalkable/dcastle-lava-chasm}
{NEW:WALL2 (Cud,Kud) X* (!,Cud,Kud,X*) castle/dwarven-castle-wall}
{NEW:WALL2 (Cud,Kud) Ql* (!,Cud,Kud,Ql*) unwalkable/dcastle-lava}
{NEW:WALL2 (Cud,Kud) Qx* (!,Cud,Kud,Qx*) unwalkable/dcastle-chasm}
{NEW:WALL2_L (Cud,Kud) X* (!,Cud,Kud,X*) -89 castle/dwarven-castle-wall}
{NEW:WALL2_L (Cud,Kud) Ql* (!,Cud,Kud,Ql*) -89 unwalkable/dcastle-lava}
{NEW:WALL2_L (Cud,Kud) Qx* (!,Cud,Kud,Qx*) -89 unwalkable/dcastle-chasm}
{NEW:WALL (Cud,Kud) (!,Cud,Kud,X*) castle/dwarven-castle}

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

@ -1000,7 +1000,7 @@
[/terrain_graphics]
#enddef
#define NEW:WALL_P TERRAINLIST ADJACENT PROB IMAGESTEM
#define NEW:WALL_PL TERRAINLIST ADJACENT PROB LAYER IMAGESTEM
[terrain_graphics]
map="
2
@ -1026,7 +1026,7 @@
probability={PROB}
[image]
layer=0
layer={LAYER}
base=54,72
name={IMAGESTEM}@V-convex-@R0.png
variations=";2;3;4;5;6"
@ -1067,11 +1067,11 @@
#enddef
#define NEW:WALL TERRAINLIST ADJACENT IMAGESTEM
{NEW:WALL_P {TERRAINLIST} {ADJACENT} 100 {IMAGESTEM}}
{NEW:WALL_PL {TERRAINLIST} {ADJACENT} 100 0 {IMAGESTEM}}
#enddef
#define NEW:WALL2_P TERRAINLIST ADJACENT1 ADJACENT2 PROB IMAGESTEM
{NEW:WALL_P {TERRAINLIST} {ADJACENT1} {PROB} {IMAGESTEM}}
#define NEW:WALL2_P TERRAINLIST ADJACENT1 ADJACENT2 PROB LAYER IMAGESTEM
{NEW:WALL_PL {TERRAINLIST} {ADJACENT1} {PROB} {LAYER} {IMAGESTEM}}
[terrain_graphics]
map="
@ -1139,7 +1139,11 @@
#enddef
#define NEW:WALL2 TERRAINLIST ADJACENT1 ADJACENT2 IMAGESTEM
{NEW:WALL2_P {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {IMAGESTEM}}
{NEW:WALL2_P {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 0 {IMAGESTEM}}
#enddef
#define NEW:WALL2_L TERRAINLIST ADJACENT1 ADJACENT2 LAYER IMAGESTEM
{NEW:WALL2_P {TERRAINLIST} {ADJACENT1} {ADJACENT2} 100 {LAYER} {IMAGESTEM}}
#enddef
#define NEW:CASTLEWALL_INTERNAL_OPEN_ENDS TERRAINLIST ADJACENT ADJACENT_OPEN IMAGESTEM