From 021fc86cd48a73636b57bc1e2d41fb7fb4fee2f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hogne=20H=C3=A5skjold?= Date: Mon, 13 Feb 2006 23:54:02 +0000 Subject: [PATCH] Changed mountains to overlay again... ...in preparation of making a castle<->mountain special transition. Changes villages to use 'village' flag so they can be placed on top of 'overlay' as well as 'base'. Removed a no longer needed special case. --- data/terrain-graphics.cfg | 160 ++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 94 deletions(-) diff --git a/data/terrain-graphics.cfg b/data/terrain-graphics.cfg index 9dcbbf2afc6..05a48b850e5 100644 --- a/data/terrain-graphics.cfg +++ b/data/terrain-graphics.cfg @@ -228,8 +228,8 @@ [tile] pos=1 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range3_1 @@ -240,8 +240,8 @@ [tile] pos=2 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range3_2 @@ -252,8 +252,8 @@ [tile] pos=3 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range3_3 @@ -264,8 +264,8 @@ [tile] pos=4 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range3_4 @@ -276,8 +276,8 @@ [tile] pos=5 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range3_5 @@ -301,8 +301,8 @@ [tile] pos=1 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range4_1 @@ -313,8 +313,8 @@ [tile] pos=2 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range4_2 @@ -325,8 +325,8 @@ [tile] pos=3 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range4_3 @@ -337,8 +337,8 @@ [tile] pos=4 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range4_4 @@ -349,8 +349,8 @@ [tile] pos=5 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range4_5 @@ -374,8 +374,8 @@ [tile] pos=1 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range1_1 @@ -386,8 +386,8 @@ [tile] pos=2 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range1_2 @@ -398,8 +398,8 @@ [tile] pos=3 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range1_3 @@ -424,8 +424,8 @@ [tile] pos=1 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range2_1 @@ -436,8 +436,8 @@ [tile] pos=2 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range2_2 @@ -448,8 +448,8 @@ [tile] pos=3 type=mb - no_flag="base" - set_flag="base" + no_flag="overlay" + set_flag="overlay" [/tile] [image] name=mountain_range2_3 @@ -513,42 +513,8 @@ #enddef # DHEX TYPE NAME1 NAME2 NAME3 FLAG PROB TILE POS -{DHEX mb mountain5_1 mountain5_2 mountain5_3 base 20} -{DHEX mb mountain6_1 mountain6_2 mountain6_3 base 20} - -# extra macro for single hex mountains / villages -# (base position is different so mountains don't hide mountain villages) -#define SHEX2 TYPE FLAG PROB TILE -[terrain_graphics] - map=" - * -* * - 1 -* * - *" - - [tile] - pos=1 - type={TYPE} - no_flag={FLAG} - set_flag={FLAG} - [/tile] - - probability={PROB} - - [image] - name={TILE} - position=vertical - base=89,145 - [/image] -[/terrain_graphics] -#enddef - -#Single hex mountain tiles -{SHEX2 mb base 33 mountains3} -{SHEX2 mb base 33 mountains2} -{SHEX2 mb base 100 mountains} - +{DHEX mb mountain5_1 mountain5_2 mountain5_3 overlay 20} +{DHEX mb mountain6_1 mountain6_2 mountain6_3 overlay 20} #Macro for Single Hex #define SHEX TYPE FLAG PROB TILE @@ -577,6 +543,11 @@ [/terrain_graphics] #enddef +#Single hex mountain tiles (mountain + village) +{SHEX mb overlay 33 mountains3} +{SHEX mb overlay 33 mountains2} +{SHEX mb overlay 100 mountains} + #Single hex normal forest tiles {SHEX f overlay 33 forest} {SHEX f overlay 25 forest3} @@ -608,50 +579,51 @@ # # Villages -# +# Flagged as 'village' so they can be placed on +# top of both 'base' and 'overlay' #Single hex human villages (grassland, hills, mountains) -{SHEX v overlay 30 village-human} -{SHEX v overlay 30 village-human2} -{SHEX v overlay 100 village-human3} -{SHEX ab overlay 100 village-human4} +{SHEX v village 30 village-human} +{SHEX v village 30 village-human2} +{SHEX v village 100 village-human3} +{SHEX ab village 100 village-human4} #Single hex human villages (snow) -{SHEX V overlay 33 village-human-snow} -{SHEX V overlay 33 village-human-snow2} -{SHEX V overlay 100 village-human-snow3} -{SHEX A overlay 100 village-human-snow4} +{SHEX V village 33 village-human-snow} +{SHEX V village 33 village-human-snow2} +{SHEX V village 100 village-human-snow3} +{SHEX A village 100 village-human-snow4} #Single hex elven villages -{SHEX t overlay 10 village-elven} -{SHEX t overlay 25 village-elven3} -{SHEX t overlay 25 village-elven4} -{SHEX t overlay 100 village-elven2} +{SHEX t village 10 village-elven} +{SHEX t village 25 village-elven3} +{SHEX t village 25 village-elven4} +{SHEX t village 100 village-elven2} #Single hex elven villages (snow) -{SHEX e overlay 10 village-elven-snow} -{SHEX e overlay 25 village-elven-snow3} -{SHEX e overlay 25 village-elven-snow4} -{SHEX e overlay 100 village-elven-snow2} +{SHEX e village 10 village-elven-snow} +{SHEX e village 25 village-elven-snow3} +{SHEX e village 25 village-elven-snow4} +{SHEX e village 100 village-elven-snow2} #Single hex desert villages -{SHEX B overlay 100 village-desert} -{SHEX U overlay 100 village-desert2} +{SHEX B village 100 village-desert} +{SHEX U village 100 village-desert2} #Single hex underground villages -{SHEX D overlay 33 village-cave} -{SHEX D overlay 33 village-cave2} -{SHEX D overlay 100 village-cave3} -{SHEX p overlay 100 village-dwarven} +{SHEX D village 33 village-cave} +{SHEX D village 33 village-cave2} +{SHEX D village 100 village-cave3} +{SHEX p village 100 village-dwarven} #Single hex swamp village -{SHEX Y overlay 100 village-swampwater} +{SHEX Y village 100 village-swampwater} #Single hex coastal village -{SHEX Z overlay 100 village-coast} +{SHEX Z village 100 village-coast} #Single hex tropical village -{SHEX L overlay 100 village-tropical-forest} +{SHEX L village 100 village-tropical-forest} # # Village base terrain