upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-05 06:09:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Making the standard shallow water color-shifted from tropical.

Browse Source 
Removed extra water terrain.
This commit is contained in:
J.W. Bjerk 2010-09-19 15:58:48 +00:00
parent 5f85be6c93
commit 965ebc7bc6
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
data/core/terrain-graphics.cfg
View File

@ -437,8 +437,8 @@
# experimental macro using 1-hex rule to optimize water animation
{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(40,0,-30)" 110 water/coast-tropical}
#{GENERIC_SINGLEHEX_PLFB (Ww,Wwr) 100 -1000 base ANIMATION_15 water/coast}
{ANIMATED_WATER_15 (Ww,Wwr) "~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}
@ -788,16 +788,16 @@
{TRANSITION_COMPLETE_LF Dd,Ds,Hd (!,D*,Hd,!,W*,S*) -550 double sand/sand-to-water}
{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) -553 "~CS(40,0,-30)" 110 water/coast-tropical-long}
#{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,S*,D*,Hd) -552 () 110 water/coast-long}
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,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 Ww,Wwf,Wwr (!,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}

23
data/core/terrain.cfg
View File

@ -45,17 +45,6 @@
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
id=shallow_water
@ -65,6 +54,17 @@
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
@ -76,6 +76,7 @@
editor_group=water
[/terrain_type]
[terrain_type]
symbol_image=water/ford-tile
id=ford