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

refinements to the auto-color water variations.

Browse source 
Note this is probably a speed regression due to previously disabled
animations being re-enabled.
This commit is contained in:
J.W. Bjerk 2010-09-19 11:37:18 +00:00
parent dc1a93ca41
commit 43fb7e53ad
4 changed files with 46 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/core/images/terrain/water/coast-grey-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
data/core/images/terrain/water/coast-medium-tile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.1 KiB

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

@ -438,8 +438,8 @@
{GENERIC_SINGLEHEX_PLFB (Wo) 100 -1000 base ANIMATION_15_SLOW water/ocean}
{GENERIC_SINGLEHEX_PLFB (Wot) 100 -1000 base ANIMATION_15_SLOW water/ocean-tropical}
{GENERIC_SINGLEHEX_PLFB (Ww,Wwr) 100 -1000 base ANIMATION_15 water/coast}
{ANIMATED_WATER_15 (Wwm) "~CS(45,-5,-50)" 110 water/coast-tropical}
{ANIMATED_WATER_15 (Wwg) "~CS(70,-15,-85)" 110 water/coast-tropical}
{ANIMATED_WATER_15 (Wwm) "~CS(40,0,-30)" 110 water/coast-tropical}
{ANIMATED_WATER_15 (Wwg) "~CS(65,5,-45)" 110 water/coast-tropical}
# water animation under ford is not really visible, so we disable it for now
{GENERIC_SINGLEHEX_PLFB (Wwf) 100 -1000 base ANIMATION_01 water/coast}
{GENERIC_SINGLEHEX_PLFB (Wwt) 100 -1000 base ANIMATION_15 water/coast-tropical}
@ -789,16 +789,18 @@
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -551 () 110 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -551 () 110 water/ocean-tropical-blend}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -552 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Wwm (!,Wwm,!,W*,S*,D*,Hd) -552 "~CS(45,-5,-50)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,!,W*,S*,D*,Hd) -552 "~CS(70,-15,-85)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -553 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -554 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -555 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -556 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -557 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -558 () 110 water/ocean-tropical-blend}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -558 () 110 water/ocean-blend}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (!,D*,Hd,!,W*,Ss) -559 sand/sand-to-water}
{ANIMATED_WATER_15_TRANSITION Wwm (!,Wwm,!,W*,S*,D*,Hd) -553 "~CS(40,0,-30)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,!,W*,S*,D*,Hd) -554 "~CS(65,5,-45)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -555 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -556 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*,D*,Hd) -557 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*,D*,Hd) -560 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,!,W*,S*,D*,Hd) -558 "~CS(65,5,-45)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwm (!,Wwm,!,W*,S*,D*,Hd) -559 "~CS(40,0,-30)" 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -561 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -562 () 110 water/ocean-tropical-blend}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -563 () 110 water/ocean-blend}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (!,D*,Hd,!,W*,Ss) -564 sand/sand-to-water}
# {TRANSITION_COMPLETE_LF Dd,Ds (!,D*,!,W*,S*) -550 transition3 sand/sand-to-water}
# {TRANSITION_COMPLETE_LFB Wo (!,Wo,!,W*,S*,D*) -551 transition3 ANIMATION_15_SLOW water/ocean-blend}

63
data/core/terrain.cfg
View file

@ -34,37 +34,6 @@
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast
id=shallow_water
name= _ "Shallow Water"
string=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=medium_tropical_water
# name= _ "Medium Shallow Water"
# editor_name= _ "Medium Tropical Shallow Water"
string=Wwm
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=gray_tropical_water
# name= _ "Gray Tropical Shallow Water"
# editor_name= _ "Gray Tropical Shallow Water"
string=Wwg
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=tropical_water
@ -76,6 +45,38 @@
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast
id=shallow_water
name= _ "Shallow Water"
string=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-medium-tile
id=medium_tropical_water
name= _ "Medium Shallow Water"
# editor_name= _ "Medium Shallow Water"
string=Wwm
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/coast-grey-tile
id=gray_tropical_water
name= _ "Gray Shallow Water"
# editor_name= _ "Gray Shallow Water"
string=Wwg
aliasof=Ww
submerge=0.4
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/ford-tile
id=ford