Skip to content

Commit

Permalink
Rule fixes by GbDorn. Fixes terrains drawing over chasm edges
Browse files Browse the repository at this point in the history 
http://forums.wesnoth.org/viewtopic.php?p=582670#p582670
  • Loading branch information
@Vultraz
Vultraz committed Mar 30, 2015
1 parent cd9eff3 commit 1f59316
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions data/core/terrain-graphics.cfg
View file
Expand Up @@ -715,9 +715,9 @@
{TRANSITION_COMPLETE_LF Ai,W*,S* Ur -223 inside cave/floor}
{TRANSITION_COMPLETE_L Urb (!,Urb) -224 cave/flagstones-dark}

{TRANSITION_COMPLETE_L Ss (!,Ss,H*,M*,A*,Chs,K*) -230 swamp/water}
{TRANSITION_COMPLETE_L Ss (!,Ss,H*,M*,A*,Chs,K*,Q*) -230 swamp/water}

{TRANSITION_COMPLETE_L Iwr G*,R*,W*,S*,D*,A*,Q*,Ur -230 interior/wood-regular}
{TRANSITION_COMPLETE_L Iwr G*,R*,W*,S*,D*,A*,Ur -230 interior/wood-regular}

{TRANSITION_COMPLETE_LF *^Efm G* -240 transition4 embellishments/flowers-mixed}

Expand All @@ -739,13 +739,13 @@
{TRANSITION_COMPLETE_L Gd (R*,D*,Aa,Ur) -262 grass/dry-medium}


{TRANSITION_COMPLETE_L Gll (!,Gll,Qx*,W*,Ai,C*,K*) -270 grass/leaf-litter}
{TRANSITION_COMPLETE_L (Gg*,Qx*) (!,Gg*,Qx*,Mm,Ms,Hh,C*,K*) -271 grass/green-abrupt}
{TRANSITION_COMPLETE_L Gs (!,Gs,Qx*,C*,K*) -272 grass/semi-dry-abrupt}
{TRANSITION_COMPLETE_L Gd (!,Gd,Qx*,C*,K*) -273 grass/dry-abrupt}
{TRANSITION_COMPLETE_L Gll (!,Gll,Q*,W*,Ai,C*,K*) -270 grass/leaf-litter}
{TRANSITION_COMPLETE_L (Gg*,Qx*) (!,Gg*,Q*,Mm,Ms,Hh,C*,K*) -271 grass/green-abrupt}
{TRANSITION_COMPLETE_L Gs (!,Gs,Q*,C*,K*) -272 grass/semi-dry-abrupt}
{TRANSITION_COMPLETE_L Gd (!,Gd,Q*,C*,K*) -273 grass/dry-abrupt}

{TRANSITION_COMPLETE_L Aa (W*,Ss) -280 frozen/snow-to-water}
{TRANSITION_COMPLETE_L Aa (!,Aa,Qx*,G*) -281 frozen/snow}
{TRANSITION_COMPLETE_L Aa (!,Aa,Q*,G*) -281 frozen/snow}


# This transitions from bank to flat terrains.
Expand All @@ -760,15 +760,15 @@
# A rule for corner-based beach waves...
{NEW:WAVES D*,Hd W* -499 water/waves}

{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_L Rr (!,Rr,W*,Ai,Q*) -320 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai,Q*) -321 flat/road-clean}
{TRANSITION_COMPLETE_L Rp (!,Rp,W*,Ai,Q*) -322 flat/stone-path}

{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_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*,Q*) -330 transition2 embellishments/farm-veg-spring}
{TRANSITION_COMPLETE_LF *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*,Q*) -330 transition2 embellishments/mushroom-farm}

{TRANSITION_COMPLETE_L Ds (!,Ds,W*,S*,Ai) -510 sand/beach}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*,Ai) -510 sand/desert}
{TRANSITION_COMPLETE_L Ds (!,Ds,W*,S*,Ai,Q*) -510 sand/beach}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*,Ai,Q*) -510 sand/desert}


# Dirt transitions are double sided
Expand Down

0 comments on commit 1f59316

Please sign in to comment.