mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-10 13:10:47 +00:00
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.
This commit is contained in:
Hogne Håskjold
parent
5955ba5f99
commit
021fc86cd4
@ -228,8 +228,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=1
|
pos=1
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range3_1
|
name=mountain_range3_1
|
||||||
@ -240,8 +240,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=2
|
pos=2
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range3_2
|
name=mountain_range3_2
|
||||||
@ -252,8 +252,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=3
|
pos=3
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range3_3
|
name=mountain_range3_3
|
||||||
@ -264,8 +264,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=4
|
pos=4
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range3_4
|
name=mountain_range3_4
|
||||||
@ -276,8 +276,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=5
|
pos=5
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range3_5
|
name=mountain_range3_5
|
||||||
@ -301,8 +301,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=1
|
pos=1
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range4_1
|
name=mountain_range4_1
|
||||||
@ -313,8 +313,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=2
|
pos=2
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range4_2
|
name=mountain_range4_2
|
||||||
@ -325,8 +325,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=3
|
pos=3
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range4_3
|
name=mountain_range4_3
|
||||||
@ -337,8 +337,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=4
|
pos=4
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range4_4
|
name=mountain_range4_4
|
||||||
@ -349,8 +349,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=5
|
pos=5
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range4_5
|
name=mountain_range4_5
|
||||||
@ -374,8 +374,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=1
|
pos=1
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range1_1
|
name=mountain_range1_1
|
||||||
@ -386,8 +386,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=2
|
pos=2
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range1_2
|
name=mountain_range1_2
|
||||||
@ -398,8 +398,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=3
|
pos=3
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range1_3
|
name=mountain_range1_3
|
||||||
@ -424,8 +424,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=1
|
pos=1
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range2_1
|
name=mountain_range2_1
|
||||||
@ -436,8 +436,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=2
|
pos=2
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range2_2
|
name=mountain_range2_2
|
||||||
@ -448,8 +448,8 @@
|
|||||||
[tile]
|
[tile]
|
||||||
pos=3
|
pos=3
|
||||||
type=mb
|
type=mb
|
||||||
no_flag="base"
|
no_flag="overlay"
|
||||||
set_flag="base"
|
set_flag="overlay"
|
||||||
[/tile]
|
[/tile]
|
||||||
[image]
|
[image]
|
||||||
name=mountain_range2_3
|
name=mountain_range2_3
|
||||||
@ -513,42 +513,8 @@
|
|||||||
#enddef
|
#enddef
|
||||||
|
|
||||||
# DHEX TYPE NAME1 NAME2 NAME3 FLAG PROB TILE POS
|
# DHEX TYPE NAME1 NAME2 NAME3 FLAG PROB TILE POS
|
||||||
{DHEX mb mountain5_1 mountain5_2 mountain5_3 base 20}
|
{DHEX mb mountain5_1 mountain5_2 mountain5_3 overlay 20}
|
||||||
{DHEX mb mountain6_1 mountain6_2 mountain6_3 base 20}
|
{DHEX mb mountain6_1 mountain6_2 mountain6_3 overlay 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}
|
|
||||||
|
|
||||||
|
|
||||||
#Macro for Single Hex
|
#Macro for Single Hex
|
||||||
#define SHEX TYPE FLAG PROB TILE
|
#define SHEX TYPE FLAG PROB TILE
|
||||||
@ -577,6 +543,11 @@
|
|||||||
[/terrain_graphics]
|
[/terrain_graphics]
|
||||||
#enddef
|
#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
|
#Single hex normal forest tiles
|
||||||
{SHEX f overlay 33 forest}
|
{SHEX f overlay 33 forest}
|
||||||
{SHEX f overlay 25 forest3}
|
{SHEX f overlay 25 forest3}
|
||||||
@ -608,50 +579,51 @@
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Villages
|
# Villages
|
||||||
#
|
# Flagged as 'village' so they can be placed on
|
||||||
|
# top of both 'base' and 'overlay'
|
||||||
|
|
||||||
#Single hex human villages (grassland, hills, mountains)
|
#Single hex human villages (grassland, hills, mountains)
|
||||||
{SHEX v overlay 30 village-human}
|
{SHEX v village 30 village-human}
|
||||||
{SHEX v overlay 30 village-human2}
|
{SHEX v village 30 village-human2}
|
||||||
{SHEX v overlay 100 village-human3}
|
{SHEX v village 100 village-human3}
|
||||||
{SHEX ab overlay 100 village-human4}
|
{SHEX ab village 100 village-human4}
|
||||||
|
|
||||||
#Single hex human villages (snow)
|
#Single hex human villages (snow)
|
||||||
{SHEX V overlay 33 village-human-snow}
|
{SHEX V village 33 village-human-snow}
|
||||||
{SHEX V overlay 33 village-human-snow2}
|
{SHEX V village 33 village-human-snow2}
|
||||||
{SHEX V overlay 100 village-human-snow3}
|
{SHEX V village 100 village-human-snow3}
|
||||||
{SHEX A overlay 100 village-human-snow4}
|
{SHEX A village 100 village-human-snow4}
|
||||||
|
|
||||||
#Single hex elven villages
|
#Single hex elven villages
|
||||||
{SHEX t overlay 10 village-elven}
|
{SHEX t village 10 village-elven}
|
||||||
{SHEX t overlay 25 village-elven3}
|
{SHEX t village 25 village-elven3}
|
||||||
{SHEX t overlay 25 village-elven4}
|
{SHEX t village 25 village-elven4}
|
||||||
{SHEX t overlay 100 village-elven2}
|
{SHEX t village 100 village-elven2}
|
||||||
|
|
||||||
#Single hex elven villages (snow)
|
#Single hex elven villages (snow)
|
||||||
{SHEX e overlay 10 village-elven-snow}
|
{SHEX e village 10 village-elven-snow}
|
||||||
{SHEX e overlay 25 village-elven-snow3}
|
{SHEX e village 25 village-elven-snow3}
|
||||||
{SHEX e overlay 25 village-elven-snow4}
|
{SHEX e village 25 village-elven-snow4}
|
||||||
{SHEX e overlay 100 village-elven-snow2}
|
{SHEX e village 100 village-elven-snow2}
|
||||||
|
|
||||||
#Single hex desert villages
|
#Single hex desert villages
|
||||||
{SHEX B overlay 100 village-desert}
|
{SHEX B village 100 village-desert}
|
||||||
{SHEX U overlay 100 village-desert2}
|
{SHEX U village 100 village-desert2}
|
||||||
|
|
||||||
#Single hex underground villages
|
#Single hex underground villages
|
||||||
{SHEX D overlay 33 village-cave}
|
{SHEX D village 33 village-cave}
|
||||||
{SHEX D overlay 33 village-cave2}
|
{SHEX D village 33 village-cave2}
|
||||||
{SHEX D overlay 100 village-cave3}
|
{SHEX D village 100 village-cave3}
|
||||||
{SHEX p overlay 100 village-dwarven}
|
{SHEX p village 100 village-dwarven}
|
||||||
|
|
||||||
#Single hex swamp village
|
#Single hex swamp village
|
||||||
{SHEX Y overlay 100 village-swampwater}
|
{SHEX Y village 100 village-swampwater}
|
||||||
|
|
||||||
#Single hex coastal village
|
#Single hex coastal village
|
||||||
{SHEX Z overlay 100 village-coast}
|
{SHEX Z village 100 village-coast}
|
||||||
|
|
||||||
#Single hex tropical village
|
#Single hex tropical village
|
||||||
{SHEX L overlay 100 village-tropical-forest}
|
{SHEX L village 100 village-tropical-forest}
|
||||||
|
|
||||||
#
|
#
|
||||||
# Village base terrain
|
# Village base terrain
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user