0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed mountain multihex wml to macros...

Browse source 
...so snow mountains can use them also. Moved the macro's into a
seperate file. Fixed some minor bugs
This commit is contained in:
Hogne Håskjold 2006-02-14 11:41:34 +00:00
parent 1135930f10
commit 4a4fe44fc0
2 changed files with 274 additions and 263 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

279
data/terrain-graphics.cfg
View file

@ -42,258 +42,24 @@
{FORESTADJ ] csmJMwvabtXW 100 mushrooms-castle}
[terrain_graphics]
map="
. * . .
* * .
* 2 * .
1 3 *
* 2 4 *
* 3 5
. * 4 *
. * *"
# Mountains
# macros found in terrain-graphics/mountains.cfg
[tile]
pos=1
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range3_1
position=vertical
base=88,144
[/image]
#TWOBYFOUR TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
{TWOBYFOUR mb mountain_range3_1 mountain_range3_2 mountain_range3_3 mountain_range3_4 mountain_range3_5 overlay 6}
[tile]
pos=2
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range3_2
position=vertical
base=144,108
[/image]
#TWOBYFOUR2 TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
{TWOBYFOUR2 mb mountain_range4_1 mountain_range4_2 mountain_range4_3 mountain_range4_4 mountain_range4_5 overlay 12}
[tile]
pos=3
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range3_3
position=vertical
base=196,144
[/image]
#ONEBYTHREE TYPE NAME1 NAME2 NAME3 FLAG PROB
{ONEBYTHREE mb mountain_range1_1 mountain_range1_2 mountain_range1_3 overlay 16}
[tile]
pos=4
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range3_4
position=vertical
base=248,180
[/image]
#ONEBYTHREE2 TYPE NAME1 NAME2 NAME3 FLAG PROB
{ONEBYTHREE2 mb mountain_range2_1 mountain_range2_2 mountain_range2_3 overlay 16}
[tile]
pos=5
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range3_5
position=vertical
base=304,216
[/image]
probability=5
[/terrain_graphics]
[terrain_graphics]
map="
. . * .
. * *
. * 4 *
* 3 5
* 2 4 *
1 3 *
* 2 * .
* * ."
[tile]
pos=1
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range4_1
position=vertical
base=88,216
[/image]
[tile]
pos=2
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range4_2
position=vertical
base=144,180
[/image]
[tile]
pos=3
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range4_3
position=vertical
base=196,144
[/image]
[tile]
pos=4
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range4_4
position=vertical
base=248,108
[/image]
[tile]
pos=5
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range4_5
position=vertical
base=304,144
[/image]
probability=5
[/terrain_graphics]
[terrain_graphics]
map="
. . . .
* . .
* * . .
1 * .
* 2 * .
* 3 *
. * * .
. * ."
[tile]
pos=1
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range1_1
position=vertical
base=0,144
[/image]
[tile]
pos=2
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range1_2
position=vertical
base=0,180
[/image]
[tile]
pos=3
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range1_3
position=vertical
base=36,216
[/image]
probability=10
[/terrain_graphics]
[terrain_graphics]
map="
. . . .
. * .
. * * .
* 3 *
* 2 * .
1 * .
* * . .
. . ."
[tile]
pos=1
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range2_1
position=vertical
base=88,216
[/image]
[tile]
pos=2
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range2_2
position=vertical
base=142,180
[/image]
[tile]
pos=3
type=mb
no_flag="overlay"
set_flag="overlay"
[/tile]
[image]
name=mountain_range2_3
position=vertical
base=196,144
[/image]
probability=15
[/terrain_graphics]
# 4-hex mountains
# macro moved to terrain-graphics/mountains.cfg
# DHEX TYPE NAME1 NAME2 NAME3 FLAG PROB TILE POS
{DHEX mb mountain5_1 mountain5_2 mountain5_3 overlay 20}
{DHEX mb mountain6_1 mountain6_2 mountain6_3 overlay 20}
# TWOBYTWO TYPE NAME1 NAME2 NAME3 FLAG PROB
{TWOBYTWO mb mountain5_1 mountain5_2 mountain5_3 overlay 30}
{TWOBYTWO mb mountain6_1 mountain6_2 mountain6_3 overlay 30}
#Macro for Single Hex
#define SHEX TYPE FLAG PROB TILE
@ -437,22 +203,18 @@
# Attachs graphics to each known terrain types
#
{TERRAIN_BASE_PROB u]' cave-floor4 10}
{TERRAIN_BASE_PROB u]' cave-floor3 3}
{TERRAIN_BASE_PROB u]' cave-floor2 15}
{TERRAIN_BASE_PROB u]' cave-floor 10}
{TERRAIN_BASE u]' cave-floor1}
{TERRAIN_BASE_PROB u]' cave-floor4 10}
{TERRAIN_BASE_PROB u]' cave-floor3 3}
{TERRAIN_BASE_PROB u]' cave-floor2 15}
{TERRAIN_BASE_PROB u]' cave-floor 10}
{TERRAIN_BASE u]' cave-floor1}
{TERRAIN_BASE W cavewall}
#{TERRAIN_BASE_PROB m mountains-peak1 33}
#{TERRAIN_BASE_PROB m mountains-peak2 33}
#{TERRAIN_BASE m mountains}
{TERRAIN_BASE_PROB H snow-hills3 30}
{TERRAIN_BASE_PROB H snow-hills2 30}
{TERRAIN_BASE H snow-hills}
{TERRAIN_BASE_PROB h hills-variation1 33}
{TERRAIN_BASE_PROB h hills-variation2 33}
{TERRAIN_BASE h hills-variation3}
#{TERRAIN_BASE h hills}
{TERRAIN_BASE_PROB [ cave-hills-variation1 33}
{TERRAIN_BASE_PROB [ cave-hills-variation2 33}
{TERRAIN_BASE [ cave-hills-variation3}
@ -802,10 +564,7 @@
# Normal Transitions. The order controls which overlap which.
# {TERRAIN_ADJACENT_OV -78 F !F snow-forest}
{TERRAIN_ADJACENT_VERTICAL T !TNQq tropical-forest}
#{TERRAIN_ADJACENT_VERTICAL F !FNQq snow-forest}
#{TERRAIN_ADJACENT_VERTICAL f !fNQq forest}
{TERRAIN_ADJACENT -168 mHhfF? N grassland}
{TERRAIN_ADJACENT -169 M !MX desert-mountains}
{TERRAIN_ADJACENT -170 mb HSJ mountains-small}
@ -829,7 +588,6 @@
{TERRAIN_ADJACENT -188 ftgvX? ks grassland-to-water}
{TERRAIN_ADJACENT -189 ftgvX? cZp\|/ grassland-to-water}
{TERRAIN_ADJACENT -190 ftgvX? swY grassland-to-water}
#{TERRAIN_ADJACENT -191 ftgvX? cZp\|/s cliff}
{TERRAIN_ADJACENT -191 GTL !GTLX savanna}
{TERRAIN_ADJACENT -192 ftgvX? !ftgvX grassland}
{TERRAIN_ADJACENT -193 PIB !PIB desert-oasis}
@ -841,7 +599,6 @@
{TERRAIN_ADJACENT -199 r !r dirt}
{TERRAIN_ADJACENT -200 E !E desert-road}
# Water Transitions draw below everything else
{TERRAIN_ADJACENT -201 Ywq !Ywq swampwater}

258
data/terrain-graphics/mountains.cfg
View file

@ -1,5 +1,5 @@
#Macro for 4-Hex mountains
#define DHEX TYPE NAME1 NAME2 NAME3 FLAG PROB
#define TWOBYTWO TYPE NAME1 NAME2 NAME3 FLAG PROB
[terrain_graphics]
map="
. * . .
@ -46,6 +46,260 @@
position=vertical
base=196,144
[/image]
probability=30
probability={PROB}
[/terrain_graphics]
#enddef
#define TWOBYFOUR TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
[terrain_graphics]
map="
. * . .
* * .
* 2 * .
1 3 *
* 2 4 *
* 3 5
. * 4 *
. * *"
[tile]
pos=1
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME1}
position=vertical
base=88,144
[/image]
[tile]
pos=2
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME2}
position=vertical
base=144,108
[/image]
[tile]
pos=3
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME3}
position=vertical
base=196,144
[/image]
[tile]
pos=4
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME4}
position=vertical
base=248,180
[/image]
[tile]
pos=5
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME5}
position=vertical
base=304,216
[/image]
probability={PROB}
[/terrain_graphics]
#enddef
#define TWOBYFOUR2 TYPE NAME1 NAME2 NAME3 NAME4 NAME5 FLAG PROB
[terrain_graphics]
map="
. . * .
. * *
. * 4 *
* 3 5
* 2 4 *
1 3 *
* 2 * .
* * ."
[tile]
pos=1
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME1}
position=vertical
base=88,216
[/image]
[tile]
pos=2
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME2}
position=vertical
base=144,180
[/image]
[tile]
pos=3
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME3}
position=vertical
base=196,144
[/image]
[tile]
pos=4
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME4}
position=vertical
base=248,108
[/image]
[tile]
pos=5
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME5}
position=vertical
base=304,144
[/image]
probability={PROB}
[/terrain_graphics]
#enddef
#define ONEBYTHREE TYPE NAME1 NAME2 NAME3 FLAG PROB
[terrain_graphics]
map="
. . . .
* . .
* * . .
1 * .
* 2 * .
* 3 *
. * * .
. * ."
[tile]
pos=1
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME1}
position=vertical
base=0,144
[/image]
[tile]
pos=2
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME2}
position=vertical
base=0,180
[/image]
[tile]
pos=3
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME3}
position=vertical
base=36,216
[/image]
probability={PROB}
[/terrain_graphics]
#enddef
#define ONEBYTHREE2 TYPE NAME1 NAME2 NAME3 FLAG PROB
[terrain_graphics]
map="
. . . .
. * .
. * * .
* 3 *
* 2 * .
1 * .
* * . .
. . ."
[tile]
pos=1
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME1}
position=vertical
base=88,216
[/image]
[tile]
pos=2
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME2}
position=vertical
base=142,180
[/image]
[tile]
pos=3
type={TYPE}
no_flag={FLAG}
set_flag={FLAG}
[/tile]
[image]
name={NAME3}
position=vertical
base=196,144
[/image]
probability={PROB}
[/terrain_graphics]
#enddef