Wrote new simpler custom terrain graphics macros for forests...

...and removed the directional next-to-castle variant images in favour
of non-directional small variants. Removed unused
TERRAIN_ADJACENT_VERTICAL and TERRAIN_ADJACENT_VERTICAL_FL macros. The
small pine and tropical tiles need work.
This commit is contained in:
Lari Nieminen 2009-03-20 23:25:27 +00:00
parent 8a33a34f6d
commit 14e1eb0739
42 changed files with 66 additions and 385 deletions

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

View file

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

View file

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View file

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View file

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

View file

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

View file

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

View file

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

View file

Before

Width:  |  Height:  |  Size: 8.7 KiB

After

Width:  |  Height:  |  Size: 8.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

View file

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

View file

@ -20,56 +20,38 @@
{BRIDGE *^Bw\ *^Bw| *^Bw/ (W*^,Ss^,Ai^) (C*,K*,*^F*) bridge}
# Forests
{SIMPLE_OVERLAY_TERRAIN *^Fp (C*,K*,X*,Ql*,Qx*,Gv*) forest/pine-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fp (W*,M*,Hd,*^V*) forest/pine-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fp (W*,M*,Hd,*^V*) forest/pine}
# SIMPLE_FOREST_TERRAIN defined in forests.cfg
{SIMPLE_FOREST_TERRAIN Hh*^Fp (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/pine-sparse}
{SIMPLE_FOREST_TERRAIN *^Fp (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/pine}
{SIMPLE_OVERLAY_TERRAIN *^Ft (C*,K*,X*,Ql*,Qx*,Gv*) forest/tropical-castle}
{SIMPLE_OVERLAY_TERRAIN *^Ft (W*,M*,Hd,*^V*) forest/tropical}
{SIMPLE_FOREST_TERRAIN *^Ft (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/tropical}
{SIMPLE_OVERLAY_TERRAIN *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*) forest/snow-forest-castle}
{SIMPLE_OVERLAY_TERRAIN Ha*^Fpa (W*,M*,Hd,*^V*) forest/snow-forest-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fpa (W*,M*,Hd,*^V*) forest/snow-forest}
{SIMPLE_FOREST_TERRAIN Ha*^Fpa (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/snow-forest-sparse}
{SIMPLE_FOREST_TERRAIN *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/snow-forest}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fds (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-summer-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fds (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-summer-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fds (W*,M*,Hd,*^V*) forest/deciduous-summer-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fds (W*,M*,Hd,*^V*) forest/deciduous-summer}
{SIMPLE_FOREST_TERRAIN Hh*^Fds (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-summer-sparse}
{SIMPLE_FOREST_TERRAIN *^Fds (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-summer}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fdf (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-fall-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fdf (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-fall-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fdf (W*,M*,Hd,*^V*) forest/deciduous-fall-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fdf (W*,M*,Hd,*^V*) forest/deciduous-fall}
{SIMPLE_FOREST_TERRAIN Hh*^Fdf (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-fall-sparse}
{SIMPLE_FOREST_TERRAIN *^Fdf (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-fall}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fdw (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-winter-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fdw (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-winter-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fdw (W*,M*,Hd,*^V*) forest/deciduous-winter-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fdw (W*,M*,Hd,*^V*) forest/deciduous-winter}
{SIMPLE_FOREST_TERRAIN Hh*^Fdw (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-winter-sparse}
{SIMPLE_FOREST_TERRAIN *^Fdw (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-winter}
{SIMPLE_OVERLAY_TERRAIN Ha*^Fda (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-winter-snow-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fda (C*,K*,X*,Ql*,Qx*,Gv*) forest/deciduous-winter-snow-castle}
{SIMPLE_OVERLAY_TERRAIN Ha*^Fda (W*,M*,Hd,*^V*) forest/deciduous-winter-snow-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fda (W*,M*,Hd,*^V*) forest/deciduous-winter-snow}
{SIMPLE_FOREST_TERRAIN Ha*^Fda (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-winter-snow-sparse}
{SIMPLE_FOREST_TERRAIN *^Fda (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/deciduous-winter-snow}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fms (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-summer-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fms (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-summer-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fms (W*,M*,Hd,*^V*) forest/mixed-summer-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fms (W*,M*,Hd,*^V*) forest/mixed-summer}
{SIMPLE_FOREST_TERRAIN Hh*^Fms (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-summer-sparse}
{SIMPLE_FOREST_TERRAIN *^Fms (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-summer}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fmf (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-fall-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fmf (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-fall-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fmf (W*,M*,Hd,*^V*) forest/mixed-fall-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fmf (W*,M*,Hd,*^V*) forest/mixed-fall}
{SIMPLE_FOREST_TERRAIN Hh*^Fmf (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-fall-sparse}
{SIMPLE_FOREST_TERRAIN *^Fmf (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-fall}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fmw (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-winter-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fmw (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-winter-castle}
{SIMPLE_OVERLAY_TERRAIN Hh*^Fmw (W*,M*,Hd,*^V*) forest/mixed-winter-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fmw (W*,M*,Hd,*^V*) forest/mixed-winter}
{SIMPLE_FOREST_TERRAIN Hh*^Fmw (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-winter-sparse}
{SIMPLE_FOREST_TERRAIN *^Fmw (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-winter}
{SIMPLE_OVERLAY_TERRAIN Ha*^Fma (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-winter-snow-sparse-castle}
{SIMPLE_OVERLAY_TERRAIN *^Fma (C*,K*,X*,Ql*,Qx*,Gv*) forest/mixed-winter-snow-castle}
{SIMPLE_OVERLAY_TERRAIN Ha*^Fma (W*,M*,Hd,*^V*) forest/mixed-winter-snow-sparse}
{SIMPLE_OVERLAY_TERRAIN *^Fma (W*,M*,Hd,*^V*) forest/mixed-winter-snow}
{SIMPLE_FOREST_TERRAIN Ha*^Fma (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-winter-snow-sparse}
{SIMPLE_FOREST_TERRAIN *^Fma (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*) forest/mixed-winter-snow}
{SIMPLE_OVERLAY_TERRAIN *^Uf* (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,Hd,*^V*) forest/mushrooms}

View file

@ -1,369 +1,68 @@
#textdomain wesnoth
#define TERRAIN_ADJACENT_VERTICAL_FL TERRAIN ADJACENT IMAGESTEM FLAG
#define SINGLE_FOREST_TILE TERRAINLIST PROB IMAGESTEM
[terrain_graphics]
map="
, 3
2, 4
, *
*, *
, 1
., .
, ."
*, *
, *"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-nw,{FLAG}-n,{FLAG}-ne
set_flag={FLAG}-nw,{FLAG}-n,{FLAG}-ne
type={TERRAINLIST}
no_flag=overlay
set_flag=overlay
[/tile]
[image]
base=36,4
name={IMAGESTEM}-nw-n-ne
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-se
set_flag={FLAG}-se
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-s
set_flag={FLAG}-s
[/tile]
[tile]
pos=4
type={TERRAIN}
no_flag={FLAG}-sw
set_flag={FLAG}-sw
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, 3
2, .
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-nw,{FLAG}-n
set_flag={FLAG}-nw,{FLAG}-n
[image]
base=36,4
name={IMAGESTEM}-nw-n
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-se
set_flag={FLAG}-se
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-s
set_flag={FLAG}-s
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, 3
., 4
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-n,{FLAG}-ne
set_flag={FLAG}-n,{FLAG}-ne
[image]
base=36,4
name={IMAGESTEM}-n-ne
[/image]
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-s
set_flag={FLAG}-s
[/tile]
[tile]
pos=4
type={TERRAIN}
no_flag={FLAG}-sw
set_flag={FLAG}-sw
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
2, .
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-nw
set_flag={FLAG}-nw
[image]
base=36,4
name={IMAGESTEM}-nw
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-se
set_flag={FLAG}-se
[/tile]
probability={PROB}
[image]
name={IMAGESTEM}
layer=0
base=90,144
center=90,144
[/image]
[/terrain_graphics]
#enddef
#define SINGLE_FOREST_TILE_RESTRICTED TERRAINLIST RESTRICTING PROB IMAGESTEM
[terrain_graphics]
map="
, 2
., .
*, *
, 1
., .
, ."
*, *
, *"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-n
set_flag={FLAG}-n
[image]
base=36,4
name={IMAGESTEM}-n
[/image]
type={TERRAINLIST}
no_flag=overlay
set_flag=overlay
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-s
set_flag={FLAG}-s
type={RESTRICTING}
[/tile]
probability={PROB}
rotations=n,ne,se,s,sw,nw
[image]
name={IMAGESTEM}
layer=0
base=90,144
center=90,144
[/image]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., 2
, 1
., .
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-ne
set_flag={FLAG}-ne
[image]
base=36,4
name={IMAGESTEM}-ne
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-sw
set_flag={FLAG}-sw
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
2, 4
, 3"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-sw,{FLAG}-s,{FLAG}-se
set_flag={FLAG}-sw,{FLAG}-s,{FLAG}-se
[image]
base=36,68
name={IMAGESTEM}-se-s-sw
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-ne
set_flag={FLAG}-ne
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-n
set_flag={FLAG}-n
[/tile]
[tile]
pos=4
type={TERRAIN}
no_flag={FLAG}-nw
set_flag={FLAG}-nw
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
2, .
, 3"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-sw,{FLAG}-s
set_flag={FLAG}-sw,{FLAG}-s
[image]
base=36,68
name={IMAGESTEM}-s-sw
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-ne
set_flag={FLAG}-ne
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-n
set_flag={FLAG}-n
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
., 4
, 3"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-s,{FLAG}-se
set_flag={FLAG}-s,{FLAG}-se
[image]
base=36,68
name={IMAGESTEM}-se-s
[/image]
[/tile]
[tile]
pos=3
type={TERRAIN}
no_flag={FLAG}-n
set_flag={FLAG}-n
[/tile]
[tile]
pos=4
type={TERRAIN}
no_flag={FLAG}-nw
set_flag={FLAG}-nw
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
2, .
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-sw
set_flag={FLAG}-sw
[image]
base=36,68
name={IMAGESTEM}-sw
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-ne
set_flag={FLAG}-ne
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
., .
, 2"
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-s
set_flag={FLAG}-s
[image]
base=36,68
name={IMAGESTEM}-s
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-n
set_flag={FLAG}-n
[/tile]
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
., 2
, ."
[tile]
pos=1
type={ADJACENT}
no_flag={FLAG}-se
set_flag={FLAG}-se
[image]
base=36,68
name={IMAGESTEM}-se
[/image]
[/tile]
[tile]
pos=2
type={TERRAIN}
no_flag={FLAG}-nw
set_flag={FLAG}-nw
[/tile]
[/terrain_graphics]
#enddef
#define TERRAIN_ADJACENT_VERTICAL TERRAIN ADJACENT IMAGESTEM
{TERRAIN_ADJACENT_VERTICAL_FL ({TERRAIN}) ({ADJACENT}) ({IMAGESTEM}) overlay}
#define SIMPLE_FOREST_TERRAIN TERRAINLIST RESTRICTING IMAGESTEM
{SINGLE_FOREST_TILE_RESTRICTED {TERRAINLIST} {RESTRICTING} 50 {IMAGESTEM}-small-2}
{SINGLE_FOREST_TILE_RESTRICTED {TERRAINLIST} {RESTRICTING} 100 {IMAGESTEM}-small}
{SINGLE_FOREST_TILE {TERRAINLIST} 25 {IMAGESTEM}-4}
{SINGLE_FOREST_TILE {TERRAINLIST} 33 {IMAGESTEM}-3}
{SINGLE_FOREST_TILE {TERRAINLIST} 50 {IMAGESTEM}-2}
{SINGLE_FOREST_TILE {TERRAINLIST} 100 {IMAGESTEM}}
#enddef