reverted commit 2007-06-30T13:36:28Z!koraq@xs4all.nl and 2007-06-28T19:39:48Z!koraq@xs4all.nl...
...which removed the special border transitions.
This commit is contained in:
Mark de Wever
parent
88b05148f6
commit
e24d2042b9
1 changed files with 49 additions and 50 deletions
|
|
@ -732,54 +732,54 @@
|
|||
{DISABLE_TRANSITIONS Xu}
|
||||
{DISABLE_TRANSITIONS (Cud,Kud)}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Xu (!,Xu,Cud,Kud,Qxu,Ql,_off^*) cave/wall-rough}
|
||||
{TERRAIN_ADJACENT_CORNER Xu (!,Xu,Cud,Kud,Qxu,Ql,_off^*) (Qxu,Ql) 54,68 cave/wall-rough-convex}
|
||||
{TERRAIN_ADJACENT_CORNER Xu (Qxu,Ql) (!,Xu,Cud,Kud,Qxu,Ql,_off^*) 54,68 cave/wall-rough-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Xu (!,Xu,Cud,Kud,Qxu,Ql) cave/wall-rough}
|
||||
{TERRAIN_ADJACENT_CORNER Xu (!,Xu,Cud,Kud,Qxu,Ql) (Qxu,Ql) 54,68 cave/wall-rough-convex}
|
||||
{TERRAIN_ADJACENT_CORNER Xu (Qxu,Ql) (!,Xu,Cud,Kud,Qxu,Ql) 54,68 cave/wall-rough-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH Xu (Qxu,Ql) cave/wall-rough-chasm}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) (!,Xu,Qxu,Ql,Cud,Kud,_off^*) castle/dwarven-castle}
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) (!,Xu,Qxu,Ql,Cud,Kud) castle/dwarven-castle}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Xu castle/dwarven-castle-wall}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Xu (!,Cud,Kud,Xu) 54,68 castle/dwarven-castle-wall-cw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu,_off^*) Xu 54,68 castle/dwarven-castle-wall-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu) Xu 54,68 castle/dwarven-castle-wall-ccw}
|
||||
|
||||
#castle-chasm transitions
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Qxu chasm-dcastle}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu,Ql,Qxu,_off^*) Qxu 52,76 chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu,Ql,Qxu) Qxu 52,76 chasm-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Qxu (!,Cud,Kud,Xu,Ql,Qxu) 52,76 chasm-dcastle-cw}
|
||||
|
||||
#castle-lava transitions
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Ql lava-dcastle}
|
||||
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Ql lava-dcastle}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu,Ql,Qxu,_off^*) Ql 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql (!,Cud,Kud,Xu,Ql,Qxu) 52,76 lava-dcastle-cw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,Xu,Ql,Qxu) Ql 52,76 lava-dcastle-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql (!,Cud,Kud,Xu,Ql,Qxu) 52,76 lava-dcastle-cw}
|
||||
|
||||
|
||||
#castle-lava-chasm transitions
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Qxu Ql 52,76 lava-dcastle-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql Qxu 52,76 lava-dcastle-chasm-cw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Qxu Ql 52,76 lava-dcastle-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql Qxu 52,76 lava-dcastle-chasm-cw}
|
||||
|
||||
# Lava
|
||||
{DISABLE_TRANSITIONS Ql}
|
||||
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu,_off^*) (!,Ql,Qxu) -1 52,76 lava-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu,_off^*) Ql Ql -1 52,76 lava-concave}
|
||||
{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_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 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,_off^*) -1 52,76 lava-chasm-ccw}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu,_off^*) Qxu -1 52,76 lava-chasm-cw}
|
||||
{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_LAYER Qxu (!,Ql,Qxu,_off^*) (!,Ql,Qxu,_off^*) -1 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu,_off^*) Qxu Qxu -1 52,76 chasm-concave}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER Qxu (!,Ql,Qxu) (!,Ql,Qxu) -1 52,76 chasm-convex}
|
||||
{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu) Qxu Qxu -1 52,76 chasm-concave}
|
||||
|
||||
|
||||
# Castle decorations and castle floors. Those must always be after the castles
|
||||
|
|
@ -802,21 +802,21 @@
|
|||
|
||||
#{TERRAIN_ADJACENT_CUSTOM -150 Mm (Ha,Aa,Hd,W*,Ss) mountains transition2}
|
||||
#{TERRAIN_ADJACENT_CUSTOM -151 Mm (!,Mm,Qxu,Hh,C*,K*,Xu) mountains transition2}
|
||||
{TERRAIN_ADJACENT -160 Md (!,Md,Qxu,_off^*) desert-mountains}
|
||||
{TERRAIN_ADJACENT -160 Md (!,Md,Qxu) desert-mountains}
|
||||
|
||||
|
||||
{TERRAIN_ADJACENT -170 Ha (W*,Ss) snow-hills-to-water}
|
||||
{TERRAIN_ADJACENT -171 Ha Hh snow-hills-to-hills}
|
||||
{TERRAIN_ADJACENT -172 Ha (!,Ha,Qxu,Mm,Md,_off^*) snow-hills}
|
||||
{TERRAIN_ADJACENT -180 Hd (!,Hd,Qxu,_off^*) desert-hills}
|
||||
{TERRAIN_ADJACENT -190 (Mm,Hh) (!,Hh,W*,Ss,_off^*) hills}
|
||||
{TERRAIN_ADJACENT -172 Ha (!,Ha,Qxu,Mm,Md) snow-hills}
|
||||
{TERRAIN_ADJACENT -180 Hd (!,Hd,Qxu) desert-hills}
|
||||
{TERRAIN_ADJACENT -190 (Mm,Hh) (!,Hh,W*,Ss) hills}
|
||||
{TERRAIN_ADJACENT_CUSTOM -191 (Mm,Hh) (W*,Ss) hills transition2}
|
||||
{TERRAIN_ADJACENT -200 Uh (!,Uh,_off^*) cave/hills}
|
||||
{TERRAIN_ADJACENT -200 Uh (!,Uh) cave/hills}
|
||||
|
||||
{TERRAIN_ADJACENT -210 U* (!,U*,_off^*) cave/floor}
|
||||
{TERRAIN_ADJACENT -220 Ql (!,Ql,Qxu,Xu,_off^*) lava}
|
||||
{TERRAIN_ADJACENT -210 U* (!,U*) cave/floor}
|
||||
{TERRAIN_ADJACENT -220 Ql (!,Ql,Qxu,Xu) lava}
|
||||
{TERRAIN_ADJACENT -230 Aa (W*,Ss) snow-to-water}
|
||||
{TERRAIN_ADJACENT -240 Aa (!,Aa,Qxu,_off^*) snow}
|
||||
{TERRAIN_ADJACENT -240 Aa (!,Aa,Qxu) snow}
|
||||
{TERRAIN_ADJACENT -260 Gs (W*,Ss) flat/savanna-to-water}
|
||||
|
||||
|
||||
|
|
@ -825,37 +825,36 @@
|
|||
# These two work in conjunction with the mountain and hill transitions to create
|
||||
# a smooth coastline between grassland, hills and mountains.
|
||||
|
||||
{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg,Qxu,Mm,Hh,W*,Ss,_off^*) flat/grass}
|
||||
{TERRAIN_ADJACENT -319 (Gg*,Qxu,Mm,Hh) W* flat/grass-to-water}
|
||||
{TERRAIN_ADJACENT -270 (Gg*,Qxu) (!,Gg,Qxu,Mm,Hh,W*,Ss) flat/grass}
|
||||
{TERRAIN_ADJACENT -319 (Gg*,Qxu,Mm,Hh) W* flat/grass-to-water}
|
||||
|
||||
{TERRAIN_ADJACENT -280 Gs (!,Gs,Qxu,_off^*) flat/savanna}
|
||||
{TERRAIN_ADJACENT -290 Rr (!,Rr,_off^*) flat/road}
|
||||
{TERRAIN_ADJACENT_CUSTOM -250 *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*,S*,_off^*) flat/farm-veg-spring transition2}
|
||||
{TERRAIN_ADJACENT -259 Re (!,Re,_off^*) flat/dirt}
|
||||
{TERRAIN_ADJACENT -310 Rd (!,Rd,_off^*) desert-road}
|
||||
#{TERRAIN_ADJACENT -320 (Dd,Do) (!,Dd,Do) desert-oasis}
|
||||
{TERRAIN_ADJACENT -330 Dd (!,Dd,_off^*) desert}
|
||||
{TERRAIN_ADJACENT -340 Ds (!,Ds,_off^*) sand}
|
||||
{TERRAIN_ADJACENT -280 Gs (!,Gs,Qxu) flat/savanna}
|
||||
{TERRAIN_ADJACENT -290 Rr (!,Rr) flat/road}
|
||||
{TERRAIN_ADJACENT_CUSTOM -250 *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*,S*) flat/farm-veg-spring transition2}
|
||||
{TERRAIN_ADJACENT -259 Re (!,Re) flat/dirt}
|
||||
{TERRAIN_ADJACENT -310 Rd (!,Rd) desert-road}
|
||||
#{TERRAIN_ADJACENT -320 (Dd,Do) (!,Dd,Do) desert-oasis}
|
||||
{TERRAIN_ADJACENT -330 Dd (!,Dd) desert}
|
||||
{TERRAIN_ADJACENT -340 Ds (!,Ds) sand}
|
||||
|
||||
|
||||
# Water Transitions draw below everything else
|
||||
|
||||
{TERRAIN_ADJACENT_CUSTOM -500 (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud) (Ai,W*) castle/castle-to-ice transition3}
|
||||
{TERRAIN_ADJACENT_CUSTOM -505 (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud) W* castle/castle-to-water transition2}
|
||||
{TERRAIN_ADJACENT_CUSTOM -510 Ai (W*,Ss) ice-to-water submerged_part}
|
||||
{TERRAIN_ADJACENT -503 Ai (!,Ai,Qxu,_off^*) ice}
|
||||
{TERRAIN_ADJACENT_CUSTOM -500 (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud) (Ai,W*) castle/castle-to-ice transition3}
|
||||
{TERRAIN_ADJACENT_CUSTOM -505 (Ch,Cv,Ce,Chr,Cud,Kh,Kv,Ke,Khr,Kud) W* castle/castle-to-water transition2}
|
||||
{TERRAIN_ADJACENT_CUSTOM -510 Ai (W*,Ss) ice-to-water submerged_part}
|
||||
{TERRAIN_ADJACENT -503 Ai (!,Ai,Qxu) ice}
|
||||
|
||||
{TERRAIN_ADJACENT -515 (Ss,Chs) (!,Ss,Chs,H*,M*,_off^*) swamp/water}
|
||||
{TERRAIN_ADJACENT -515 (Ss,Chs) (!,Ss,Chs,H*,M*) swamp/water}
|
||||
|
||||
{TERRAIN_ADJACENT -520 Ww (!,Ww,Mm,_off^*) water/coast}
|
||||
{TERRAIN_ADJACENT -530 Wwf (!,Wwf,_off^*) water/ford}
|
||||
{TERRAIN_ADJACENT -540 Wo (!,Wo,_off^*) water/ocean}
|
||||
{TERRAIN_ADJACENT_CUSTOM -550 Chw (Ch,Chr) castle/sunken-ruin transition2}
|
||||
{TERRAIN_ADJACENT_CUSTOM -550 Chs (Ch,Chr) swamp/water transition2}
|
||||
{TERRAIN_ADJACENT -560 Chw (!,Chw,Chr,_off^*) water/coast}
|
||||
{TERRAIN_ADJACENT -570 (!,Chr,Chw) Chr flat/grass}
|
||||
{TERRAIN_ADJACENT -520 Ww (!,Ww,Mm) water/coast}
|
||||
{TERRAIN_ADJACENT -530 Wwf (!,Wwf) water/ford}
|
||||
{TERRAIN_ADJACENT -540 Wo (!,Wo) water/ocean}
|
||||
{TERRAIN_ADJACENT_CUSTOM -550 Chw (Ch,Chr) castle/sunken-ruin transition2}
|
||||
{TERRAIN_ADJACENT_CUSTOM -550 Chs (Ch,Chr) swamp/water transition2}
|
||||
{TERRAIN_ADJACENT -560 Chw (!,Chw,Chr) water/coast}
|
||||
{TERRAIN_ADJACENT -570 (!,Chr,Chw) Chr flat/grass}
|
||||
|
||||
{TERRAIN_BASE _off^* off-map/alpha}
|
||||
{TERRAIN_ADJACENT -1 (!, _off^*) (_off^*) off-map/border}
|
||||
|
||||
{TERRAIN_BASE_DEFAULT void}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue