Remove hacks for chasm/wall, lava/wall transitions.
Use new layering methods instead.
This commit is contained in:
Moritz Göbelbecker
parent
14cc1bdfc2
commit
372d5325d1
3 changed files with 43 additions and 120 deletions
|
|
@ -778,8 +778,8 @@
|
|||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud,_K) Xu dwarven-castle-wall}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud,_K) Xu (!,Cud,Kud,_K,Xu,Ql) 54,68 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud,_K) (!,Cud,Kud,_K,Xu,Ql) Xu 54,68 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud,_K) Xu (!,Cud,Kud,_K,Xu) 54,68 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud,_K) (!,Cud,Kud,_K,Xu) Xu 54,68 dwarven-castle-wall-ccw}
|
||||
|
||||
#castle-chasm transitions
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Qxu chasm-dcastle}
|
||||
|
|
@ -800,18 +800,6 @@
|
|||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql (!,Cud,Kud,_K,Xu,Ql,Qxu) 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_FLAG1 _K Ql (!,Cud,Kud,_K,Xu,Ql,Qxu) 52,76 keep-of-cud lava-dcastle-cw}
|
||||
|
||||
#castle-lava-wall transitions
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH (Cud,Kud,_K) Xu Ql 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH (Cud,Kud,_K) Ql Xu 52,76 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_SW (Cud,Kud,_K) Xu Ql 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_SE (Cud,Kud,_K) Ql Xu 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_SE (Cud,Kud,_K) Xu Ql 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_SW (Cud,Kud,_K) Ql Xu 52,76 dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_W (Cud,Kud,_K) Xu Ql 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_E (Cud,Kud,_K) Ql Xu 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_E (Cud,Kud,_K) Xu Ql 52,76 dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_W (Cud,Kud,_K) Ql Xu 52,76 dwarven-castle-wall-ccw}
|
||||
|
||||
#castle-lava-chasm transitions
|
||||
|
||||
|
|
@ -832,48 +820,28 @@
|
|||
|
||||
# Lava
|
||||
{DISABLE_TRANSITIONS Ql}
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Ql (!,Cud,Kud,_K,Xu,Ql,Qxu) lava}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Qxu Ql lava-chasm}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu) (!,Ql,Qxu) -1 52,76 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu) Ql Ql -1 52,76 lava-concave}
|
||||
|
||||
# Lava-chasm
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER Qxu (!,Cud,Kud,_K,Ql,Qxu) Ql 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER Qxu Ql (!,Cud,Kud,_K,Ql,Qxu) 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER Ql Qxu (!,Cud,Kud,_K,Ql,Qxu) 52,76 lava-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER Ql (!,Cud,Kud,_K,Ql,Qxu) Qxu 52,76 lava-chasm-cw}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Qxu Ql Ql -2 52,76 lava-chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql Qxu Qxu -2 52,76 lava-chasm-concave}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql Qxu (!,Ql,Qxu) -1 52,76 lava-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu) Qxu -1 52,76 lava-chasm-cw}
|
||||
|
||||
# Chasm
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Qxu (!,Cud,Kud,_K,Xw,Ql,Qxu) chasm}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Qxu (!,Ql,Qxu) (!,Ql,Qxu) -1 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Qxu (!,Ql,Qxu) Ql -1 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Qxu Ql (!,Ql,Qxu) -1 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu) Qxu Qxu -1 52,76 chasm-concave}
|
||||
|
||||
|
||||
# Hack to get chasm/wall transitions right
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH Qxu Xu (!,Qxu) 76,52 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH Qxu (!,Qxu) Xu 76,52 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E Qxu Xu (!,Qxu) 0,0 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E Qxu (!,Qxu) Xu 0,0 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W Qxu Xu (!,Qxu) 100,100 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W Qxu (!,Qxu) Xu 100,100 chasm-convex}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NS Xu Qxu Qxu 56,68 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_E Xu Qxu Qxu 0,0 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_W Xu Qxu Qxu 100,100 chasm-concave}
|
||||
|
||||
|
||||
# Hack to get lava/wall transitions right
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH Ql Xu (!,Ql,Qxu) 76,52 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_NORTH Ql (!,Ql,Qxu) Xu 76,52 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E Ql Xu (!,Ql,Qxu) 0,0 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_E Ql (!,Ql,Qxu) Xu 0,0 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W Ql Xu (!,Ql,Qxu) 100,100 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_W Ql (!,Ql,Qxu) Xu 100,100 lava-convex}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_NS Xu Ql Ql 56,68 lava-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_E Xu Ql Ql 0,0 lava-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_W Xu Ql Ql 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}
|
||||
|
||||
{BUILDING_FLAG_PROB _K ({VIMG 20,26 tent}) keep-of-ce 50}
|
||||
{BUILDING_FLAG_PROB _K ({VIMG 20,26 tent2}) keep-of-ce 100}
|
||||
{BUILDING_FLAG _K ({VIMG 36,40 dwarven-keep}) keep-of-cud}
|
||||
|
|
|
|||
|
|
@ -1,3 +1,31 @@
|
|||
#define TERRAIN_ADJACENT_CORNER_LAYER TERRAIN1 TERRAIN2 TERRAIN3 LAYER 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}
|
||||
layer={LAYER}
|
||||
name={IMAGE}-@R0
|
||||
[/image]
|
||||
rotations=ne,e,se,sw,w,nw
|
||||
[/terrain_graphics]
|
||||
#enddef
|
||||
|
||||
#define TERRAIN_ADJACENT_CORNER TERRAIN1 TERRAIN2 TERRAIN3 POS IMAGE
|
||||
[terrain_graphics]
|
||||
map="
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
#
|
||||
# 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