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

wire in new water tiles by rhyging5,

Browse Source 
...add new tropical-water terrain (alias to shallow water)

there is still a bug in ocean-A01-n to fix and some transitions will
probably need tweaking, but the base is in
This commit is contained in:
Jérémy Rosen 2010-04-26 18:41:20 +00:00
parent f56813b817
commit eab4e297f1
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog
View File

@ -26,6 +26,7 @@ Version 1.9.0-svn:
* added new mausoleum scenery * added new mausoleum scenery
* added new "snowy fort" * added new "snowy fort"
* added new "desert castle" * added new "desert castle"
* added new "tropical water"
* User interface: * User interface:
* Removed the unused gui2 menu bar * Removed the unused gui2 menu bar
* Added a window register framework * Added a window register framework

BIN
data/core/images/terrain/water/coast-tropical.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

@ -339,16 +339,12 @@
# Water base terrains # Water base terrains
#30% 30% 40% #ANIMATED
{TERRAIN_BASE_P Wo 30 water/ocean3} {TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}
{TERRAIN_BASE_P Wo 43 water/ocean2}
{TERRAIN_BASE Wo water/ocean}
#{TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}
#30% 30% 40% #30% 30% 40%
{TERRAIN_BASE_P Ww 30 water/coast3} {TERRAIN_BASE_B Ww ANIMATION_15 water/coast}
{TERRAIN_BASE_P Ww 43 water/coast2} {TERRAIN_BASE_B Wt ANIMATION_15 water/coast-tropical}
{TERRAIN_BASE Ww water/coast}
#33% 67% #33% 67%
{TERRAIN_BASE_P Wwf 33 water/ford2} {TERRAIN_BASE_P Wwf 33 water/ford2}
@ -577,10 +573,14 @@
# Water Transitions below everything else # Water Transitions below everything else
{TRANSITION_BASE_L (Ww,Wwr) (!,Ww,Wwr,Mm,Ms,Wwf) -520 water/coast} {TRANSITION_BASE_L (Wwr) (!,Ww,Wwr,Mm,Ms,Wwf) -520 water/coast}
{TRANSITION_BASE_L (Ww) (!,Ww,Wwr,Mm,Ms,Wwf,Wo,Wt) -520 water/coast}
{TRANSITION_BASE_L (Wt) (!,Ww,Wwr,Mm,Ms,Wwf,Wo,Wt) -520 water/coast-tropical}
{TRANSITION_BASE_L Wwf (!,Wwf) -530 water/ford} {TRANSITION_BASE_L Wwf (!,Wwf) -530 water/ford}
{TRANSITION_BASE_L Wo (!,Wo) -540 water/ocean} {TRANSITION_BASE_L Wo (!,Wo,Ww,Wt) -540 water/ocean}
#{TRANSITION_BASE_LB Wo Wo -550 ANIMATION_15 water/ocean} {TRANSITION_BASE_LB Wo W* -550 ANIMATION_15 water/ocean}
{TRANSITION_BASE_LB Ww W* -560 ANIMATION_15 water/coast}
{TRANSITION_BASE_LB Wt W* -565 ANIMATION_15 water/coast-tropical}
#WARNING : castles are at layer -1, probably to be fixed in 1.9 time #WARNING : castles are at layer -1, probably to be fixed in 1.9 time
{TRANSITION_BASE_LF Chw (Ch,Chr,Cha) 0 transition2 castle/sunken-ruin} {TRANSITION_BASE_LF Chw (Ch,Chr,Cha) 0 transition2 castle/sunken-ruin}
{TRANSITION_BASE_LF Chs (Ch,Chr,Cha) 0 transition2 swamp/water} {TRANSITION_BASE_LF Chs (Ch,Chr,Cha) 0 transition2 swamp/water}

11
data/core/terrain.cfg
View File

@ -1411,6 +1411,17 @@
editor_group=water editor_group=water
[/terrain_type] [/terrain_type]
[terrain_type]
symbol_image=water/coast-tropical
id=tropical_water
name= _ "Tropical Water"
string=Wt
aliasof=Ww
submerge=0.4
unit_height_adjust=-4
editor_group=water
[/terrain_type]
[terrain_type] [terrain_type]
symbol_image=water/ford symbol_image=water/ford
id=ford id=ford