From e7188fbfa813a5d00320b7afc92a20b066d52462 Mon Sep 17 00:00:00 2001 From: ln-zookeeper Date: Tue, 9 Feb 2016 09:19:15 +0200 Subject: [PATCH] Replace water->void transition with a simpler void->water transition --- data/core/terrain-graphics.cfg | 21 ++++--- data/core/terrain-graphics/new-macros.cfg | 77 +++++++++++++++++++++++ 2 files changed, 89 insertions(+), 9 deletions(-) diff --git a/data/core/terrain-graphics.cfg b/data/core/terrain-graphics.cfg index e67c6e789986..872851d23cba 100644 --- a/data/core/terrain-graphics.cfg +++ b/data/core/terrain-graphics.cfg @@ -780,7 +780,7 @@ # This transitions from bank to flat terrains. {TRANSITION_COMPLETE_L (W*,Ai) (R*,Gll) -300 flat/bank} -{TRANSITION_COMPLETE_L (Sm) (R*,D*,Xv,_off^_usr) -310 swamp/mud-to-land} +{TRANSITION_COMPLETE_L (Sm) (R*,D*) -310 swamp/mud-to-land} # To make everything layer properly, these transitions for sand to R* occur higher than most of the desert transitions {TRANSITION_COMPLETE_L Dd R* -319 sand/desert} @@ -836,7 +836,7 @@ # Water Transitions below everything else -{TRANSITION_COMPLETE_LF Wwf (!,Wwf,!,W*,Sm,Xv,_off^_usr) -515 transition2 water/ford} +{TRANSITION_COMPLETE_LF Wwf (!,Wwf,!,W*,Sm) -515 transition2 water/ford} # Double-sided animated transitions for water-to-water and sand-to-water {TRANSITION_COMPLETE_LF Sm (!,Sm,!,W*,D*) -556 transition3 swamp/mud-long} @@ -849,13 +849,16 @@ {NEW:WATER_342_180_TRANSITION Ww,Wwf,Wwr (!,Ww,Wwf,Wwr,!,W*,Sm) -554 "~O(50%)" water/water 17} {NEW:WATER_342_180_TRANSITION Wwt,Wwrt (!,Wwt,Wwrt,!,W*,Sm) -555 "~CS(5,20,10)~O(50%)" water/water 17} -{NEW:WATER_342_180_TRANSITION Wog Xv,_off^_usr -550 "~CS(20,0,-10)" water/ocean 21} -{NEW:WATER_342_180_TRANSITION Wo Xv,_off^_usr -551 "" water/ocean 21} -{NEW:WATER_342_180_TRANSITION Wot Xv,_off^_usr -552 "~CS(-5,15,10)" water/ocean 21} - -{NEW:WATER_342_180_TRANSITION Wwg,Wwrg Xv,_off^_usr -553 "~CS(10,-5,-10)" water/water 17} -{NEW:WATER_342_180_TRANSITION Ww,Wwf,Wwr Xv,_off^_usr -554 "" water/water 17} -{NEW:WATER_342_180_TRANSITION Wwt,Wwrt Xv,_off^_usr -555 "~CS(5,20,10)" water/water 17} +# We currently can't afford these extra rules to make the water transition nicely onto void and off-map, so +# instead we make void and off-map transition over water. +#{NEW:WATER_342_180_TRANSITION Wog Xv,_off^_usr -550 "~CS(20,0,-10)" water/ocean 21} +#{NEW:WATER_342_180_TRANSITION Wo Xv,_off^_usr -551 "" water/ocean 21} +#{NEW:WATER_342_180_TRANSITION Wot Xv,_off^_usr -552 "~CS(-5,15,10)" water/ocean 21} +#{NEW:WATER_342_180_TRANSITION Wwg,Wwrg Xv,_off^_usr -553 "~CS(10,-5,-10)" water/water 17} +#{NEW:WATER_342_180_TRANSITION Ww,Wwf,Wwr Xv,_off^_usr -554 "" water/water 17} +#{NEW:WATER_342_180_TRANSITION Wwt,Wwrt Xv,_off^_usr -555 "~CS(5,20,10)" water/water 17} +{NEW:GENERIC_CORNER_TRANSITION Xv W*,Sm -513 void/void} +{NEW:GENERIC_CORNER_TRANSITION _off^_usr W*,Sm -514 off-map/border} # chasm to abyss ecetera transition {TRANSITION_COMPLETE_LF Qxu,Qxe Qxua,Xv,_off^_usr -600 depths chasm/depths} diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg index ebc3e0fd28bc..894d8b1d66e2 100644 --- a/data/core/terrain-graphics/new-macros.cfg +++ b/data/core/terrain-graphics/new-macros.cfg @@ -1251,3 +1251,80 @@ rotations=tr,r,br,bl,l,tl [/terrain_graphics] #enddef + +#define NEW:GENERIC_CORNER_TRANSITION TERRAINLIST ADJACENT LAYER IMAGESTEM + [terrain_graphics] + map=" +, 2 +., 2 +, 1 +., . +, ." + [tile] + pos=1 + type={ADJACENT} + [image] + name={IMAGESTEM}.png~MASK(terrain/masks/concave-long-2-@R0.png) + 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/convex-long-@R0-@R5.png) + 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/convex-long-@R0-@R1.png) + layer={LAYER} + [/image] + [/tile] + + rotations=tr,r,br,bl,l,tl + [/terrain_graphics] +#enddef