Author: mesilliac
Date: Sun Apr 6 04:09:28 2008
New Revision: 25611
URL: http://svn.gna.org/viewcvs/wesnoth?rev=25611&view=rev
Log:
change most Qxu to Qx* to allow custom terrains derived from chasm (e.g.
abyss)
Modified:
trunk/data/core/terrain-graphics/_final.cfg
Modified: trunk/data/core/terrain-graphics/_final.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/core/terrain-graphics/_final.cfg?rev=25611&r1=25610&r2=25611&view=diff
==============================================================================
--- trunk/data/core/terrain-graphics/_final.cfg (original)
+++ trunk/data/core/terrain-graphics/_final.cfg Sun Apr 6 04:09:28 2008
@@ -24,36 +24,36 @@
# Macros moved to terrain-graphics/forestcastle.cfg
#-----------------------------------------------------------------
-{FORESTADJCASTLEA *^Fp (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/pine-castle}
-{FORESTADJCASTLEA *^Fpa (C*,K*,X*,Ql,Qxu,Gv*) 100 snow-forest-castle}
-{FORESTADJCASTLEA *^Ft (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/tropical-castle}
-{FORESTADJCASTLEA *^Uf (C*,K*,X*,Ql,Qxu,Gv*) 100 mushrooms-castle}
-
-{FORESTADJCASTLES *^Fp (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/pine-castle}
-{FORESTADJCASTLES *^Fpa (C*,K*,X*,Ql,Qxu,Gv*) 100 snow-forest-castle}
-{FORESTADJCASTLES *^Ft (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/tropical-castle}
-{FORESTADJCASTLES *^Uf (C*,K*,X*,Ql,Qxu,Gv*) 100 mushrooms-castle}
-
-{FORESTADJCASTLEO *^Fp (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/pine-castle}
-{FORESTADJCASTLEO *^Fpa (C*,K*,X*,Ql,Qxu,Gv*) 100 snow-forest-castle}
-{FORESTADJCASTLEO *^Ft (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/tropical-castle}
-{FORESTADJCASTLEO *^Uf (C*,K*,X*,Ql,Qxu,Gv*) 100 mushrooms-castle}
-
-{FORESTADJCASTLE *^Fp (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/pine-castle}
-{FORESTADJCASTLE *^Fpa (C*,K*,X*,Ql,Qxu,Gv*) 100 snow-forest-castle}
-{FORESTADJCASTLE *^Ft (C*,K*,X*,Ql,Qxu,Gv*) 100 forest/tropical-castle}
-{FORESTADJCASTLE *^Uf (C*,K*,X*,Ql,Qxu,Gv*) 100 mushrooms-castle}
-
-{FORESTADJCASTLES Mm (C*,K*,X*,Ql,Qx*) 100 mountains-castle-n}
-{FORESTADJCASTLEO Mm (C*,K*,X*,Ql,Qx*) 100 mountains-castle-n}
-{MOUNTAINADJCASTLEA Mm (C*,K*,X*,Ql,Qx*) 100 mountains-castle}
-{FORESTADJCASTLE Mm (C*,K*,X*,Ql,Qx*) 100 mountains-castle}
+{FORESTADJCASTLEA *^Fp (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/pine-castle}
+{FORESTADJCASTLEA *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*) 100 snow-forest-castle}
+{FORESTADJCASTLEA *^Ft (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/tropical-castle}
+{FORESTADJCASTLEA *^Uf (C*,K*,X*,Ql*,Qx*,Gv*) 100 mushrooms-castle}
+
+{FORESTADJCASTLES *^Fp (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/pine-castle}
+{FORESTADJCASTLES *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*) 100 snow-forest-castle}
+{FORESTADJCASTLES *^Ft (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/tropical-castle}
+{FORESTADJCASTLES *^Uf (C*,K*,X*,Ql*,Qx*,Gv*) 100 mushrooms-castle}
+
+{FORESTADJCASTLEO *^Fp (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/pine-castle}
+{FORESTADJCASTLEO *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*) 100 snow-forest-castle}
+{FORESTADJCASTLEO *^Ft (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/tropical-castle}
+{FORESTADJCASTLEO *^Uf (C*,K*,X*,Ql*,Qx*,Gv*) 100 mushrooms-castle}
+
+{FORESTADJCASTLE *^Fp (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/pine-castle}
+{FORESTADJCASTLE *^Fpa (C*,K*,X*,Ql*,Qx*,Gv*) 100 snow-forest-castle}
+{FORESTADJCASTLE *^Ft (C*,K*,X*,Ql*,Qx*,Gv*) 100 forest/tropical-castle}
+{FORESTADJCASTLE *^Uf (C*,K*,X*,Ql*,Qx*,Gv*) 100 mushrooms-castle}
+
+{FORESTADJCASTLES Mm (C*,K*,X*,Ql*,Qx*) 100 mountains-castle-n}
+{FORESTADJCASTLEO Mm (C*,K*,X*,Ql*,Qx*) 100 mountains-castle-n}
+{MOUNTAINADJCASTLEA Mm (C*,K*,X*,Ql*,Qx*) 100 mountains-castle}
+{FORESTADJCASTLE Mm (C*,K*,X*,Ql*,Qx*) 100 mountains-castle}
#33% 17% 5% 45%
-{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql,Qxu,Gv*) 33 forest/pine_small}
-{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql,Qxu,Gv*) 25 forest/pine3}
-{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql,Qxu,Gv*) 10 forest/pine4}
-{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql,Qxu,Gv*) 100 forest/pine2_small}
+{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql*,Qx*,Gv*) 33 forest/pine_small}
+{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql*,Qx*,Gv*) 25 forest/pine3}
+{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql*,Qx*,Gv*) 10 forest/pine4}
+{FORESTADJ *^Fp (W*,M*,Hd,*^V*,X*,Ql*,Qx*,Gv*) 100 forest/pine2_small}
{FORESTADJ *^Fpa (W*,M*,Hd,*^V*) 100 snow-forest_small}
@@ -104,9 +104,9 @@
{TERRAIN_BASE_FL Qxu^Bs| cave/chasm-stone-bridge-s-n bridge 1}
{TERRAIN_BASE_FL Qxu^Bs/ cave/chasm-stone-bridge-sw-ne bridge 1}
-{TERRAIN_ADJACENT 0 Qxu^Bs\ (!,Qxu)
cave/chasm-stone-bridge-se-nw}
-{TERRAIN_ADJACENT 0 Qxu^Bs| (!,Qxu)
cave/chasm-stone-bridge-s-n}
-{TERRAIN_ADJACENT 0 Qxu^Bs/ (!,Qxu)
cave/chasm-stone-bridge-sw-ne}
+{TERRAIN_ADJACENT 0 Qxu^Bs\ (!,Qx*)
cave/chasm-stone-bridge-se-nw}
+{TERRAIN_ADJACENT 0 Qxu^Bs| (!,Qx*)
cave/chasm-stone-bridge-s-n}
+{TERRAIN_ADJACENT 0 Qxu^Bs/ (!,Qx*)
cave/chasm-stone-bridge-sw-ne}
{TERRAIN_BASE_FL Ql^Bs\ cave/chasm-lava-stone-bridge-se-nw bridge 1}
{TERRAIN_BASE_FL Ql^Bs| cave/chasm-lava-stone-bridge-s-n bridge 1}
@@ -817,12 +817,12 @@
{DISABLE_TRANSITIONS Xos}
{DISABLE_TRANSITIONS (Cud,Kud)}
-{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 (!,X*,Cud,Kud,Qx*,Ql)
cave/wall-rough}
+{TERRAIN_ADJACENT_CORNER Xu (!,X*,Cud,Kud,Qx*,Ql)
(Qxu,Ql) 54,68 cave/wall-rough-convex}
+{TERRAIN_ADJACENT_CORNER Xu (Qxu,Ql)
(!,Xu,Cud,Kud,Qx*,Ql) 54,68 cave/wall-rough-convex}
{TERRAIN_ADJACENT_CORNER_BOTH Xu (Qxu,Ql)
cave/wall-rough-chasm}
-{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) (!,X*,Qxu,Ql,Cud,Kud)
castle/dwarven-castle}
+{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) (!,X*,Qx*,Ql,Cud,Kud)
castle/dwarven-castle}
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) X*
castle/dwarven-castle-wall}
@@ -832,15 +832,15 @@
#castle-chasm transitions
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Qxu
chasm-dcastle}
-{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}
+{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,X*,Ql,Qx*) Qxu
52,76 chasm-dcastle-ccw}
+{TERRAIN_ADJACENT_CORNER (Cud,Kud) Qxu
(!,Cud,Kud,X*,Ql,Qx*) 52,76 chasm-dcastle-cw}
#castle-lava transitions
{TERRAIN_ADJACENT_CORNER_BOTH (Cud,Kud) Ql
lava-dcastle}
-{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}
+{TERRAIN_ADJACENT_CORNER (Cud,Kud) (!,Cud,Kud,X*,Ql,Qx*) Ql
52,76 lava-dcastle-ccw}
+{TERRAIN_ADJACENT_CORNER (Cud,Kud) Ql
(!,Cud,Kud,X*,Ql,Qx*) 52,76 lava-dcastle-cw}
#chasm-water transitions
@@ -854,20 +854,20 @@
# Lava
{DISABLE_TRANSITIONS Ql}
-{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu) (!,Ql,Qxu)
-90 52,76 lava-convex}
-{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu) Ql Ql
-90 52,76 lava-concave}
+{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qx*) (!,Ql,Qx*)
-90 52,76 lava-convex}
+{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qx*) Ql Ql
-90 52,76 lava-concave}
# Lava-chasm
{TERRAIN_ADJACENT_CORNER_LAYER Qxu Ql Ql
-100 52,76 lava-chasm-convex}
{TERRAIN_ADJACENT_CORNER_LAYER Ql Qxu Qxu
-100 52,76 lava-chasm-concave}
-{TERRAIN_ADJACENT_CORNER_LAYER Ql Qxu (!,Ql,Qxu)
-90 52,76 lava-chasm-ccw}
-{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qxu) Qxu
-90 52,76 lava-chasm-cw}
+{TERRAIN_ADJACENT_CORNER_LAYER Ql Qxu (!,Ql,Qx*)
-90 52,76 lava-chasm-ccw}
+{TERRAIN_ADJACENT_CORNER_LAYER Ql (!,Ql,Qx*) Qxu
-90 52,76 lava-chasm-cw}
# Chasm
-{TERRAIN_ADJACENT_CORNER_LAYER Qxu (!,Ql,Qxu) (!,Ql,Qxu)
-90 52,76 chasm-convex}
-{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qxu) Qxu Qxu
-90 52,76 chasm-concave}
+{TERRAIN_ADJACENT_CORNER_LAYER Qxu (!,Ql,Qx*) (!,Ql,Qx*)
-90 52,76 chasm-convex}
+{TERRAIN_ADJACENT_CORNER_LAYER (!,Ql,Qx*) Qxu Qxu
-90 52,76 chasm-concave}
# Castle decorations and castle floors. Those must always be after the castles
# are defined.
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
