Decreased the amount of images placed by NEW:GENERIC_CORNER_TRANSITION

wesnoth · Mar 19, 2016 · 40d5487 · 40d5487
1 parent 83ee4f6
commit 40d5487
Showing 1 changed file with 122 additions and 0 deletions.
diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
@@ -1473,13 +1473,106 @@
     [terrain_graphics]
         map="
 ,  2
+2,   2
+,  1
+2,   2
+,  2"
+        [tile]
+            pos=1
+            type={ADJACENT}
+            set_no_flag=corner_concave-@R0,corner_concave-@R1,corner_concave-@R2,corner_concave-@R3,corner_concave-@R4,corner_concave-@R5
+            [image]
+                name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png~BLIT(terrain/{MASKSTEM}-concave-2-@R1.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R2.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R3.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R4.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R5.png){MASKIPF})
+                layer={LAYER}
+            [/image]
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+        [/tile]
+
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+,  2
+.,   2
+,  1
+2,   2
+,  2"
+        [tile]
+            pos=1
+            type={ADJACENT}
+            set_no_flag=corner_concave-@R0,corner_concave-@R1,corner_concave-@R2,corner_concave-@R3
+            [image]
+                name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png~BLIT(terrain/{MASKSTEM}-concave-2-@R1.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R2.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R3.png){MASKIPF})
+                layer={LAYER}
+            [/image]
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+        [/tile]
+
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+,  2
+.,   2
+,  1
+.,   2
+,  2"
+        [tile]
+            pos=1
+            type={ADJACENT}
+            set_no_flag=corner_concave-@R0,corner_concave-@R1,corner_concave-@R2
+            [image]
+                name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png~BLIT(terrain/{MASKSTEM}-concave-2-@R1.png)~BLIT(terrain/{MASKSTEM}-concave-2-@R2.png){MASKIPF})
+                layer={LAYER}
+            [/image]
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+        [/tile]
+
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+,  2
+.,   2
+,  1
+.,   2
+,  ."
+        [tile]
+            pos=1
+            type={ADJACENT}
+            set_no_flag=corner_concave-@R0,corner_concave-@R1
+            [image]
+                name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png~BLIT(terrain/{MASKSTEM}-concave-2-@R1.png){MASKIPF})
+                layer={LAYER}
+            [/image]
+        [/tile]
+        [tile]
+            pos=2
+            type={TERRAINLIST}
+        [/tile]
+
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+,  2
 .,   2
 ,  1
 .,   .
 ,  ."
         [tile]
             pos=1
             type={ADJACENT}
+            set_no_flag=corner_concave-@R0
             [image]
                 name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-concave-2-@R0.png{MASKIPF})
                 layer={LAYER}
@@ -1495,6 +1588,33 @@
     [terrain_graphics]
         map="
 ,  2
+3,   3
+,  1
+.,   .
+,  ."
+        [tile]
+            pos=1
+            type={TERRAINLIST}
+        [/tile]
+        [tile]
+            pos=2
+            type={ADJACENT}
+            set_no_flag=corner_convex-@R0-@R5,corner_convex-@R5-@R0
+            [image]
+                name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-convex-@R0-@R5.png~BLIT(terrain/{MASKSTEM}-convex-@R5-@R0.png){MASKIPF})
+                layer={LAYER}
+            [/image]
+        [/tile]
+        [tile]
+            pos=3
+            type=!,{TERRAINLIST}
+        [/tile]
+
+        rotations=tr,r,br,bl,l,tl
+    [/terrain_graphics]
+    [terrain_graphics]
+        map="
+,  2
 .,   3
 ,  1
 .,   .
@@ -1506,6 +1626,7 @@
         [tile]
             pos=2
             type={ADJACENT}
+            set_no_flag=corner_convex-@R0-@R5
             [image]
                 name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-convex-@R0-@R5.png{MASKIPF})
                 layer={LAYER}
@@ -1536,6 +1657,7 @@
         [tile]
             pos=3
             type={ADJACENT}
+            set_no_flag=corner_convex-@R0-@R1
             [image]
                 name={IMAGESTEM}.png~MASK(terrain/{MASKSTEM}-convex-@R0-@R1.png{MASKIPF})
                 layer={LAYER}