Three carpet terrains (#2114)

Squash and merge for three carpets terrain PR.

* Initial commit for carpets.  WML, alignment, and demo only, images are unshaded place-holders.

* adding basic shading and better corner images

* completed shading for existing images

* refined large corner carpet rules

* got rid of some commented out leftovers

* initial commit for cave rug, Iwd

* regular carpet files, incomplete for now

* completed regular rug

* changed cave-rug underlayer to cave path instead of dark flagstones, and changed all rug terrain codes

* fixing some transition WML filtering for Urc (cave carpet)

data/core/terrain-graphics.cfg

@@ -478,7 +478,7 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 
 {NEW:BASE                Uu                                                        cave/floor}
 {NEW:BASE                Uue                                                       cave/earthy-floor}
-{NEW:BASE                Ur                                                        cave/path}
+{NEW:BASE                Ur,Urc                                                        cave/path}
 {NEW:BASE                Urb                                                       cave/flagstones-dark}
 {NEW:BASE                Uh                                                        cave/hills-variation}
 
@@ -536,9 +536,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:BASE                Ha                                                        hills/snow}
 
 # raised base to get it over the chasm images (LAYER=-284), then raised even higher to get over chasm-castle transition images (LAYER=-186)
-{NEW:BASE                Iwr                                                       interior/wood-regular LAYER=-284 FLAG=raised_base}
+{NEW:BASE                Iwr,Icn                                                       interior/wood-regular LAYER=-284 FLAG=raised_base}
 {NEW:BASE                Ior                                                       interior/wood-ruined LAYER=-284 FLAG=raised_base}
-{NEW:BASE                Irs                                                       interior/stone-regular LAYER=-284 FLAG=raised_base}
+{NEW:BASE                Irs,Icr                                                       interior/stone-regular LAYER=-284 FLAG=raised_base}
 
 
 # Water base terrains
@@ -747,18 +747,26 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 # (including dwarven castle, chasm, lava)
 #
 
+# carpet graphics are defined here, because we want the basic interior terrain graphics to fill in the gaps afterwards.
+
+{NEW:TRANSITION_INVERTED   Icr			!,Icr		-221		interior/royal-rug/rug FLAG=royal_rug}
+{NEW:TRANSITION_INVERTED   Icn			!,Icn		-223		interior/regular-rug/rug FLAG=regular_rug}
+# this one uses the Ur underlayer
+{NEW:DISABLE_TRANSITION 	(Urc)		(Uu*)	}
+{NEW:TRANSITION_INVERTED   Urc			!,Urc		-222		interior/cave-rug/rug FLAG=cave_rug}
+
 # 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*,Uu,Ur,S* 	-282 	interior/stone-chasm/stone-regular}
-{NEW:TRANSITION_CROWDED            Irs              Q*        -282               interior/stone-chasm/stone-regular}
-{NEW:TRANSITION_CROWDED            Irs              W*,G*,R*,D*,A*,Uu,Ur,S*        -282               interior/stone-regular}
-{NEW:TRANSITION            Irs              Q*        -282               interior/stone-chasm/stone-regular}
-{NEW:TRANSITION            Irs              !,Irs,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,S*        -282               interior/stone-regular}
-{NEW:TRANSITION            Iwr,Ior              G*,R*,D*,A*,Ur        -283               interior/wood-regular}
-{NEW:TRANSITION            Iwr              W*,S*,Qx*        -283               interior/wood-chasm/wood-clean}
+{NEW:THREE_TERRAIN_TRANSITION Irs,Icr 	Q* 	G*,R*,D*,A*,W*,Uu,Ur,Urc,S* 	-282 	interior/stone-chasm/stone-regular}
+{NEW:TRANSITION_CROWDED            Irs,Icr              Q*        -282               interior/stone-chasm/stone-regular}
+{NEW:TRANSITION_CROWDED            Irs,Icr              W*,G*,R*,D*,A*,Uu,Ur,Urc,S*        -282               interior/stone-regular}
+{NEW:TRANSITION            Irs,Icr              Q*        -282               interior/stone-chasm/stone-regular}
+{NEW:TRANSITION            Irs,Icr              !,Irs,Irr,!,I*r,Q*,W*,G*,R*,D*,A*,Uu,Ur,Urc,S*        -282               interior/stone-regular}
+{NEW:TRANSITION            Iwr,Ior,Icn              G*,R*,D*,A*,Ur,Urc        -283               interior/wood-regular}
+{NEW:TRANSITION            Iwr,Icn              W*,S*,Qx*        -283               interior/wood-chasm/wood-clean}
 {NEW:TRANSITION            Ior              W*,S*,Qx*        -283               interior/wood-chasm/wood-regular}
-{NEW:TRANSITION            Iwr,Ior              Ql*        -283               interior/wood-chasm/wood-burnt}
+{NEW:TRANSITION            Iwr,Ior,Icn              Ql*        -283               interior/wood-chasm/wood-burnt}
 
 {DISABLE_BASE_TRANSITIONS  Qx*,Ql*,Xu*,Xo*,Cud,Kud}
 
@@ -878,9 +886,9 @@ C*,K*,X*,Q*,W*,Ai,M*,*^V*,*^B*,_off^_usr#enddef
 {NEW:TRANSITION             Gs              Gg,Gd,Gll                          -257                 grass/semi-dry-long}
 
 
-{NEW:TRANSITION            Gs               (R*,D*,Aa,Ur)                    -260                   grass/semi-dry-medium}
-{NEW:TRANSITION            Gg               (R*,D*,Aa,Ur)                    -261                   grass/green-medium}
-{NEW:TRANSITION            Gd               (R*,D*,Aa,Ur)                    -262                   grass/dry-medium}
+{NEW:TRANSITION            Gs               (R*,D*,Aa,Ur,Urc)                    -260                   grass/semi-dry-medium}
+{NEW:TRANSITION            Gg               (R*,D*,Aa,Ur,Urc)                    -261                   grass/green-medium}
+{NEW:TRANSITION            Gd               (R*,D*,Aa,Ur,Urc)                    -262                   grass/dry-medium}
 
 
 {NEW:TRANSITION            Gll              (!,Gll,Q*,W*,Ai,C*,K*)            -270                  grass/leaf-litter}