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

Converted all castles to use new new wall macros,

Browse source 
...and upped the number of variations they can handle to 6.
This commit is contained in:
Lari Nieminen 2010-09-27 13:02:12 +00:00
parent 189c4e2019
commit bcb1dce861
2 changed files with 44 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -488,54 +488,48 @@
# 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}
{NEW:WALL Cv (!,C*,K*) castle/elven/castle}
{NEW:WALL2 Kv C*,Ke* (!,C*,K*) castle/elven/keep-castle}
{NEW:WALL Kv (!,Kv) castle/elven/keep}
# Orcish castles
{WALL_TRANSITION Co,Cv (!,C*,K*) castle/orcish/fort}
{WALL_TRANSITION2 Ko,Kv C*,Ke* (!,C*,K*) castle/orcish/keep-fort}
{WALL_TRANSITION Ko (!,Ko*) castle/orcish/keep}
{NEW:WALL Co,Cv (!,C*,K*) castle/orcish/fort}
{NEW:WALL2 Ko,Kv C*,Ke* (!,C*,K*) castle/orcish/keep-fort}
{NEW:WALL Ko (!,Ko*) castle/orcish/keep}
{WALL_TRANSITION (Co*,Cv) (!,C*,K*) castle/winter-orcish/fort}
{WALL_TRANSITION2 (Ko*,Kv) C*,Ke* (!,C*,K*) castle/winter-orcish/keep-fort}
{WALL_TRANSITION (Ko*) (!,Ko*) castle/winter-orcish/keep}
{NEW:WALL (Co*,Cv) (!,C*,K*) castle/winter-orcish/fort}
{NEW:WALL2 (Ko*,Kv) C*,Ke* (!,C*,K*) castle/winter-orcish/keep-fort}
{NEW:WALL (Ko*) (!,Ko*) castle/winter-orcish/keep}
# Desert castle
{WALL_TRANSITION Cd,Cv,Co* (!,C*,K*) castle/sand/castle}
{WALL_TRANSITION2 Kd,Kv,Ko* C*,Ke* (!,C*,K*) castle/sand/keep-castle}
{WALL_TRANSITION Kd (!,Kd) castle/sand/keep}
{NEW:WALL Cd,Cv,Co* (!,C*,K*) castle/sand/castle}
{NEW:WALL2 Kd,Kv,Ko* C*,Ke* (!,C*,K*) castle/sand/keep-castle}
{NEW:WALL Kd (!,Kd) castle/sand/keep}
#
# Human castles
#
{WALL_TRANSITION Ch,Cv,Co,Cd (!,C*,K*) castle/castle}
{WALL_TRANSITION2 Kh,Kv,Ko,Kd C*,Ke* (!,C*,K*) castle/keep-castle}
{WALL_TRANSITION Kh (!,Kh*) castle/keep}
{NEW:WALL Ch,Cv,Co,Cd (!,C*,K*) castle/castle}
{NEW:WALL2 Kh,Kv,Ko,Kd C*,Ke* (!,C*,K*) castle/keep-castle}
{NEW:WALL Kh (!,Kh*) castle/keep}
{WALL_TRANSITION Ch,Cha,Coa (!,C*,K*) castle/snowy/castle}
{WALL_TRANSITION2 Kh,Kha,Koa C*,Ke* (!,C*,K*) castle/snowy/keep-castle}
{WALL_TRANSITION Kh,Kha (!,Kh*) castle/snowy/keep}
{NEW:WALL Ch,Cha,Coa (!,C*,K*) castle/snowy/castle}
{NEW:WALL2 Kh,Kha,Koa C*,Ke* (!,C*,K*) castle/snowy/keep-castle}
{NEW:WALL 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
# (!,Chr,Chs,!,Ch*) is used to catch convex transitions between Chw and Ch* without lots of additional rules
# don't do this at home
#17% 17% 17% 17% 17% 17%
{WALL_TRANSITION_P (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) 17 castle/sunken-ruin5}
{WALL_TRANSITION_P (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) 20 castle/sunken-ruin4}
{WALL_TRANSITION_P (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) 25 castle/sunken-ruin3}
{WALL_TRANSITION_P (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) 33 castle/sunken-ruin2}
{WALL_TRANSITION_P (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) 50 castle/sunken-ruin1}
{WALL_TRANSITION (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) castle/sunken-ruin}
# (!,Chr,Chs,!,Ch*) is used to catch convex transitions between Chw and Ch*
# without lots of additional rules
{NEW:WALL (!,Chr,Chs,Cha,Ce*,Ke*,!,Ch*) (W*) castle/sunken-ruin}
# This part doesn't work right
{WALL_TRANSITION2_P (Khw,Khs) (Ch*) (W*,Ss) 75 castle/sunken-ruinkeep1-castle}
@ -551,27 +545,22 @@
# 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%
{WALL_TRANSITION_P Ch* (!,C*,K*) 17 castle/ruin5}
{WALL_TRANSITION_P Ch* (!,C*,K*) 20 castle/ruin4}
{WALL_TRANSITION_P Ch* (!,C*,K*) 25 castle/ruin3}
{WALL_TRANSITION_P Ch* (!,C*,K*) 33 castle/ruin2}
{WALL_TRANSITION_P Ch* (!,C*,K*) 50 castle/ruin1}
{NEW:WALL Ch* (!,C*,K*) castle/ruin5}
# For any non-encampment, non-dwarvish castle that's left use the regular human castle here
{WALL_TRANSITION !,Ce*,Ke*,Cu*,Ku*,!,C* (!,C*,K*) castle/castle}
{NEW:WALL !,Ce*,Ke*,Cu*,Ku*,!,C* (!,C*,K*) castle/castle}
{WALL_TRANSITION2_P (Khr,Khw,Khs) (C*) (!,Ch*,Kh*) 75 castle/ruinkeep1-castle}
{WALL_TRANSITION2 (Khr,Khw,Khs) (C*) (!,Ch*,Kh*) castle/keep-castle}
{NEW:WALL2 (Khr,Khw,Khs) (C*) (!,Ch*,Kh*) castle/keep-castle}
{WALL_TRANSITION_P Kh* (!,K*) 75 castle/ruinkeep1}
{WALL_TRANSITION Kh* (!,K*) castle/keep}
{NEW:WALL 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}
{NEW:WALL (Ce,Ke,Ch*,Kh*,Cv,Kv,Co*,Ko*,Cd,Kd) (!,C*,K*) castle/encampment/regular}
{NEW:WALL (Ce*,Ke*,Ch*,Kh*,Cv,Kv,Co*,Ko*,Cd,Kd) (!,C*,K*) castle/encampment/snow}
# Castle & Encampment Base Transtions
@ -599,22 +588,22 @@
{DISABLE_BASE_TRANSITIONS (Cud,Kud)}
#dwarven castle transitions
{WALL_TRANSITION3 (Cud,Kud) Ql* Qx* unwalkable/dcastle-lava-chasm}
{WALL_TRANSITION3 (Cud,Kud) Ql* Qx* unwalkable/dcastle-lava-chasm}
{WALL_TRANSITION2 (Cud,Kud) X* (!,Cud,Kud,X*) castle/dwarven-castle-wall}
{WALL_TRANSITION2 (Cud,Kud) Ql* (!,Cud,Kud,Ql*) unwalkable/dcastle-lava}
{WALL_TRANSITION2 (Cud,Kud) Qx* (!,Cud,Kud,Qx*) unwalkable/dcastle-chasm}
{NEW:WALL2 (Cud,Kud) X* (!,Cud,Kud,X*) castle/dwarven-castle-wall}
{NEW:WALL2 (Cud,Kud) Ql* (!,Cud,Kud,Ql*) unwalkable/dcastle-lava}
{NEW:WALL2 (Cud,Kud) Qx* (!,Cud,Kud,Qx*) unwalkable/dcastle-chasm}
{WALL_TRANSITION (Cud,Kud) (!,Cud,Kud) castle/dwarven-castle}
{NEW:WALL (Cud,Kud) (!,Cud,Kud) castle/dwarven-castle}
{WALL_TRANSITION Xuce (Qx*,Ql*) cave/earthy-wall-rough-chasm}
{WALL_TRANSITION Xuce (!,Xu*) cave/earthy-wall-hewn}
{WALL_TRANSITION Xue,Xuce (Qx*,Ql*) cave/earthy-wall-rough-chasm}
{WALL_TRANSITION Xue,Xuce (!,Xu*) cave/earthy-wall-rough}
{WALL_TRANSITION Xuc,Xue,Xuce (Qx*,Ql*) cave/wall-rough-chasm}
{WALL_TRANSITION Xuc,Xue,Xuce (!,Xu*) cave/wall-hewn}
{WALL_TRANSITION Xu* (Qx*,Ql*) cave/wall-rough-chasm}
{WALL_TRANSITION Xu* (!,Xu*) cave/wall-rough}
{NEW:WALL Xuce (Qx*,Ql*) cave/earthy-wall-rough-chasm}
{NEW:WALL Xuce (!,Xu*) cave/earthy-wall-hewn}
{NEW:WALL Xue,Xuce (Qx*,Ql*) cave/earthy-wall-rough-chasm}
{NEW:WALL Xue,Xuce (!,Xu*) cave/earthy-wall-rough}
{NEW:WALL Xuc,Xue,Xuce (Qx*,Ql*) cave/wall-rough-chasm}
{NEW:WALL Xuc,Xue,Xuce (!,Xu*) cave/wall-hewn}
{NEW:WALL Xu* (Qx*,Ql*) cave/wall-rough-chasm}
{NEW:WALL Xu* (!,Xu*) cave/wall-rough}
# New Generic Castle-to Chasm transition

8
data/core/terrain-graphics/new-macros.cfg
View file

@ -115,7 +115,7 @@
layer=0
base=54,72
name={IMAGESTEM}@V-convex-@R0.png
variations=";2;3;4;5"
variations=";2;3;4;5;6"
[/image]
[/terrain_graphics]
@ -146,7 +146,7 @@
layer=0
base=54,72
name={IMAGESTEM}@V-concave-@R0.png
variations=";2;3;4;5"
variations=";2;3;4;5;6"
[/image]
[/terrain_graphics]
#enddef
@ -181,7 +181,7 @@
layer=0
base=54,72
name={IMAGESTEM}@V-cw-@R0.png
variations=";2;3;4;5"
variations=";2;3;4;5;6"
[/image]
[/terrain_graphics]
@ -212,7 +212,7 @@
layer=0
base=54,72
name={IMAGESTEM}@V-ccw-@R0.png
variations=";2;3;4;5"
variations=";2;3;4;5;6"
[/image]
[/terrain_graphics]
#enddef