Fixed transition issues with floor terrains, and some reformatting

Commit d63fe4a96e of #1939 changed the floor base image layering, causing problems with various terrains (cave floors, hills, mountains). This ought to fix them by letting the floors transition on top of those terrains, although it might not in all cases look as pleasing as the old way of having those terrains transition on top of floor. So, it might be desirable to supersede this with a different fix later.
This commit is contained in:
ln-zookeeper 2017-09-18 01:10:29 +03:00
parent f25e642257
commit c7365a20ef

View file

@ -716,15 +716,15 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
# installing new wood floor transitions - need to be above this DISABLE line
# be careful with wild-card filters: "I*r" includes "Irs"
{NEW:THREE_TERRAIN_TRANSITION Irs Q* G*,R*,D*,A*,W*,Ur,S* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs Q* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs W*,G*,R*,D*,A*,Ur,S* -84 interior/stone-regular}
{NEW:TRANSITION Irs Q* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION Irs !,Irs,!,I*r,Q*,W*,G*,R*,D*,A*,Ur,S* -84 interior/stone-regular}
{NEW:TRANSITION Iwr,Ior G*,R*,D*,A*,Ur -85 interior/wood-regular}
{NEW:TRANSITION Iwr W*,S*,Qx* -85 interior/wood-chasm/wood-clean}
{NEW:TRANSITION Ior W*,S*,Qx* -85 interior/wood-chasm/wood-regular}
{NEW:TRANSITION Iwr,Ior Ql* -85 interior/wood-chasm/wood-burnt}
{NEW:THREE_TERRAIN_TRANSITION Irs Q* G*,R*,D*,A*,W*,H*,M*,U*,S* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs Q* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION_CROWDED Irs G*,R*,D*,A*,W*,H*,M*,U*,S* -84 interior/stone-regular}
{NEW:TRANSITION Irs Q* -84 interior/stone-chasm/stone-regular}
{NEW:TRANSITION Irs !,Irs,!,I*r,Q*,W*,G*,R*,D*,A*,H*,M*,U*,S* -84 interior/stone-regular}
{NEW:TRANSITION Iwr,Ior G*,R*,D*,A*,H*,M*,U* -85 interior/wood-regular}
{NEW:TRANSITION Iwr W*,S*,Qx* -85 interior/wood-chasm/wood-clean}
{NEW:TRANSITION Ior W*,S*,Qx* -85 interior/wood-chasm/wood-regular}
{NEW:TRANSITION Iwr,Ior Ql* -85 interior/wood-chasm/wood-burnt}
{DISABLE_BASE_TRANSITIONS Qx*,Ql*,Xu*,Xo*,Cud,Kud}