Fixed lava/wall and chasm/wall transitions
This commit is contained in:
Moritz Göbelbecker
parent
bf5de2cea2
commit
e97ed4b894
2 changed files with 131 additions and 20 deletions
|
|
@ -713,8 +713,8 @@
|
|||
{TERRAIN_ADJACENT_CORNER !WoKXl o K 56,68 dwarven-castle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W W 52,76 dwarven-castle-wall-convex}
|
||||
{TERRAIN_ADJACENT_CORNER W oK oK 56,68 dwarven-castle-wall-concave}
|
||||
{TERRAIN_ADJACENT_CORNER oK W !WoK 54,68 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER oK !WoK W 54,68 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER oK W !WoKl 54,68 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER oK !WoKl W 54,68 dwarven-castle-wall-ccw}
|
||||
|
||||
#castle-chasm transitions
|
||||
{TERRAIN_ADJACENT_CORNER o X X 52,76 chasm-dcastle-convex}
|
||||
|
|
@ -723,10 +723,10 @@
|
|||
{TERRAIN_ADJACENT_CORNER X K o 56,68 chasm-dcastle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER X o K 56,68 chasm-dcastle-concave}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER o !XKol X 52,76 chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !XKol X 52,76 keep-of-o chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER o X !XKol 52,76 chasm-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K X !XKol 52,76 keep-of-o chasm-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER o !XKolW X 52,76 chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !XKolW X 52,76 keep-of-o chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER o X !XKolW 52,76 chasm-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K X !XKolW 52,76 keep-of-o chasm-dcastle-cw}
|
||||
|
||||
#castle-lava transitions
|
||||
|
||||
|
|
@ -736,10 +736,23 @@
|
|||
{TERRAIN_ADJACENT_CORNER l K o 56,68 lava-dcastle-concave}
|
||||
{TERRAIN_ADJACENT_CORNER l o K 56,68 lava-dcastle-concave}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER o !lKoX l 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !lKoX l 52,76 keep-of-o lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER o l !lKoX 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K l !lKoX 52,76 keep-of-o lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER o !lKoXW l 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K !lKoXW l 52,76 keep-of-o lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER o l !lKoXW 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 K l !lKoXW 52,76 keep-of-o lava-dcastle-cw}
|
||||
|
||||
#castle-lava-wall transitions
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH oK W l 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH oK l W 52,76 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_SW oK W l 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_SE oK l W 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_SE oK W l 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_SW oK l W 52,76 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_W oK W l 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_E oK l W 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_E oK W l 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_W oK l W 52,76 dwarven-castle-wall-ccw}
|
||||
|
||||
#castle-lava-chasm transitions
|
||||
|
||||
|
|
@ -760,22 +773,47 @@
|
|||
|
||||
# Lava
|
||||
{DISABLE_TRANSITIONS l}
|
||||
{TERRAIN_ADJACENT_CORNER l !lXKo !lXKo 52,76 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER l X !lXKo 52,76 lava-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER l !lXKo X 52,76 lava-chasm-cw}
|
||||
{TERRAIN_ADJACENT_CORNER !lXKo l l 56,68 lava-concave}
|
||||
{TERRAIN_ADJACENT_CORNER l !lXKoW !lXKoW 52,76 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !lXKoW l l 56,68 lava-concave}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER X l l 52,76 lava-chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER l X X 56,68 lava-chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER X l l 52,76 lava-chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER l X X 56,68 lava-chasm-concave}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER X !lXKo l 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER X l !lXKo 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER X !lXKo l 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER X l !lXKo 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER l X !lXKo 52,76 lava-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER l !lXKo X 52,76 lava-chasm-cw}
|
||||
|
||||
# Chasm
|
||||
{TERRAIN_ADJACENT_CORNER X !XKol !XKol 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !XKol X X 56,68 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER X !XKolW !XKolW 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER !XKolW X X 56,68 chasm-concave}
|
||||
|
||||
|
||||
# Hack to get chasm/wall transitions right
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH X W !X 76,52 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH X !X W 76,52 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E X W !X 0,0 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E X !X W 0,0 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W X W !X 100,100 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W X !X W 100,100 chasm-convex}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NS W X X 56,68 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_E W X X 0,0 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_W W X X 100,100 chasm-concave}
|
||||
|
||||
|
||||
# Hack to get lava/wall transitions right
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH l W !lX 76,52 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH l !lX W 76,52 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E l W !lX 0,0 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E l !lX W 0,0 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W l W !lX 100,100 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W l !lX W 100,100 lava-convex}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NS W l l 56,68 lava-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_E W l l 0,0 lava-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_W W l l 100,100 lava-concave}
|
||||
|
||||
# Castle decorations and castle floors. Those must always be after the castles
|
||||
# are defined.
|
||||
#{BUILDING_FLAG K ({VIMG 36,40 tent}) keep-of-n}
|
||||
|
|
|
|||
73
data/terrain-graphics/caves.cfg
Normal file
73
data/terrain-graphics/caves.cfg
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
#
|
||||
# This file defines corner-transitions that can be applied to only some directions.
|
||||
# They are currently used for chasm/wall and lava/wall transitions until better layering
|
||||
# can be implemented in the engine.
|
||||
#
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_NS TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} ne,-,se,sw,-,nw {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_EW TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,e,-,-,w,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_NORTH TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} ne,-,-,-,-,nw {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_SOUTH TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,-,se,sw,-,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_E TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,e,-,-,-,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_W TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,-,-,-,w,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_NE TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} ne,-,-,-,-,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_NW TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,-,-,-,-,nw {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_SE TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,-,se,-,-,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_SW TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
{TERRAIN_ADJACENT_CORNER_PARTIAL {TERRAIN1} {TERRAIN2} {TERRAIN3} -,-,-,sw,-,- {POS} {IMAGE}}
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER_PARTIAL TERRAIN1 TERRAIN2 TERRAIN3 ROT POS IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
3
|
||||
2
|
||||
1"
|
||||
[tile]
|
||||
pos=1
|
||||
type={TERRAIN1}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=2
|
||||
type={TERRAIN2}
|
||||
[/tile]
|
||||
[tile]
|
||||
pos=3
|
||||
type={TERRAIN3}
|
||||
[/tile]
|
||||
|
||||
[image]
|
||||
base={POS}
|
||||
position=vertical
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
rotations={ROT}
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
Loading…
Add table
Reference in a new issue