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

first steps in high-quality sand to water transitions.

Browse source
This commit is contained in:
J.W. Bjerk 2010-09-27 00:57:00 +00:00
parent 14f16c4209
commit d4f2e7f01f
14 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/core/images/terrain/sand/sand-in-n-ne-se-s-sw-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
data/core/images/terrain/sand/sand-in-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
data/core/images/terrain/sand/sand-in-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
data/core/images/terrain/sand/sand-in-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
data/core/images/terrain/sand/sand-in-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB

BIN
data/core/images/terrain/sand/sand-in-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
data/core/images/terrain/sand/sand-in-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.7 KiB

BIN
data/core/images/terrain/sand/sand-out-n.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
data/core/images/terrain/sand/sand-out-ne.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.9 KiB

BIN
data/core/images/terrain/sand/sand-out-nw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
data/core/images/terrain/sand/sand-out-s.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.6 KiB

BIN
data/core/images/terrain/sand/sand-out-se.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
data/core/images/terrain/sand/sand-out-sw.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

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

@ -663,7 +663,7 @@
#{TRANSITION_COMPLETE_LF (Mm,Hh) (W*,S*) -181 transition2 hills/regular}
{TRANSITION_COMPLETE_L (Hhd) (!,Hhd,W*,S*) -183 hills/dry}
#{TRANSITION_COMPLETE_LF (Hhd) (W*,S*) -184 transition2 hills/dry}
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,S*) -190 hills/desert}
{TRANSITION_COMPLETE_L Uh (!,Uh,W*,Ai) -200 cave/hills}
{TRANSITION_COMPLETE_L (Uu,Uh) (!,Uu,Uh,W*,Ai) -220 cave/floor}
@ -720,22 +720,34 @@
{TRANSITION_COMPLETE_L Aa (W*,Ss) -280 frozen/snow-to-water}
{TRANSITION_COMPLETE_L Aa (!,Aa,Qx*,G*) -281 frozen/snow}
# This transitions from bank to flat terrains.
{TRANSITION_COMPLETE_L (W*,Ai) (!,Rb,!,R*,Gll) -298 flat/bank}
{TRANSITION_COMPLETE_L (W*,Ai) (!,Rb,!,R*,Gll) -300 flat/bank}
# To make everything layer properly, these transitions for sand to R* occur higher than most of the desert transitions
{TRANSITION_COMPLETE_L Dd R* -310 sand/beach}
{TRANSITION_COMPLETE_L Ds R* -310 sand/desert}
{TRANSITION_COMPLETE_L Hd R* -311 hills/desert}
# Special sand to water transitions
{TRANSITION_COMPLETE_LF Dd,Ds,Hd (W*,S*) -490 double sand/sand-out}
{TRANSITION_COMPLETE_LF W*,S* (Dd,Ds,Hd) -491 double sand/sand-in}
{TRANSITION_COMPLETE_L W*,S* (Dd,Ds,Hd) -492 sand/sand-in}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (W*,Ss) -493 sand/sand-out}
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,S*) -499 hills/desert}
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai) -300 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai) -301 flat/road-clean}
{TRANSITION_COMPLETE_L Rp (!,Rp,W*,Ai) -310 flat/stone-path}
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai) -320 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai) -321 flat/road-clean}
{TRANSITION_COMPLETE_L Rp (!,Rp,W*,Ai) -322 flat/stone-path}
{TRANSITION_COMPLETE_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -320 transition2 embellishments/farm-veg-spring}
{TRANSITION_COMPLETE_LF *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*) -320 transition2 embellishments/mushroom-farm}
{TRANSITION_COMPLETE_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -330 transition2 embellishments/farm-veg-spring}
{TRANSITION_COMPLETE_LF *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*) -330 transition2 embellishments/mushroom-farm}
{TRANSITION_COMPLETE_L Ds (!,Ds,W*,S*,Ai) -500 sand/beach}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*,Ai) -500 sand/desert}
{TRANSITION_COMPLETE_L Ds (!,Ds,W*,S*) -330 sand/beach}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*) -360 sand/desert}
{TRANSITION_COMPLETE_L Dd R* -361 sand/desert}
# Dirt transitions are double sided
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*) Rd -370 inside flat/desert-road}
@ -755,11 +767,13 @@
{TRANSITION_COMPLETE_LF (Mm,Hh) Ai,W*,S* -482 non_submerged hills/regular-to-water}
{TRANSITION_COMPLETE_LF (Md,Hhd,Mv) Ai,W*,S* -482 non_submerged hills/dry-to-water}
{TRANSITION_COMPLETE_LF (R*,G*) Ai,W* -483 non_submerged flat/bank-to-ice}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) Ai,W*,S* -486 non_submerged cave/bank-to-ice}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) Ai,W*,S* -486 non_submerged cave/bank-to-ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -490 non_submerged frozen/ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -505 submerged frozen/ice-to-water}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*,D*) -485 non_submerged frozen/ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -505 submerged frozen/ice-to-water}
# we just draw this again (invisible below the base layer) to set the transition flags
{TRANSITION_COMPLETE_L Aa,Ha,Ms,Ai (W*,Ss) -1001 frozen/ice-to-water}
@ -769,8 +783,8 @@
# The same transition is repeated here because the non-submerged parts are different, so multiple lines are needed to make the submerged part line up
{TRANSITION_COMPLETE_LF (Mm,Hh) W* -511 submerged flat/bank-to-water}
{TRANSITION_COMPLETE_LF (Md,Hhd,Mv) W* -511 submerged flat/bank-to-water}
{TRANSITION_COMPLETE_LF (R*,G*) W* -511 submerged flat/bank-to-water}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512 submerged cave/bank-to-water}
{TRANSITION_COMPLETE_LF (R*,G*) W* -511 submerged sand/sand-to-water}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512 submerged cave/bank-to-water}
@ -787,22 +801,21 @@
### -- the other option no longer works due to water color changes
{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 () 150 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -551 "~CS(-40,0,30)" 150 water/ocean-blend} # Tropcial Ocean Color
{ANIMATED_WATER_15_TRANSITION Wog (!,Wog,!,W*,S*,D*,Hd) -551 "~CS(15,0,-30)" 150 water/ocean-blend} # grey ocean color
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,!,W*,S*,D*,Hd) -553 "~CS(40,0,-30)" 110 water/coast-tropical-long} # medium water color
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,Wwr,!,W*,S*,D*,Hd) -554 "~CS(60,0,-50)" 110 water/coast-tropical-long} # grey water color
{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,Wwr,!,W*,S*,D*,Hd) -558 "~CS(60,0,-50)" 110 water/coast-tropical-long} # grey water color
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,!,W*,S*,D*,Hd) -559 "~CS(40,0,-30)" 110 water/coast-tropical-long} # medium water color
{ANIMATED_WATER_15_TRANSITION Wog (!,Wog,!,W*,S*,D*,Hd) -551 "~CS(15,0,-30)" 150 water/ocean-blend} # grey ocean color
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -562 "~CS(-40,0,30)" 150 water/ocean-blend} # Tropcial Ocean Color
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -563 () 150 water/ocean-blend}
{TRANSITION_COMPLETE_L Dd,Ds,Hd (!,D*,Hd,!,W*,Ss) -564 sand/sand-to-water}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*) -551 () 150 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*) -551 "~CS(-40,0,30)" 150 water/ocean-blend} # Tropcial Ocean Color
{ANIMATED_WATER_15_TRANSITION Wog (!,Wog,!,W*,S*) -551 "~CS(15,0,-30)" 150 water/ocean-blend} # grey ocean color
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,!,W*,S*) -553 "~CS(40,0,-30)" 110 water/coast-tropical-long} # medium water color
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,Wwr,!,W*,S*) -554 "~CS(60,0,-50)" 110 water/coast-tropical-long} # grey water color
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*) -555 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*) -556 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Ss (!,Ss,!,W*) -557 () 110 swamp/water-long}
{ANIMATED_WATER_15_TRANSITION Wwt (!,Wwt,!,W*,S*) -560 () 110 water/coast-tropical-long}
{ANIMATED_WATER_15_TRANSITION Wwg (!,Wwg,Wwr,!,W*,S*) -558 "~CS(60,0,-50)" 110 water/coast-tropical-long} # grey water color
{ANIMATED_WATER_15_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,!,W*,S*) -559 "~CS(40,0,-30)" 110 water/coast-tropical-long} # medium water color
{ANIMATED_WATER_15_TRANSITION Wog (!,Wog,!,W*,S*) -551 "~CS(15,0,-30)" 150 water/ocean-blend} # grey ocean color
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*) -562 "~CS(-40,0,30)" 150 water/ocean-blend} # Tropcial Ocean Color
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*) -563 () 150 water/ocean-blend}
### This no longer works due to changes
# {TRANSITION_COMPLETE_LF Dd,Ds (!,D*,!,W*,S*) -550 transition3 sand/sand-to-water}