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

Use alternate flag to work around conflicting transition for Mud Flat -> Water

Browse source
This commit is contained in:
Simon Forsyth 2011-09-11 20:25:57 +00:00
parent 9563af2c53
commit f5c47109e9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -807,6 +807,7 @@
{TRANSITION_COMPLETE_LF Wwf (!,Wwf,!,W*,S*,Xv,_off^_usr) -515 transition2 water/ford}
# Double-sided animated transitions for water-to-water and sand-to-water
{TRANSITION_COMPLETE_LF Sm (!,Sm,!,W*,D*,S*) -320 transition3 swamp/mud-long}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*) -550 () 150 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*) -551 "~CS(-45,-5,25)" 150 water/ocean-blend} # Tropcial Ocean Color
{ANIMATED_WATER_15_TRANSITION Wog (!,Wog,!,W*,S*) -552 "~CS(15,0,-30)" 150 water/ocean-blend} # grey ocean color
@ -814,7 +815,6 @@
{ANIMATED_WATER_15_TRANSITION Wwg,Wwrg (!,Wwg,Wwrg,!,W*,S*) -554 "~CS(60,0,-50)" 110 water/coast-tropical-long} # grey water color
{ANIMATED_WATER_15_TRANSITION Wwt,Wwrt (!,Wwt,Wwrt,!,W*,S*) -555 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*) -556 () 110 swamp/water-long}
{TRANSITION_COMPLETE_L Sm (!,Sm,!,W*,D*,S*) -558 swamp/mud-long}
{TRANSITION_COMPLETE_LB Wo (Xv,_off^_usr) -560 ANIMATION_15_SLOW water/ocean-long}
{ANIMATED_WATER_15_TRANSITION Wot (Xv,_off^_usr) -561 "~CS(-40,0,30)" 150 water/ocean-long} # Tropcial Ocean Color