Fixed castle transitions not working.
This commit is contained in:
Philippe Plantier
parent
b733eba693
commit
735cf7fc7f
4 changed files with 83 additions and 121 deletions
|
|
@ -160,5 +160,6 @@ name=moveto
|
|||
letter=r
|
||||
[/terrain]
|
||||
[/event]
|
||||
|
||||
[/test]
|
||||
|
||||
|
|
|
|||
|
|
@ -23,11 +23,11 @@
|
|||
|
||||
# Castle-specific transitions. Those are placed before base terrains, as they
|
||||
# override the normal base terrain.
|
||||
#{CASTLE_TRANSITION CK f grassland-r4 forest-ctrans}
|
||||
{CASTLE_TRANSITION CK f forest-ctrans}
|
||||
#Special cases for encampment (nw, nw-n-ne and ne)
|
||||
#{CASTLE_TRANSITION nK f grassland-r4 forest-etrans}
|
||||
{CASTLE_TRANSITION nK f forest-etrans}
|
||||
#On the rest fall back on forest-castle
|
||||
#{CASTLE_TRANSITION nK f grassland-r4 forest-ctrans}
|
||||
{CASTLE_TRANSITION nK f forest-ctrans}
|
||||
|
||||
#
|
||||
# Attachs graphics to each known terrain types
|
||||
|
|
@ -146,40 +146,40 @@
|
|||
|
||||
# Loyalist castle
|
||||
{DISABLE_TRANSITIONS C}
|
||||
{TERRAIN_ADJACENT_CORNER C !CK !CK castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !CK C C castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER K C C keep-inside}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !CK !CK keep-of-C keep-wall}
|
||||
{TERRAIN_ADJACENT_CORNER K !CK C keep-wall-0}
|
||||
{TERRAIN_ADJACENT_CORNER K C !CK keep-wall-1}
|
||||
{TERRAIN_ADJACENT_CORNER C !CK !CK 52,76 castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !CK C C 56,68 castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER K C C 54,72 keep-inside}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !CK !CK 52,76 keep-of-C keep-wall}
|
||||
{TERRAIN_ADJACENT_CORNER K !CK C 52,72 keep-wall-0}
|
||||
{TERRAIN_ADJACENT_CORNER K C !CK 56,76 keep-wall-1}
|
||||
|
||||
# Encampments
|
||||
{DISABLE_TRANSITIONS n}
|
||||
{TERRAIN_ADJACENT_CORNER n !nK !nK encampment-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !nK n n encampment-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !nK !nK keep-of-n encampment-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !nK K n encampment-concave}
|
||||
{TERRAIN_ADJACENT_CORNER !nK n K encampment-concave}
|
||||
{TERRAIN_ADJACENT_CORNER n !nK !nK 52,76 encampment-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !nK n n 56,68 encampment-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !nK !nK 52,76 keep-of-n encampment-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !nK K n 52,76 encampment-concave}
|
||||
{TERRAIN_ADJACENT_CORNER !nK n K 52,76 encampment-concave}
|
||||
|
||||
# Cave and dwarven castles
|
||||
{DISABLE_TRANSITIONS W}
|
||||
{DISABLE_TRANSITIONS o}
|
||||
{TERRAIN_ADJACENT_CORNER W !WoK !WoK cavewall-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK W W cavewall-concave}
|
||||
{TERRAIN_ADJACENT_CORNER o !WoK !WoK dwarven-castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK o o dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !WoK !WoK keep-of-o dwarven-castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK K o dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK o K dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W W dwarven-castle-wall-convex}
|
||||
{TERRAIN_ADJACENT_CORNER W oK oK dwarven-castle-wall-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W !WoK dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER oK !WoK W dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER W !WoK !WoK 54,72 cavewall-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK W W 54,72 cavewall-concave}
|
||||
{TERRAIN_ADJACENT_CORNER o !WoK !WoK 54,72 dwarven-castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK o o 54,72 dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !WoK !WoK 54,72 keep-of-o dwarven-castle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK K o 54,72 dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER !WoK o K 54,72 dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W W 54,72 dwarven-castle-wall-convex}
|
||||
{TERRAIN_ADJACENT_CORNER W oK oK 54,72 dwarven-castle-wall-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W !WoK 54,72 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER oK !WoK W 54,72 dwarven-castle-wall-ccw}
|
||||
|
||||
# Orcish castle
|
||||
{DISABLE_TRANSITIONS O}
|
||||
{TERRAIN_ADJACENT_CORNER O !O !O orccastle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !O O O orccastle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER O !O !O 54,72 orccastle-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !O O O 54,72 orccastle-concave}
|
||||
#{TERRAIN_ADJACENT_CORNER -50 K O O <name>}
|
||||
#{TERRAIN_ADJACENT_CORNER_FLAG1 -50 K !OK !OK keep-of-O <name>}
|
||||
#{TERRAIN_ADJACENT_CORNER -50 K O !OK <name>}
|
||||
|
|
|
|||
|
|
@ -10,77 +10,10 @@
|
|||
# {CASTLE_TRANSITION CK f dirt forest-special}
|
||||
|
||||
|
||||
#define CASTLE_TRANSITION CASTLE FOREST BACKGROUND FOREGROUND
|
||||
#define CASTLE_TRANSITION CASTLE FOREST FOREGROUND
|
||||
|
||||
# Background tiles of the castle transition
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
2
|
||||
. .
|
||||
1
|
||||
"
|
||||
[tile]
|
||||
pos=2
|
||||
type={CASTLE}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
layer=-1000
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
set_flag="terrain-base"
|
||||
no_flag="terrain-base"
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
2
|
||||
. 1
|
||||
.
|
||||
"
|
||||
[tile]
|
||||
pos=2
|
||||
type={CASTLE}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
layer=-1000
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
|
||||
set_flag="terrain-base"
|
||||
no_flag="terrain-base"
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
[terrain_graphics]
|
||||
map="
|
||||
2
|
||||
1 .
|
||||
.
|
||||
"
|
||||
[tile]
|
||||
pos=2
|
||||
type={CASTLE}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
[image]
|
||||
layer=-1000
|
||||
name={BACKGROUND}
|
||||
[/image]
|
||||
set_flag="terrain-base"
|
||||
no_flag="terrain-base"
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
# Actual castle transition tiles
|
||||
|
||||
[terrain_graphics]
|
||||
|
|
@ -96,13 +29,36 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-nw-n-ne
|
||||
[/image]
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
set_flag=castle-transition-nw,castle-transition-n,castle-transition-ne
|
||||
no_flag=castle-transition-nw,castle-transition-n,castle-transition-ne
|
||||
[terrain_graphics]
|
||||
map="
|
||||
.
|
||||
2 2
|
||||
1
|
||||
"
|
||||
[tile]
|
||||
pos=2
|
||||
type={CASTLE}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-nw-ne
|
||||
[/image]
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
|
|
@ -119,12 +75,13 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-nw-n
|
||||
[/image]
|
||||
set_flag=castle-transition-nw,castle-transition-n
|
||||
no_flag=castle-transition-nw,castle-transition-n
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
|
|
@ -141,12 +98,13 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-n-ne
|
||||
[/image]
|
||||
set_flag=castle-transition-ne,castle-transition-n
|
||||
no_flag=castle-transition-ne,castle-transition-n
|
||||
[/tile]
|
||||
[/terrain_graphics]
|
||||
|
||||
|
|
@ -163,10 +121,11 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=castle-transition-n
|
||||
no_flag=castle-transition-n
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-n
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -185,10 +144,11 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=castle-transition-nw
|
||||
no_flag=castle-transition-nw
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-nw
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
@ -207,10 +167,11 @@
|
|||
[tile]
|
||||
pos=1
|
||||
type={FOREST}
|
||||
set_flag=castle-transition-ne
|
||||
no_flag=castle-transition-ne
|
||||
set_flag=overlay
|
||||
no_flag=overlay
|
||||
[image]
|
||||
layer=-30
|
||||
position=vertical
|
||||
base=36,36
|
||||
name={FOREGROUND}-ne
|
||||
[/image]
|
||||
[/tile]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER TERRAIN1 TERRAIN2 TERRAIN3 IMAGE
|
||||
#define TERRAIN_ADJACENT_CORNER TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
3
|
||||
|
|
@ -20,7 +20,7 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
base=54,72
|
||||
base={POS}
|
||||
position=vertical
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG1 TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG1 TERRAIN1 TERRAIN2 TERRAIN3 POS FLAG IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
3
|
||||
|
|
@ -49,7 +49,7 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
base=54,72
|
||||
base={POS}
|
||||
position=vertical
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
|
|
@ -57,7 +57,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG2 TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG2 TERRAIN1 TERRAIN2 TERRAIN3 POS FLAG IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
3
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
base=54,72
|
||||
base={POS}
|
||||
position=vertical
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG3 TERRAIN1 TERRAIN2 TERRAIN3 FLAG IMAGE
|
||||
#define TERRAIN_ADJACENT_CORNER_FLAG3 TERRAIN1 TERRAIN2 TERRAIN3 POS FLAG IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
3
|
||||
|
|
@ -107,7 +107,7 @@
|
|||
[/tile]
|
||||
|
||||
[image]
|
||||
base=54,72
|
||||
base={POS}
|
||||
position=vertical
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue