Author: zookeeper
Date: Sat Mar 8 20:18:15 2008
New Revision: 24425
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24425&view=rev
Log:
Fixed some small glitches between swamp transitions and other transitions.
Modified:
trunk/data/core/terrain-graphics/_final.cfg
Modified: trunk/data/core/terrain-graphics/_final.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/_final.cfg?rev=24425&r1=24424&r2=24425&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/_final.cfg (original)
+++ trunk/data/core/terrain-graphics/_final.cfg Sat Mar 8 20:18:15 2008
@@ -903,18 +903,20 @@
{TERRAIN_ADJACENT_CUSTOM -400 Aa,Ha,Ai (W*,Ss)
ice-to-water submerged_part}
{TERRAIN_ADJACENT_CUSTOM -242 Aa,Ha,Ai (W*,Ss)
ice non_submerged_part}
+{TERRAIN_ADJACENT -250 (Ss,Chs) (!,Ss,Chs,H*,M*,A*)
swamp/water}
+
{TERRAIN_ADJACENT -260 Gs (W*,Ss)
flat/savanna-to-water}
# These two work in conjunction with the mountain and hill transitions to
create
# a smooth coastline between grassland, hills and mountains.
-{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg*,Qxu,Mm,Hh,W*,Ss)
flat/grass}
+{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg*,Qxu,Mm,Hh,W*)
flat/grass}
{TERRAIN_ADJACENT -319 (Gg*,Qxu,Mm,Hh) W*
flat/grass-to-water}
{TERRAIN_ADJACENT -280 Gs (!,Gs,Qxu)
flat/savanna}
{TERRAIN_ADJACENT -290 Rr (!,Rr)
flat/road}
{TERRAIN_ADJACENT -300 Rp (!,Rp)
flat/stone-path}
-{TERRAIN_ADJACENT_CUSTOM -250 *^Gvs
(!,*^Gvs,C*,K*,*^F*,M*,H*,W*,S*) flat/farm-veg-spring transition2}
+{TERRAIN_ADJACENT_CUSTOM -250 *^Gvs
(!,*^Gvs,C*,K*,*^F*,M*,H*,W*) flat/farm-veg-spring transition2}
{TERRAIN_ADJACENT -259 Re (!,Re)
flat/dirt}
#{TERRAIN_ADJACENT -310 (Dd,Do) (!,Dd,Do)
desert-oasis}
@@ -942,8 +944,6 @@
{TERRAIN_ADJACENT_CUSTOM -505 (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud) W*
castle/castle-to-water transition2}
{TERRAIN_ADJACENT -503 Ai (!,Ai,Qxu)
ice}
-{TERRAIN_ADJACENT -515 (Ss,Chs) (!,Ss,Chs,H*,M*)
swamp/water}
-
{TERRAIN_ADJACENT -520 Ww (!,Ww,Mm)
water/coast}
{TERRAIN_ADJACENT -530 Wwf (!,Wwf)
water/ford}
{TERRAIN_ADJACENT -540 Wo (!,Wo)
water/ocean}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
