Replaced feathered beach wave masks with hard-edged ones

This both improves performance slightly and eliminates glitches resulting from the feathered masks overlapping.
wesnoth · Feb 22, 2016 · e85d504 · e85d504
1 parent 67cf95a
commit e85d504
Show file tree

Hide file tree

Showing 31 changed files with 4 additions and 18 deletions.
diff --git a/data/core/images/terrain/masks/7hex-bl-br.png b/data/core/images/terrain/masks/7hex-bl-br.png
diff --git a/data/core/images/terrain/masks/7hex-bl-l.png b/data/core/images/terrain/masks/7hex-bl-l.png
diff --git a/data/core/images/terrain/masks/7hex-bl.png b/data/core/images/terrain/masks/7hex-bl.png
diff --git a/data/core/images/terrain/masks/7hex-br-bl.png b/data/core/images/terrain/masks/7hex-br-bl.png
diff --git a/data/core/images/terrain/masks/7hex-br-r.png b/data/core/images/terrain/masks/7hex-br-r.png
diff --git a/data/core/images/terrain/masks/7hex-br.png b/data/core/images/terrain/masks/7hex-br.png
diff --git a/data/core/images/terrain/masks/7hex-l-bl.png b/data/core/images/terrain/masks/7hex-l-bl.png
diff --git a/data/core/images/terrain/masks/7hex-l-tl.png b/data/core/images/terrain/masks/7hex-l-tl.png
diff --git a/data/core/images/terrain/masks/7hex-l.png b/data/core/images/terrain/masks/7hex-l.png
diff --git a/data/core/images/terrain/masks/7hex-r-br.png b/data/core/images/terrain/masks/7hex-r-br.png
diff --git a/data/core/images/terrain/masks/7hex-r-tr.png b/data/core/images/terrain/masks/7hex-r-tr.png
diff --git a/data/core/images/terrain/masks/7hex-r.png b/data/core/images/terrain/masks/7hex-r.png
diff --git a/data/core/images/terrain/masks/7hex-tl-l.png b/data/core/images/terrain/masks/7hex-tl-l.png
diff --git a/data/core/images/terrain/masks/7hex-tl-tr.png b/data/core/images/terrain/masks/7hex-tl-tr.png
diff --git a/data/core/images/terrain/masks/7hex-tl.png b/data/core/images/terrain/masks/7hex-tl.png
diff --git a/data/core/images/terrain/masks/7hex-tr-r.png b/data/core/images/terrain/masks/7hex-tr-r.png
diff --git a/data/core/images/terrain/masks/7hex-tr-tl.png b/data/core/images/terrain/masks/7hex-tr-tl.png
diff --git a/data/core/images/terrain/masks/7hex-tr.png b/data/core/images/terrain/masks/7hex-tr.png
diff --git a/data/core/images/terrain/water/waves-mask-bl-br.png b/data/core/images/terrain/water/waves-mask-bl-br.png
diff --git a/data/core/images/terrain/water/waves-mask-bl-l.png b/data/core/images/terrain/water/waves-mask-bl-l.png
diff --git a/data/core/images/terrain/water/waves-mask-br-bl.png b/data/core/images/terrain/water/waves-mask-br-bl.png
diff --git a/data/core/images/terrain/water/waves-mask-br-r.png b/data/core/images/terrain/water/waves-mask-br-r.png
diff --git a/data/core/images/terrain/water/waves-mask-l-bl.png b/data/core/images/terrain/water/waves-mask-l-bl.png
diff --git a/data/core/images/terrain/water/waves-mask-l-tl.png b/data/core/images/terrain/water/waves-mask-l-tl.png
diff --git a/data/core/images/terrain/water/waves-mask-r-br.png b/data/core/images/terrain/water/waves-mask-r-br.png
diff --git a/data/core/images/terrain/water/waves-mask-r-tr.png b/data/core/images/terrain/water/waves-mask-r-tr.png
diff --git a/data/core/images/terrain/water/waves-mask-tl-l.png b/data/core/images/terrain/water/waves-mask-tl-l.png
diff --git a/data/core/images/terrain/water/waves-mask-tl-tr.png b/data/core/images/terrain/water/waves-mask-tl-tr.png
diff --git a/data/core/images/terrain/water/waves-mask-tr-r.png b/data/core/images/terrain/water/waves-mask-tr-r.png
diff --git a/data/core/images/terrain/water/waves-mask-tr-tl.png b/data/core/images/terrain/water/waves-mask-tr-tl.png
diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
@@ -771,14 +771,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
-            random_start=no
-            layer={LAYER}
-            center=90,144
-            base=90,144
-        [/image]
-        [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
+            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -809,7 +802,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
+            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -841,14 +834,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
-            random_start=no
-            layer={LAYER}
-            center=90,144
-            base=90,144
-        [/image]
-        [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
+            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -879,7 +865,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
+            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
             random_start=no
             layer={LAYER}
             center=90,144