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

reverting the removal or useful newlines.

Browse source
This commit is contained in:
J.W. Bjerk 2010-09-24 17:09:37 +00:00
parent b0fc2dfbd4
commit bb53d79485
1 changed files with 90 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
data/core/terrain-graphics.cfg
View file

@ -16,66 +16,70 @@
# NOTE the terrain _off^_usr gets its definition from the code since it's
# themable
# These are temporary rules for developing and testing a new fake map edge
# terrain
[terrain_graphics]
map="
# These are temporary rules for developing and testing a new fake map edge
# terrain
[terrain_graphics]
map="
, 2
2 , 2
, 1
2 , 2
, 2"
[tile]
pos=1
type=*^_fme
set_no_flag=fakemapedge
[/tile]
[tile]
pos=2
type=*^_fme
[/tile]
[tile]
pos=1
type=*^_fme
set_no_flag=fakemapedge
[/tile]
[tile]
pos=2
type=*^_fme
[/tile]
[image]
layer=1000
name=off-map/border.png
center=90,144
[/image]
[/terrain_graphics]
{TRANSITION_COMPLETE_L (!,*^_fme) (*^_fme) 1000 off-map/border}
[image]
layer=1000
name=off-map/border.png
center=90,144
[/image]
[/terrain_graphics]
{TRANSITION_COMPLETE_L (!,*^_fme) (*^_fme) 1000 off-map/border}
# TRACK LAYOUT MUST STAY ON TOP
# they set flags that will be used by other macros later.
# they don't set any image by themselves.
{LAYOUT_TRACKS_F *^Bw\ *^Bw| *^Bw/ overlay}
{LAYOUT_TRACKS_F *^Br\ *^Br| *^Br/ overlay}
{LAYOUT_TRACKS_STRAIGHT_F *^Bsb\ *^Bsb| *^Bsb/ overlay}
#{TRACK_TEST_FLAG (*^Br\,*^Br|,*^Br/) overlay-connect}
# TRACK LAYOUT MUST STAY ON TOP
# they set flags that will be used by other macros later.
# they don't set any image by themselves.
{LAYOUT_TRACKS_F *^Bw\ *^Bw| *^Bw/ overlay}
{LAYOUT_TRACKS_F *^Br\ *^Br| *^Br/ overlay}
{LAYOUT_TRACKS_STRAIGHT_F *^Bsb\ *^Bsb| *^Bsb/ overlay}
# basic images for the bridge
{TRACK_COMPLETE *^Bw\ *^Bw| *^Bw/ overlay bridge/wood}
# add transition bridges<->bridges wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*Bw|,*^Bw/,*^Bw\) (*^Bw|,*^Bw/,*^Bw/) 100 -80 overlay bridge/wood-end}
# add dock-style ends to bridges ending in water
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|,*^Bw/,*^Bw\) (W*^,Ss^,Ai^) 100 -80 overlay bridge/wood-dock}
# add ramps where straight bridges end on land
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|,*^Bw/,*^Bw\) (!,C*,K*,*^F*) 100 -80 overlay bridge/wood-end}
#{TRACK_TEST_FLAG (*^Br\,*^Br|,*^Br/) overlay-connect}
# Mine rail tracks
{TRACK_COMPLETE *^Br\ *^Br| *^Br/ overlay misc/rails}
# add transition rail<->rail wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*^Br/,*^Br\) *^Br| 100 -80 overlay misc/rails-switch-ns}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/) *^Br\ 100 -80 overlay misc/rails-switch-nwse}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br\) *^Br/ 100 -80 overlay misc/rails-switch-nesw}
#add transitions at rail end
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/,*^Br\) * 100 -80 overlay misc/rails-end}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * W* 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-dock}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-both}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * * 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-single}
{TRACK_COMPLETE *^Bsb\ *^Bsb| *^Bsb/ overlay bridge/stonebridge}
#{TRACK_TEST_FLAG (*^Bsb|,*^Bsb/,*^Bsb\) overlay-connected}
# basic images for the bridge
{TRACK_COMPLETE *^Bw\ *^Bw| *^Bw/ overlay bridge/wood}
# add transition bridges<->bridges wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*Bw|,*^Bw/,*^Bw\) (*^Bw|,*^Bw/,*^Bw/) 100 -80 overlay bridge/wood-end}
# add dock-style ends to bridges ending in water
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|,*^Bw/,*^Bw\) (W*^,Ss^,Ai^) 100 -80 overlay bridge/wood-dock}
# add ramps where straight bridges end on land
{TRACK_BORDER_RESTRICTED_PLF (*^Bw|,*^Bw/,*^Bw\) (!,C*,K*,*^F*) 100 -80 overlay bridge/wood-end}
# Mine rail tracks
{TRACK_COMPLETE *^Br\ *^Br| *^Br/ overlay misc/rails}
# add transition rail<->rail wherever images are missing
{TRACK_BORDER_RESTRICTED_PLF (*^Br/,*^Br\) *^Br| 100 -80 overlay misc/rails-switch-ns}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/) *^Br\ 100 -80 overlay misc/rails-switch-nwse}
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br\) *^Br/ 100 -80 overlay misc/rails-switch-nesw}
#add transitions at rail end
{TRACK_BORDER_RESTRICTED_PLF (*^Br|,*^Br/,*^Br\) * 100 -80 overlay misc/rails-end}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * W* 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-dock}
{TRACK_RESTRICTED_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) * * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * (C*,K*,*^F*) 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-both}
{TRACK_SINGLE_PLFB (*^Bsb|,*^Bsb/,*^Bsb\) (C*,K*,*^F*) * * 100 -80 overlay IMAGE_SINGLE bridge/stonebridge-small-single}
{TRACK_COMPLETE *^Bsb\ *^Bsb| *^Bsb/ overlay bridge/stonebridge}
#{TRACK_TEST_FLAG (*^Bsb|,*^Bsb/,*^Bsb\) overlay-connected}
# Forests
{NEW:FOREST Hh*^Fp (C*,K*,X*,Ql*,Qx*,Gv*,W*,M*,*^V*,*^B*) forest/pine-sparse}
@ -299,6 +303,7 @@
#Rubble
{OVERLAY_RANDOM *^Dr misc/rubble}
{OVERLAY_RANDOM *^Es embellishments/stones-small}
{OVERLAY_RANDOM *^Em embellishments/mushroom}
@ -347,6 +352,7 @@
#Depricated
{TERRAIN_BASE_RANDOM Ggf grass/flowers}
{TERRAIN_BASE_RANDOM Re flat/dirt}
{TERRAIN_BASE_RANDOM Rb flat/dirt-dark}
@ -395,6 +401,7 @@
{OVERLAY_P *^Edp,*^Edpp 48 embellishments/desert-plant10}
{OVERLAY_P *^Edp,*^Edpp 100 embellishments/desert-plant11}
{TERRAIN_BASE_RANDOM Ds sand/beach}
{TERRAIN_BASE_RANDOM Rd flat/desert-road}
@ -422,6 +429,9 @@
# Water base terrains
{OVERLAY_RANDOM_LF Wwf,Sm -519 ford water/ford}
#ANIMATED
# experimental macro using 1-hex rule to optimize water animation
@ -443,6 +453,7 @@
#{TERRAIN_BASE_B Ss ANIMATION_15 swamp/water}
# Castle base terrains
{TERRAIN_BASE Ch,Chr,Cha flat/road}
@ -474,12 +485,14 @@
# > T R A N S I T I O N S B E T W E E N T E R R A I N S <
#
# Elven castle
{WALL_TRANSITION Cv (!,C*,K*) castle/elven/castle}
{WALL_TRANSITION2 Kv C*,Ke* (!,C*,K*) castle/elven/keep-castle}
{WALL_TRANSITION Kv (!,Kv) castle/elven/keep}
# Orcish castles
{WALL_TRANSITION Co,Cv (!,C*,K*) castle/orcish/fort}
@ -490,6 +503,7 @@
{WALL_TRANSITION2 (Ko*,Kv) C*,Ke* (!,C*,K*) castle/winter-orcish/keep-fort}
{WALL_TRANSITION (Ko*) (!,Ko*) castle/winter-orcish/keep}
# Desert castle
{WALL_TRANSITION Cd,Cv,Co* (!,C*,K*) castle/sand/castle}
@ -508,6 +522,7 @@
{WALL_TRANSITION2 Kh,Kha,Koa C*,Ke* (!,C*,K*) castle/snowy/keep-castle}
{WALL_TRANSITION Kh,Kha (!,Kh*) castle/snowy/keep}
# sunken/swamp ruins (submerged part)
# Show sunken graphics for sunken castle only when next to water terrain
# Show sunken graphics for sunken/swamp keep also when next to swamp
@ -529,8 +544,11 @@
{WALL_TRANSITION_P (!,Khr,!,Kh*) (W*,Ss,Chw,Chs) 75 castle/sunken-ruinkeep1}
{WALL_TRANSITION_P (!,Khr,!,Kh*) (W*,Ss,Chw,Chs) 100 castle/sunkenkeep}
# ruined castle and non-sumberged parts of sunken/swamp ruins
# There are no more human castles left, so we can just use Ch* here, which makes sure
# that all ruin<->non-ruin transitions are drawn
#17% 17% 17% 17% 17% 17%
@ -549,11 +567,13 @@
{WALL_TRANSITION_P Kh* (!,K*) 75 castle/ruinkeep1}
{WALL_TRANSITION Kh* (!,K*) castle/keep}
# Encampment
{WALL_TRANSITION (Ce,Ke,Ch*,Kh*,Cv,Kv,Co*,Ko*,Cd,Kd) (!,C*,K*) castle/encampment/regular}
{WALL_TRANSITION (Ce*,Ke*,Ch*,Kh*,Cv,Kv,Co*,Ko*,Cd,Kd) (!,C*,K*) castle/encampment/snow}
# Castle & Encampment Base Transtions
{TRANSITION_COMPLETE_L Ch,Chr,Cha (!,Ch,Chr,Cha,Q*) -300 flat/road}
@ -567,6 +587,7 @@
{TRANSITION_COMPLETE_LF (!,Co*,Q*) Co* -384 inside flat/dirt-dark}
{TRANSITION_COMPLETE_L Co* (!,Co*,Q*) -388 flat/dirt-dark}
#
# Cave
# (including dwarven castle, chasm, lava)
@ -595,6 +616,7 @@
{WALL_TRANSITION Xu* (Qx*,Ql*) cave/wall-rough-chasm}
{WALL_TRANSITION Xu* (!,Xu*) cave/wall-rough}
# New Generic Castle-to Chasm transition
{TRANSITION_COMPLETE_LF (Cha,Kha,Coa,Koa,Cea,Kea) Qx* -80 transition2 chasm/regular-snow-castle}
{TRANSITION_COMPLETE_LF (!,Cud,Kud,!,C*,K*) Qxe -80 transition2 chasm/earthy-castle}
@ -614,6 +636,7 @@
{WALL_TRANSITION_LF Qxe (!,Qx*,Xv,_off^_usr) -90 ground chasm/earthy}
{WALL_TRANSITION_LF Qx* (!,Qx*,Xv,_off^_usr) -90 ground chasm/regular}
#
# > B A S E T R A N S I T I O N S. <
#
@ -623,6 +646,7 @@
# special transitions to layer in more complex ways.
# Default layer ist -500, so anything layering above should be higher.
{TRANSITION_COMPLETE_L (Md,Mv) (!,Md,Hhd,Mv,W*,S*) -166 mountains/dry}
# Special mountain to dry/desert terrain trans
@ -648,9 +672,12 @@
{TRANSITION_COMPLETE_L (Uue) (!,Uue,W*,Ai) -223 cave/earthy-floor}
{TRANSITION_COMPLETE_L Urb (!,Urb,W*,Ai) -224 cave/flagstones-dark}
# water animation under swamp is not really visible, so we disable it for now
{TRANSITION_COMPLETE_LB (Ss,Chs) (!,S*,W*,D*,H*,M*,A*) -230 ANIMATION_01 swamp/water-to-land}
# Crazy Test Terrains
#{TRANSITION_COMPLETE_LF Jm Jb,Jy -240 inside test/m} # inside
@ -675,10 +702,12 @@
{TRANSITION_COMPLETE_L Gg Gs,Gd,Gll -256 grass/green-long}
{TRANSITION_COMPLETE_L Gs Gg,Gd,Gll -257 grass/semi-dry-long}
{TRANSITION_COMPLETE_L Gs (Rr*,D*,Aa) -260 grass/semi-dry-medium}
{TRANSITION_COMPLETE_L Gg (Rr*,D*,Aa) -261 grass/green-medium}
{TRANSITION_COMPLETE_L Gd (Rr*,D*,Aa) -262 grass/dry-medium}
{TRANSITION_COMPLETE_L Gll (!,Gll,Qx*,W*,Ai,C*) -270 grass/leaf-litter}
{TRANSITION_COMPLETE_L (Gg*,Qx*) (!,Gg*,Qx*,Mm,Ms,Hh,C*) -271 grass/green-abrupt}
{TRANSITION_COMPLETE_L Gs (!,Gs,Qx*,C*) -272 grass/semi-dry-abrupt}
@ -687,12 +716,14 @@
# Deprecated
{TRANSITION_COMPLETE_LF (!,Ggf) Ggf -274 flower-transition grass/green}
{TRANSITION_COMPLETE_L Aa (W*,Ss) -280 frozen/snow-to-water}
{TRANSITION_COMPLETE_L Aa (!,Aa,Qx*,G*) -281 frozen/snow}
# This transitions from bank to flat terrains.
{TRANSITION_COMPLETE_L (W*,Ai) (!,Rb,!,R*,Gll) -298 flat/bank}
{TRANSITION_COMPLETE_L Rr (!,Rr,W*,Ai) -300 flat/road}
{TRANSITION_COMPLETE_L Rrc (!,Rr,W*,Ai) -301 flat/road-clean}
{TRANSITION_COMPLETE_L Rp (!,Rp,W*,Ai) -310 flat/stone-path}
@ -700,6 +731,8 @@
{TRANSITION_COMPLETE_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -320 transition2 embellishments/farm-veg-spring}
{TRANSITION_COMPLETE_LF *^Emf (!,*^Emf,C*,K*,*^F*,M*,H*,W*) -320 transition2 embellishments/mushroom-farm}
{TRANSITION_COMPLETE_L Ds (!,Ds,W*,S*) -330 sand/beach}
{TRANSITION_COMPLETE_L Dd (!,R*,Dd,W*,S*) -360 sand/desert}
{TRANSITION_COMPLETE_L Dd R* -361 sand/desert}
@ -714,6 +747,7 @@
{TRANSITION_COMPLETE_LF (!,Rb,Rr*,W*,Ai,Q*) Rb -384 inside flat/dirt-dark}
{TRANSITION_COMPLETE_L Rb (!,Rb,Rr*,W*,Ai,Q*) -388 flat/dirt-dark}
# This complicated part keeps the submerged part of ice or a bank from drawing over the above-water parts of banks or ice
{TRANSITION_COMPLETE_LF (!,Chw,Khw,Khs,!,C*,K*) (Ai,W*) -480 non_submerged castle/castle-to-ice}
@ -723,6 +757,7 @@
{TRANSITION_COMPLETE_LF (R*,G*) Ai,W* -483 non_submerged flat/bank-to-ice}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) Ai,W*,S* -486 non_submerged cave/bank-to-ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -490 non_submerged frozen/ice}
{TRANSITION_COMPLETE_LF Aa,Ha,Ms,Ai (W*,S*) -505 submerged frozen/ice-to-water}
@ -737,6 +772,8 @@
{TRANSITION_COMPLETE_LF (R*,G*) W* -511 submerged flat/bank-to-water}
{TRANSITION_COMPLETE_LF (U*,Xu*,Ql*) W* -512 submerged cave/bank-to-water}
# Water Transitions below everything else
{TRANSITION_COMPLETE_LF Wwf (!,Wwf,Sm,!,W*,S*,D*,Xv,_off^_usr) -515 transition2 water/ford}
@ -748,6 +785,7 @@
# animation are temporary disabled to increase performance.
# to reanimate them comment these lines out, and un-comment the following chunk
{TRANSITION_COMPLETE_LF Dd,Ds,Hd (!,D*,Hd,!,W*,S*) -550 double sand/sand-to-water}
{ANIMATED_WATER_15_TRANSITION Wo (!,Wo,!,W*,S*,D*,Hd) -551 () 110 water/ocean-blend}
{ANIMATED_WATER_15_TRANSITION Wot (!,Wot,!,W*,S*,D*,Hd) -551 () 110 water/ocean-tropical-blend}
@ -778,6 +816,8 @@
# {TRANSITION_COMPLETE_LB Wo (!,Wo,!,W*,S*,D*) -558 ANIMATION_15_SLOW water/ocean-blend}
# {TRANSITION_COMPLETE_L Dd,Ds (!,D*,!,W*,Ss) -559 sand/sand-to-water}
{TRANSITION_COMPLETE_LB Wo (Xv,_off^_usr) -560 ANIMATION_15_SLOW water/ocean-long}
{TRANSITION_COMPLETE_LB Wot (Xv,_off^_usr) -561 ANIMATION_15_SLOW water/ocean-tropical-long}
@ -809,4 +849,4 @@
# Default terrain
{TERRAIN_BASE _s void/void}
{TERRAIN_BASE * void/void}
{TERRAIN_BASE * void/void}