Permalink
Browse files

Fixed several forest<->mountain layering glitches

This did necessitate changing the base coordinates in a way which does introduce a few undesirable cases of forests overlapping walls to their sw/se, but to me they seem less irritating than the problems with mountains.
  • Loading branch information...
ln-zookeeper committed Jan 30, 2016
1 parent 60f02a6 commit 6f9a6271a06a15f5c67d0c005c30a07ab7b60f67
Showing with 42 additions and 24 deletions.
  1. +21 −21 data/core/terrain-graphics/mountains.cfg
  2. +21 −3 data/core/terrain-graphics/new-macros.cfg
@@ -20,17 +20,17 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,107
base=90,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=142,72
base=144,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,107
base=198,107
[/image]
probability={PROB}
@@ -57,23 +57,23 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,107
base=90,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=144,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,107
base=198,73
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _4}
base=248,107
base=252,108
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _5}
base=304,107
base=306,144
[/image]
probability={PROB}
@@ -100,27 +100,27 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,107
base=90,144
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=144,107
base=144,108
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,107
base=198,73
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _4}
base=248,107
base=252,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _5}
base=304,107
base=306,107
[/image]
probability={PROB}
@@ -147,17 +147,17 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,128
base=90,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=142,144
base=144,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,180
base=198,144
[/image]
probability={PROB}
@@ -184,17 +184,17 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,180
base=90,144
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=142,144
base=144,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,128
base=198,107
[/image]
probability={PROB}
@@ -326,17 +326,17 @@
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _1}
base=88,107
base=90,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _2}
base=142,72
base=144,107
[/image]
[image]
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} _3}
base=196,107
base=198,107
[/image]
probability={PROB}
@@ -34,6 +34,10 @@
# {IMAGESTEM}-small[1-11].png on all {TERRAIN} adjacent to {ADJACENT}, and
# {IMAGESTEM}[1-11].png on all others.
# Note: normally base= coordinates are affected by rotations, but here that
# causes problems; this is why the rules for setting the flag for a small
# forest and placing the actual image are separate.
[terrain_graphics]
map="
, 2
@@ -44,7 +48,7 @@
[tile]
pos=1
type={TERRAINLIST}
set_no_flag=overlay
set_no_flag=smallforest
[/tile]
[tile]
@@ -53,12 +57,26 @@
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, *
*, *
, 1
*, *
, *"
[tile]
pos=1
type={TERRAINLIST}
has_flag=smallforest
set_no_flag=overlay
[/tile]
[image]
name={IMAGESTEM}-small@V.png
variations=";2;3;4;5;6;7;8;9;10;11"
layer=0
base=90,144
base=90,161
center=90,144
[/image]
[/terrain_graphics]
@@ -80,7 +98,7 @@
name={IMAGESTEM}@V.png
variations=";2;3;4;5;6;7;8;9;10;11"
layer=0
base=90,144
base=90,161
center=90,144
[/image]
[/terrain_graphics]

0 comments on commit 6f9a627

Please sign in to comment.