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

fixed a couple transition glitches i couldn't figure out before.

Browse Source
This commit is contained in:
J.W. Bjerk 2010-06-13 19:48:57 +00:00
parent 5309f1ff46
commit 26fa7b3c39
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -327,11 +327,11 @@
{TERRAIN_BASE_RANDOM Wwr water/reef}
#8% 8% 8% 8% 23% 23% 23%
{TERRAIN_BASE_P Ss 8 swamp/water-flowers1}
{TERRAIN_BASE_P Ss 9 swamp/water-flowers2}
{TERRAIN_BASE_P Ss 10 swamp/water-plant1}
{TERRAIN_BASE_P Ss 11 swamp/water-plant2}
{TERRAIN_BASE_RANDOM Ss swamp/water}
#{TERRAIN_BASE_P Ss 8 swamp/water-flowers1}
#{TERRAIN_BASE_P Ss 9 swamp/water-flowers2}
#{TERRAIN_BASE_P Ss 10 swamp/water-plant1}
#{TERRAIN_BASE_P Ss 11 swamp/water-plant2}
{TERRAIN_BASE_RANDOM Ss swamp/swamp}
# Castle base terrains
@ -509,15 +509,15 @@
# a smooth coastline between grassland, hills and mountains.
#{TRANSITION_COMPLETE_LB (Gg*,Qxu,Mm,Ms,Hh*) Wo -260 ANIMATION_15 flat/grass-to-water}
{TRANSITION_COMPLETE_L (Gg*,Qxu,Mm,Ms,Hh*) W* -260 flat/grass-to-water}
#{TRANSITION_COMPLETE_L (Gg*,Qxu,Mm,Ms,Hh*) W* -260 flat/grass-to-water}
{TRANSITION_COMPLETE_L (Gg*,Qxu) (!,Gg*,Qxu,Mm,Ms,Hh) -270 flat/grass}
{TRANSITION_COMPLETE_LF (!,Ggf) Ggf -271 flower-transition flat/grass}
#{TRANSITION_COMPLETE_L Gll (W*,Ss) -278 forest/floor-to-water}
{TRANSITION_COMPLETE_L Gll (!,Gll,Qxu) -279 flat/leaf-litter}
{TRANSITION_COMPLETE_L Gs (W*,Ss) -280 flat/savanna-to-water}
#{TRANSITION_COMPLETE_L Gs (W*,Ss) -280 flat/savanna-to-water}
{TRANSITION_COMPLETE_L Gs (!,Gs,Qxu) -290 flat/savanna}
{TRANSITION_COMPLETE_L Gd (W*,Ss) -292 flat/grass-dry-to-water}
#{TRANSITION_COMPLETE_L Gd (W*,Ss) -292 flat/grass-dry-to-water}
{TRANSITION_COMPLETE_L Gd (!,Gd,Qxu) -294 flat/grass-dry}
{TRANSITION_COMPLETE_L Rr (!,Rr) -300 flat/road}
@ -533,15 +533,19 @@
{TRANSITION_COMPLETE_L Dd (Dd^V*) -340 desert}
{TRANSITION_COMPLETE_L Rd (Dd^V*) -350 flat/desert-road}
{TRANSITION_COMPLETE_L Rd (!,Rd,Dd) -351 flat/desert-road}
{TRANSITION_COMPLETE_L Rd W* -351 flat/desert-road-short}
{TRANSITION_COMPLETE_L Rd (!,Rd,Dd) -352 flat/desert-road}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd) -360 desert}
{TRANSITION_COMPLETE_L Dd R* -361 desert}
{TRANSITION_COMPLETE_LF (!,Re) Re -379 transition3 flat/dirt}
{TRANSITION_COMPLETE_L Re (!,Re) -380 flat/dirt}
### exparamental water's edge
{TRANSITION_COMPLETE_LF (R*,G*) W* -365 transition2 flat/dirt-to-water}
{TRANSITION_COMPLETE_LF (!,Rb) Rb -384 transition3 flat/dirt-dark}
{TRANSITION_COMPLETE_L Rb (!,Rb) -388 flat/dirt-dark}
{TRANSITION_COMPLETE_LF (!,Re) Re -379 transition3 flat/dirt}
{TRANSITION_COMPLETE_L Re (!,Re,W*) -380 flat/dirt}
{TRANSITION_COMPLETE_LF (!,Rb,W*) Rb -384 transition3 flat/dirt-dark}
{TRANSITION_COMPLETE_L Rb (!,Rb,W*) -388 flat/dirt-dark}
{TRANSITION_COMPLETE_LF (!,Chw,Khw,Khs,!,C*,K*) (Ai,W*) -480 non_submerged_part castle/castle-to-ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,Ss) -490 non_submerged_part frozen/ice}
@ -554,16 +558,16 @@
{TRANSITION_COMPLETE_LF Wwf (!,Wwf) -515 transition2 water/ford}
{TRANSITION_COMPLETE_L (Wwr) (!,Ww,Wwr,Mm,Ms,Wwf) -520 water/coast}
{TRANSITION_COMPLETE_L (Ww,Wwf) (!,Ww,Wwr,Mm,Ms,Wo,Wwt) -520 water/coast}
{TRANSITION_COMPLETE_L (Wwt) (!,Ww,Wwr,Mm,Ms,Wwf,Wo,Wwt) -520 water/coast-tropical}
{TRANSITION_COMPLETE_L Wo (!,Wo,Ww,Wwt) -540 water/ocean}
# For now don't need these non-animated transitions (i think...)
#{TRANSITION_COMPLETE_L (Wwr) (!,Ww,Wwr,Mm,Ms,Wwf) -520 water/coast}
#{TRANSITION_COMPLETE_L (Ww,Wwf) (!,Ww,Wwr,Mm,Ms,Wo,Wwt) -520 water/coast}
#{TRANSITION_COMPLETE_L (Wwt) (!,Ww,Wwr,Mm,Ms,Wwf,Wo,Wwt) -520 water/coast-tropical}
#{TRANSITION_COMPLETE_L Wo (!,Wo,Ww,Wwt) -540 water/ocean}
{TRANSITION_COMPLETE_LB (Ww,Wwf) W* -550 ANIMATION_15 water/coast}
{TRANSITION_COMPLETE_LB Wwt W* -555 ANIMATION_15 water/coast-tropical}
{TRANSITION_COMPLETE_LB Wo W* -560 ANIMATION_15 water/ocean}
#WARNING : castles are at layer -1, probably to be fixed in 1.9 time
{TRANSITION_COMPLETE_LF Chw (Ch,Chr,Cha) 0 transition2 castle/sunken-ruin}
{TRANSITION_COMPLETE_LF Chs (Ch,Chr,Cha) 0 transition2 swamp/water}