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

converted the forests to by default use seasonally approprate grass...

Browse source 
...color instead of always using the olive-color, thus also
eliminating a glitch when the base was changed.  Also deleted unused
tile.
This commit is contained in:
J.W. Bjerk 2010-05-05 16:57:35 +00:00
parent d5bf6ba86e
commit fb2d9f73f6
3 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/core/images/terrain/desert-road.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 9.7 KiB

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

@ -220,6 +220,9 @@
# Illuminated caves
{OVERLAY_RANDOM_LF (*^Ufi,*^Ii) 1 light cave/beam}
#Small Stones (a test)
{OVERLAY_RANDOM *^Es embellishments/stones-small}
# Chasm bridges - for now they don't tile
{OVERLAY_F Qxu^Bs\ bridge cave/chasm-stone-bridge-se-nw}
{OVERLAY_F Qxu^Bs| bridge cave/chasm-stone-bridge-s-n}
@ -249,7 +252,10 @@
{TERRAIN_BASE_RANDOM Ggf flat/grass-flowers}
{TERRAIN_BASE_RANDOM Gs flat/savanna}
{TERRAIN_BASE_RANDOM Gs^F* forest/floor}
{TERRAIN_BASE_RANDOM Gd flat/grass-dry}
# Note this terrain may be temporary, i'm spiltting it off of Gs, so we don't always get the forest floor transitions
{TERRAIN_BASE_RANDOM Gff forest/floor}
{TERRAIN_BASE_RANDOM Re,Ce,Ke flat/dirt}
@ -527,10 +533,13 @@
{TRANSITION_BASE_L (Gg*,Qxu) (!,Gg*,Qxu,Mm,Ms,Hh) -270 flat/grass}
{TRANSITION_BASE_LF (!,Ggf) Ggf -271 flower-transition flat/grass}
{TRANSITION_BASE_L Gs^F* (W*,Ss) -278 forest/floor-to-water}
{TRANSITION_BASE_L Gs^F* (!,Gs^F*,Qxu) -279 forest/floor}
{TRANSITION_BASE_L Gff (W*,Ss) -278 forest/floor-to-water}
{TRANSITION_BASE_L Gff (!,Gff,Qxu) -279 forest/floor}
{TRANSITION_BASE_L Gs (W*,Ss) -280 flat/savanna-to-water}
{TRANSITION_BASE_L Gs (!,Gs,Qxu) -290 flat/savanna}
{TRANSITION_BASE_L Gd (W*,Ss) -292 flat/grass-dry-to-water}
{TRANSITION_BASE_L Gd (!,Gd,Qxu) -294 flat/grass-dry}
{TRANSITION_BASE_L Rr (!,Rr) -300 flat/road}
{TRANSITION_BASE_L Rp (!,Rp) -310 flat/stone-path}
{TRANSITION_BASE_LF *^Gvs (!,*^Gvs,C*,K*,*^F*,M*,H*,W*) -320 transition2 flat/farm-veg-spring}

43
data/core/terrain.cfg
View file

@ -451,6 +451,8 @@
editor_group=castle
[/terrain_type]
#
# Desert
#
@ -507,6 +509,20 @@
[/terrain_type]
#
# Embellishments
#
[terrain_type]
symbol_image=embellishments/stones-small7
id=stones_small
name= _ "Stones"
string=^Es
aliasof=_bas
editor_group=flat
[/terrain_type]
#
# Forests
#
@ -537,7 +553,7 @@
name= _ "Forest"
description=_ "Pine Forest"
string=^Fp
default_base=Gs
default_base=Gff
editor_group=forest
[/terrain_type]
@ -570,7 +586,7 @@
name=_ "Forest"
description=_ "Fall Deciduous Forest"
string=^Fdf
default_base=Gs
default_base=Gd
aliasof=^Fp
editor_group=forest
[/terrain_type]
@ -615,7 +631,7 @@
name=_ "Forest"
description=_ "Fall Mixed Forest"
string=^Fmf
default_base=Gs
default_base=Gd
aliasof=^Fp
editor_group=forest
[/terrain_type]
@ -626,7 +642,7 @@
name=_ "Forest"
description=_ "Winter Mixed Forest"
string=^Fmw
default_base=Gs
default_base=Gd
aliasof=^Fp
editor_group=forest
[/terrain_type]
@ -785,6 +801,25 @@
editor_group=flat
[/terrain_type]
[terrain_type]
symbol_image=flat/grass-dry
id=grass_dry
name= _ "dry grass"
string=Gd
aliasof=Gt
editor_group=flat
[/terrain_type]
#NOTE the following terrain is probably temporary. It used to be simply a different appearance of the savanna when under a forest, which caused weird transitions
[terrain_type]
symbol_image=forest/floor
id=forest_floor
name= _ "Grassland"
string=Gff
aliasof=Gt
editor_group=flat
[/terrain_type]
[terrain_type]
symbol_image=windmill-tile
id=windmill