much refined submerged land-to-water transitions...
...for most terrains, and layering glitch fixes.
J.W. Bjerk
|
|
@ -20,6 +20,7 @@ Version 1.9.1+svn:
|
|||
* Much improved lava transitions.
|
||||
* A new desaturated ocean color (Wog).
|
||||
* New Waterfall automatically placed between chasm and water or swamp.
|
||||
* New Sand-to-Water transitions
|
||||
* Animations:
|
||||
* Standing anims: Fencer, Spearman, Dwarf Guard.
|
||||
* Idle anims: 2 for the Spearman.
|
||||
|
|
|
|||
BIN
data/core/images/terrain/flat/shore-concave-bl-br.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
data/core/images/terrain/flat/shore-concave-bl-l.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
data/core/images/terrain/flat/shore-concave-br-bl.png
Normal file
|
After Width: | Height: | Size: 5.1 KiB |
BIN
data/core/images/terrain/flat/shore-concave-br-r.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
data/core/images/terrain/flat/shore-concave-l-bl.png
Normal file
|
After Width: | Height: | Size: 5.4 KiB |
BIN
data/core/images/terrain/flat/shore-concave-l-tl.png
Normal file
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/flat/shore-concave-r-br.png
Normal file
|
After Width: | Height: | Size: 5.3 KiB |
BIN
data/core/images/terrain/flat/shore-concave-r-tr.png
Normal file
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/flat/shore-concave-tl-l.png
Normal file
|
After Width: | Height: | Size: 5.7 KiB |
BIN
data/core/images/terrain/flat/shore-concave-tl-tr.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
data/core/images/terrain/flat/shore-concave-tr-r.png
Normal file
|
After Width: | Height: | Size: 5.5 KiB |
BIN
data/core/images/terrain/flat/shore-concave-tr-tl.png
Normal file
|
After Width: | Height: | Size: 5.2 KiB |
BIN
data/core/images/terrain/flat/shore-convex-bl-br.png
Normal file
|
After Width: | Height: | Size: 7.3 KiB |
BIN
data/core/images/terrain/flat/shore-convex-bl-l.png
Normal file
|
After Width: | Height: | Size: 8.3 KiB |
BIN
data/core/images/terrain/flat/shore-convex-br-bl.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
data/core/images/terrain/flat/shore-convex-br-r.png
Normal file
|
After Width: | Height: | Size: 8.4 KiB |
BIN
data/core/images/terrain/flat/shore-convex-l-bl.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
data/core/images/terrain/flat/shore-convex-l-tl.png
Normal file
|
After Width: | Height: | Size: 7.2 KiB |
BIN
data/core/images/terrain/flat/shore-convex-r-br.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
data/core/images/terrain/flat/shore-convex-r-tr.png
Normal file
|
After Width: | Height: | Size: 7.4 KiB |
BIN
data/core/images/terrain/flat/shore-convex-tl-l.png
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
data/core/images/terrain/flat/shore-convex-tl-tr.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
BIN
data/core/images/terrain/flat/shore-convex-tr-r.png
Normal file
|
After Width: | Height: | Size: 7.7 KiB |
BIN
data/core/images/terrain/flat/shore-convex-tr-tl.png
Normal file
|
After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 5.4 KiB After Width: | Height: | Size: 8.2 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.3 KiB After Width: | Height: | Size: 9.1 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 7.1 KiB After Width: | Height: | Size: 9.6 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 9.4 KiB |
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.4 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 9.7 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 8.7 KiB |
|
|
@ -668,7 +668,7 @@
|
|||
|
||||
|
||||
# water animation under swamp is not really visible, so we disable it for now
|
||||
{TRANSITION_COMPLETE_LB (Ss,Chs) (!,S*,W*,D*,H*,M*,A*) -230 ANIMATION_01 swamp/water-to-land}
|
||||
{TRANSITION_COMPLETE_LB (Ss,Chs) (!,S*,W*,H*,M*,A*) -230 ANIMATION_01 swamp/water-to-land}
|
||||
|
||||
|
||||
|
||||
|
|
@ -721,19 +721,21 @@
|
|||
{TRANSITION_COMPLETE_L (Sm) (R*,D*,Xv,_off^_usr) -310 swamp/mud-to-land}
|
||||
|
||||
# To make everything layer properly, these transitions for sand to R* occur higher than most of the desert transitions
|
||||
{TRANSITION_COMPLETE_L Dd R* -330 sand/desert}
|
||||
{TRANSITION_COMPLETE_L Ds R* -330 sand/beach}
|
||||
{TRANSITION_COMPLETE_L Hd R* -331 hills/desert}
|
||||
{TRANSITION_COMPLETE_L Dd R* -510 sand/desert}
|
||||
{TRANSITION_COMPLETE_L Ds R* -510 sand/beach}
|
||||
{TRANSITION_COMPLETE_L Hd R* -510 hills/desert}
|
||||
|
||||
# To test the new beach macro, uncomment this and then comment out the other
|
||||
# ones underneath it...
|
||||
#{NEW:BEACH D* W* sand/shore}
|
||||
|
||||
{NEW:BEACH D*,Hd W* sand/shore}
|
||||
|
||||
# Special sand to water transitions
|
||||
{TRANSITION_COMPLETE_LF D*,Hd (W*,Ss) -490 double sand/sand-out}
|
||||
{TRANSITION_COMPLETE_LF (W*,Ss) (Dd,Ds,Hd) -491 double sand/sand-in}
|
||||
{TRANSITION_COMPLETE_L (W*,Ss) (Dd,Ds,Hd) -492 sand/sand-in}
|
||||
{TRANSITION_COMPLETE_L D*,Hd (W*,Ss) -493 sand/sand-out}
|
||||
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,Ss) -499 hills/desert}
|
||||
#{TRANSITION_COMPLETE_LF D*,Hd (W*,Ss) -490 double sand/sand-out}
|
||||
#{TRANSITION_COMPLETE_LF (W*,Ss) (Dd,Ds,Hd) -491 double sand/sand-in}
|
||||
#{TRANSITION_COMPLETE_L (W*,Ss) (Dd,Ds,Hd) -492 sand/sand-in}
|
||||
#{TRANSITION_COMPLETE_L D*,Hd (W*,Ss) -493 sand/sand-out}
|
||||
{TRANSITION_COMPLETE_L Hd (!,Hd,Qx*,W*,Ss) -510 hills/desert}
|
||||
|
||||
|
||||
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai) -320 flat/road}
|
||||
|
|
@ -744,19 +746,19 @@
|
|||
{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*,Ai) -510 sand/beach}
|
||||
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*,Ai) -510 sand/desert}
|
||||
|
||||
|
||||
# Dirt transitions are double sided
|
||||
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*) Rd -370 inside flat/desert-road}
|
||||
{TRANSITION_COMPLETE_L Rd (!,Rd,W*,Ai,Q*) -371 flat/desert-road}
|
||||
{TRANSITION_COMPLETE_LF (!,Rd,Rr*,Hh*,M*,Q*,D*) Rd -370 inside flat/desert-road}
|
||||
{TRANSITION_COMPLETE_L Rd (!,Rd,W*,Ai,Q*,D*) -371 flat/desert-road}
|
||||
|
||||
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*) Re -379 inside flat/dirt}
|
||||
{TRANSITION_COMPLETE_L Re (!,Re,Rr*,W*,Ai,Q*) -380 flat/dirt}
|
||||
{TRANSITION_COMPLETE_LF (!,Re,Rr*,Hh*,M*,Q*,D*) Re -379 inside flat/dirt}
|
||||
{TRANSITION_COMPLETE_L Re (!,Re,Rr*,W*,Ai,Q*,D*) -380 flat/dirt}
|
||||
|
||||
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*) Rb -384 inside flat/dirt-dark}
|
||||
{TRANSITION_COMPLETE_L Rb (!,Rb,Rr*,W*,Ai,Q*) -388 flat/dirt-dark}
|
||||
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*,D*) Rb -384 inside flat/dirt-dark}
|
||||
{TRANSITION_COMPLETE_L Rb (!,Rb,Rr*,W*,Ai,Q*,D*) -388 flat/dirt-dark}
|
||||
|
||||
|
||||
# This complicated part keeps the submerged part of ice or a bank from drawing over the above-water parts of banks or ice
|
||||
|
|
@ -777,20 +779,21 @@
|
|||
# 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}
|
||||
|
||||
{TRANSITION_COMPLETE_LF (!,Chw,Khw,Khs,!,C*,K*) W* -510 submerged castle/castle-to-water}
|
||||
#{TRANSITION_COMPLETE_LF (!,Chw,Khw,Khs,!,C*,K*) W* -510 submerged castle/castle-to-water}
|
||||
|
||||
# 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 (R*,G*,Mm,Md,Mv,H*) W* -511 deeper-submerged flat/bank-out}
|
||||
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512 submerged cave/bank-to-water}
|
||||
{NEW:BEACH (R*,G*,U*,M*,H*,Xu*,Ql*,!,Chw,Khw,Khs,!,C*,K*) W* flat/shore}
|
||||
#{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 (R*,G*,Mm,Md,Mv,H*) W* -511 deeper-submerged flat/bank-out}
|
||||
#{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512 submerged cave/bank-to-water}
|
||||
|
||||
|
||||
|
||||
# Water Transitions below everything else
|
||||
|
||||
{TRANSITION_COMPLETE_LF Wwf (!,Wwf,!,W*,S*,D*,Xv,_off^_usr) -515 transition2 water/ford}
|
||||
{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
|
||||
|
|
|
|||