hack to keep carpets from spilling into castles

wesnoth · Nov 12, 2017 · 58ff9c4 · 58ff9c4
1 parent e02c4a1
commit 58ff9c4
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 0 deletions.
diff --git a/data/core/images/terrain/interior/carpet_mask.png b/data/core/images/terrain/interior/carpet_mask.png
diff --git 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]