From b7edf367c3b665ff9204ca1aef0cd5462b6a6333 Mon Sep 17 00:00:00 2001 From: ln-zookeeper Date: Sat, 19 Mar 2016 11:45:58 +0200 Subject: [PATCH] Made water overlay transitions use NEW:GENERIC_CORNER_TRANSITION --- data/core/terrain-graphics/new-macros.cfg | 473 +++++++++------------- 1 file changed, 200 insertions(+), 273 deletions(-) diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg index a95214ed9ca6..bbe9ced47068 100644 --- a/data/core/terrain-graphics/new-macros.cfg +++ b/data/core/terrain-graphics/new-macros.cfg @@ -164,6 +164,205 @@ [/terrain_graphics] #enddef +#define NEW:GENERIC_CORNER_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM MASKSTEM MASKIPF + [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} + [/image] + [/tile] + [tile] + pos=2 + type={TERRAINLIST} + [/tile] + + rotations=tr,r,br,bl,l,tl + [/terrain_graphics] + [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 +., . +, ." + [tile] + pos=1 + type={TERRAINLIST} + [/tile] + [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} + [/image] + [/tile] + [tile] + pos=3 + type=!,{TERRAINLIST} + [/tile] + + rotations=tr,r,br,bl,l,tl + [/terrain_graphics] + [terrain_graphics] + map=" +, 2 +., 3 +, 1 +., . +, ." + [tile] + pos=1 + type={TERRAINLIST} + [/tile] + [tile] + pos=2 + type=!,{TERRAINLIST} + [/tile] + [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} + [/image] + [/tile] + + rotations=tr,r,br,bl,l,tl + [/terrain_graphics] +#enddef + #define NEW:FOREST TERRAINLIST ADJACENT IMAGESTEM # This assumes centered images. Places the images named # {IMAGESTEM}-small[1-11].png on all {TERRAIN} adjacent to {ADJACENT}, and @@ -1324,80 +1523,7 @@ #enddef #define NEW:WATER_342_180_OVERLAY_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM OPACITY - [terrain_graphics] - map=" -, 2 -., 2 -, 1 -., . -, ." - [tile] - pos=1 - type={ADJACENT} - [image] - name={IMAGESTEM}.png~MASK(terrain/masks/long-concave-2-@R0.png~O({OPACITY})) - layer={LAYER} - [/image] - [/tile] - [tile] - pos=2 - type={TERRAINLIST} - [/tile] - - rotations=tr,r,br,bl,l,tl - [/terrain_graphics] - [terrain_graphics] - map=" -, 2 -., 3 -, 1 -., . -, ." - [tile] - pos=1 - type={TERRAINLIST} - [/tile] - [tile] - pos=2 - type={ADJACENT} - [image] - name={IMAGESTEM}.png~MASK(terrain/masks/long-convex-@R0-@R5.png~O({OPACITY})) - 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 -., . -, ." - [tile] - pos=1 - type={TERRAINLIST} - [/tile] - [tile] - pos=2 - type=!,{TERRAINLIST} - [/tile] - [tile] - pos=3 - type={ADJACENT} - [image] - name={IMAGESTEM}.png~MASK(terrain/masks/long-convex-@R0-@R1.png~O({OPACITY})) - layer={LAYER} - [/image] - [/tile] - - rotations=tr,r,br,bl,l,tl - [/terrain_graphics] + {NEW:GENERIC_CORNER_TRANSITION {TERRAINLIST} {ADJACENT} {LAYER} {IMAGESTEM} "masks/long" "~O({OPACITY})"} #enddef #define NEW:WATER_342_180_TRANSITION TERRAINLIST ADJACENT LAYER IPF IMAGESTEM FRAMES @@ -1468,202 +1594,3 @@ rotations=tr,r,br,bl,l,tl [/terrain_graphics] #enddef - -#define NEW:GENERIC_CORNER_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM MASKSTEM MASKIPF - [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} - [/image] - [/tile] - [tile] - pos=2 - type={TERRAINLIST} - [/tile] - - rotations=tr,r,br,bl,l,tl - [/terrain_graphics] - [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 -., . -, ." - [tile] - pos=1 - type={TERRAINLIST} - [/tile] - [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} - [/image] - [/tile] - [tile] - pos=3 - type=!,{TERRAINLIST} - [/tile] - - rotations=tr,r,br,bl,l,tl - [/terrain_graphics] - [terrain_graphics] - map=" -, 2 -., 3 -, 1 -., . -, ." - [tile] - pos=1 - type={TERRAINLIST} - [/tile] - [tile] - pos=2 - type=!,{TERRAINLIST} - [/tile] - [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} - [/image] - [/tile] - - rotations=tr,r,br,bl,l,tl - [/terrain_graphics] -#enddef