Kill the unused CANYON macro and accoutrements.

The only add-on I have seen using it redefined it anyway
This commit is contained in:
Simon Forsyth 2011-10-29 02:47:30 +00:00
parent cf16559542
commit 512d38345a
2 changed files with 1 additions and 388 deletions

View file

@ -104,6 +104,7 @@ Version 1.9.9+svn:
(bug #18766)
* Fixed remaining time of day areas that should affect map borders in mainline
campaigns and MP scenarios (bug #16508)
* Removed CANYON and its associated terrain macros
Version 1.9.9:
* AI:

View file

@ -1,388 +0,0 @@
#textdomain wesnoth
#define TRANS_0 TERRAIN
[tile]
pos=2
type={TERRAIN}
no_flag=canyon-nt-@R3
[/tile]
#enddef
#define TRANS_1 TERRAIN
[tile]
pos=3
type={TERRAIN}
no_flag=canyon-nt-@R4
[/tile]
#enddef
#define TRANS_2 TERRAIN
[tile]
pos=4
type={TERRAIN}
no_flag=canyon-nt-@R5
[/tile]
#enddef
#define TRANS_3 TERRAIN
[tile]
pos=5
type={TERRAIN}
no_flag=canyon-nt-@R0
[/tile]
#enddef
#define TRANS_4 TERRAIN
[tile]
pos=6
type={TERRAIN}
no_flag=canyon-nt-@R1
[/tile]
#enddef
#define TRANS_5 TERRAIN
[tile]
pos=7
type={TERRAIN}
no_flag=canyon-nt-@R2
[/tile]
#enddef
#define CANYON TERRAIN IMAGESTEM
# Angles should not loop
[terrain_graphics]
map="
1,
, 3
2, 1
, .
1, ."
[tile]
pos=1
type={TERRAIN}
[/tile]
[tile]
pos=2
type={TERRAIN}
set_flag=canyon-nt-@R1
[/tile]
[tile]
pos=3
type={TERRAIN}
set_flag=canyon-nt-@R4
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
7, 3
, 1
6, 4
, 5"
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_2 {TERRAIN}}
{TRANS_3 {TERRAIN}}
{TRANS_4 {TERRAIN}}
{TRANS_5 {TERRAIN}}
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -all}
[/image]
no_flag="overlay"
set_flag="overlay"
[/tile]
# rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
6, 4
, 5"
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_2 {TERRAIN}}
{TRANS_3 {TERRAIN}}
{TRANS_4 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R2-@R3-@R4}
[/image]
no_flag=overlay
set_flag=overlay,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
., 4
, 5"
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_2 {TERRAIN}}
{TRANS_3 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R2-@R3}
[/image]
no_flag=overlay
set_flag=overlay,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
6, 4
, ."
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_2 {TERRAIN}}
{TRANS_4 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R2-@R4}
[/image]
no_flag=overlay
set_flag=overlay,canyon-nt-@R3,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
., 4
, ."
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_2 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R2}
[/image]
no_flag=overlay
set_flag=overlay,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
6, .
, ."
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_4 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R4}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
., .
, 5"
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
{TRANS_3 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1-@R3}
[/image]
no_flag=overlay
set_flag=overlay,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., 3
, 1
., .
, ."
{TRANS_0 {TERRAIN}}
{TRANS_1 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} -@R0-@R1}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., .
, 1
., .
, 5"
{TRANS_0 {TERRAIN}}
{TRANS_3 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} (-@R0-@R3)}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., .
, 1
., 4
, ."
{TRANS_0 {TERRAIN}}
{TRANS_2 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} (-@R0-@R2)}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R1,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, 2
., .
, 1
., .
, ."
{TRANS_0 {TERRAIN}}
[tile]
pos=2
type={TERRAIN}
[/tile]
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} (-@R0)}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
[/tile]
rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
[terrain_graphics]
map="
, .
., .
, 1
., .
, ."
[tile]
pos=1
type={TERRAIN}
[image]
layer=-1000
name={BUILD_IMAGE IMAGE_SINGLE {IMAGESTEM} ()}
[/image]
no_flag="overlay"
set_flag=overlay,canyon-nt-@R0,canyon-nt-@R1,canyon-nt-@R2,canyon-nt-@R3,canyon-nt-@R4,canyon-nt-@R5
[/tile]
# rotations=n,ne,se,s,sw,nw
[/terrain_graphics]
#enddef