From 58ff9c42c86efd62f0598388c174e61ee990ded2 Mon Sep 17 00:00:00 2001
From: doofus-01 <doofus-01@users.noreply.github.com>
Date: Sun, 12 Nov 2017 14:56:57 -0800
Subject: [PATCH] hack to keep carpets from spilling into castles

---
 .../images/terrain/interior/carpet_mask.png   | Bin 0 -> 554 bytes
 data/core/terrain-graphics/new-macros.cfg     |  73 ++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 data/core/images/terrain/interior/carpet_mask.png

diff --git a/data/core/images/terrain/interior/carpet_mask.png b/data/core/images/terrain/interior/carpet_mask.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1ce17c5f09217641b068060b9d30987303af5ec
GIT binary patch
literal 554
zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>cu_bxCyD<C*!3BGlPX>x`7I;J!
zGca%qgD@k*tT_@uLG}_)Usv{r+&p6X$}Lh=pBWe!w|lxchE&{od*@=WvLTO)W8s58
z!OMyb*fyM4*Oj1RZ~E@>hSGB{neD4$7@3?LI5-#^8w3P^ECmIY79a~Kps2vY0+CWw
z084RjfTft2KvFFY4i0-BZ~l=}dh`35KhabAD;Dkdbl}i<xpaC%LZQP`Y1Wp8J#VIn
zZgSwrc+suLnAo_cKYu$=!H@fbstP(2roYw^<6vZ6cm9QOq{1VnRY&)`b8>J$X|-C+
z>g3S)+W6fXv5t-gtq<EZfm-*tq;GdP!WL4uX!rXAOdHJ<UK>Bq(-F{S-el+e?g-OH
zJ)ppgJRO18Oj-7)=j`6-u!iRZ7w=AC?jyGv)?8@Vy}@A(-wCeRI(D&+uZ*he1Gs@U
zsakDjRkB;KL^KOzflvAtpxZK9qZ}d>^smm;5n$qqS|}zUcH(p?8+S`XQ(OU1PfBae
zW}xdF^>?wda5HD!*HB=2(yG3uA1Kxw_v_Su&&cEQ1_zj+p#u&=YypQBx`=>3^1qhx
X)ejB%Q$N`*F#v(5tDnm{r-UW|f#SG`

literal 0
HcmV?d00001

diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
index 8213704950e8..a17ee1e8e28f 100644
--- a/data/core/terrain-graphics/new-macros.cfg
+++ b/data/core/terrain-graphics/new-macros.cfg
@@ -195,11 +195,84 @@ transition#endarg
     [/terrain_graphics]
 #enddef
 
+# this macro is used for the carpet images
 #define NEW:TRANSITION_INVERTED TERRAINLIST ADJACENT LAYER IMAGESTEM
 
 #arg FLAG
 transition_inverted#endarg
 
+# special hack to keep the horizontal carpet edges out of castles
+    [terrain_graphics]
+        map="
+, 3
+2 , 4
+, 1
+* , *
+, *"
+        [tile]
+            pos=1
+            type=C*,K*
+            set_no_flag={FLAG}-nw,{FLAG}-n,{FLAG}-ne
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-se
+        [/tile]
+        [tile]
+            pos=3
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-s
+        [/tile]
+        [tile]
+            pos=4
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-sw
+        [/tile]
+        [image]
+            name={IMAGESTEM}-nw-n-ne.png~MASK(terrain/interior/carpet_mask.png)
+            layer={LAYER}
+            base=161,161
+            center=90,144
+        [/image]
+
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+, *
+* , *
+, 1
+4 , 2
+, 3"
+        [tile]
+            pos=1
+            type=C*,K*
+            set_no_flag={FLAG}-se,{FLAG}-s,{FLAG}-sw
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-nw
+        [/tile]
+        [tile]
+            pos=3
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-n
+        [/tile]
+        [tile]
+            pos=4
+            type={TERRAINLIST}
+            set_no_flag={FLAG}-ne
+        [/tile]
+        [image]
+            name={IMAGESTEM}-se-s-sw.png~MASK(terrain/interior/carpet_mask.png)
+            layer={LAYER}
+            base=161,161
+            center=90,144
+        [/image]
+
+    [/terrain_graphics]
+
 # special big diagonal corner cases
 # N/S pointing corners
     [terrain_graphics]