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

Fixed glitches with aquatic castle keep and walls

Browse source 
As suggested by doofus-01.
This commit is contained in:
ln-zookeeper 2016-11-06 02:07:59 +02:00
parent 6ff5a78be2
commit fd43c513bc
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -611,7 +611,7 @@
# disable the next line to get the brown bank transition. It adds more images to the hex though.
{DISABLE_BASE_TRANSITIONS_F (Km,Cm) non_submerged}
{DISABLE_BASE_TRANSITIONS (Km,Cm)}
{AQUATIC:KEEP_CORNER_TRANSITION (Km) (Cm) (W*,Ss,Q*) (non_fading) (castle/aquatic-castle)}
{AQUATIC:KEEP_CORNER_TRANSITION (Km) (Cm) (W*,Ss,Q*) (X*) (non_fading) (castle/aquatic-castle)}
{TRANSITION_COMPLETE_LF (Cm) (!,Km*,Cm*,W*,Ss,Q*,X*) 0 non_fading castle/aquatic-castle/castle-to-ground}
{TRANSITION_COMPLETE_LF (Km) (!,Km*,Cm*,W*,Ss,Q*,X*) 0 non_fading castle/aquatic-castle/keep-to-ground}
{TRANSITION_COMPLETE_LF (Km) (W*,Ss) 0 non_fading castle/aquatic-castle/keep-to-water}

10
data/core/terrain-graphics/aquatic.cfg
View file

@ -147,7 +147,7 @@
#enddef
#define AQUATIC:KEEP_CORNER_TRANSITION KEEP CASTLE WATER FLAG IMAGESTEM
#define AQUATIC:KEEP_CORNER_TRANSITION KEEP CASTLE WATER OTHER FLAG IMAGESTEM
######################################################################
# special crowded cases - It may be possible to write better rules to avoid this, but the bloat isn't too bad yet.
@ -160,7 +160,7 @@
, ."
[tile]
pos=1
type=!,{KEEP},{CASTLE},{WATER}
type=!,{KEEP},{CASTLE},{WATER},{OTHER}
set_no_flag={FLAG}-[nw,n,ne]
# set_no_flag={FLAG}-[@R0,@R1,@R5]
[image]
@ -189,7 +189,7 @@
, ."
[tile]
pos=1
type=!,{KEEP},{CASTLE},{WATER}
type=!,{KEEP},{CASTLE},{WATER},{OTHER}
set_no_flag={FLAG}-[nw,n,ne]
# set_no_flag={FLAG}-[@R0,@R1,@R5]
[image]
@ -222,7 +222,7 @@
, ."
[tile]
pos=1
type=!,{KEEP},{CASTLE},{WATER}
type=!,{KEEP},{CASTLE},{WATER},{OTHER}
set_no_flag={FLAG}-[@R0,@R5]
@ -259,7 +259,7 @@
, ."
[tile]
pos=1
type=!,{KEEP},{CASTLE},{WATER}
type=!,{KEEP},{CASTLE},{WATER},{OTHER}
set_no_flag={FLAG}-[@R0,@R1]
[image]
layer=0