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

Improvements to water castles

Browse source 
Makes sunken ruin use cobbles as its base, and improves transitions between various water castles.
This commit is contained in:
ln-zookeeper 2017-03-15 18:51:55 +02:00
parent e6fbba0e18
commit e4c71db719
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -533,7 +533,7 @@
{NEW:BASE Ch,Cha flat/road}
{NEW:BASE Chr flat/stone-path}
{NEW:BASE Kh* castle/cobbles-keep LAYER=-2}
{NEW:BASE Chw castle/sunken-ruin LAYER=-520 FLAG=sunken}
{NEW:BASE Chw castle/aquatic-castle/cobbles LAYER=-520 FLAG=sunken}
# swamp castle defined along with swamp above
{NEW:BASE Cv castle/elven/grounds}
@ -583,9 +583,9 @@
{DISABLE_BASE_TRANSITIONS_F (Km,Cm) non_submerged}
{DISABLE_BASE_TRANSITIONS (Km,Cm)}
{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}
{TRANSITION_COMPLETE_LF (Cm) (!,K*,C*,W*,Ss,Q*,X*) 0 non_fading castle/aquatic-castle/castle-to-ground}
{TRANSITION_COMPLETE_LF (Km) (!,K*,C*,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}
# Elven castle
@ -678,6 +678,11 @@
{NEW:TRANSITION !,Ket,Co*,!,C*,Ke* Co* -380 flat/dirt-dark FLAG=inside}
{NEW:TRANSITION Co* !,Ket,Co*,!,C*,Ke* -380 flat/dirt-dark}
# Base transitions between various water castles
# 33% is an arbitrary magic number with which the transparency looks good
{NEW:GENERIC_CORNER_TRANSITION Cme (Cm,Km,Chw) -330 castle/aquatic-camp/reef masks/long "~O(33%)" FLAG=aquaticbasetrans}
{NEW:GENERIC_CORNER_TRANSITION Cm,Km,Chw (Cme) -321 castle/aquatic-castle/cobbles masks/long "~O(33%)" FLAG=aquaticbasetrans}
#
# Cave

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

@ -139,7 +139,7 @@
probability=100
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
{TRANSITION_COMPLETE_LF ({CAMP},{KEEP}) (!,{KEEP},{CAMP},W*,Ss,Q*,X*) 0 non_fading {IMAGEPATH}/castle-to-ground}
{TRANSITION_COMPLETE_LF ({CAMP},{KEEP}) (!,{KEEP},{CAMP},W*,Ss,Q*,X*,C*,K*) 0 non_fading {IMAGEPATH}/castle-to-ground}
{TRANSITION_COMPLETE_LF ({CAMP}) ({KEEP}) -1 pool_edge {IMAGEPATH}/keep-rim}
# this macro was defined at the top of this file