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

created new editor group: ‘embellishments’,

Browse source 
...and added desert plants to that group.  This means cacti and so
forth no longer automatically appear on the desert.  They must be
added by hand where they are wanted (weather over sand or any other
base terrain).
This commit is contained in:
J.W. Bjerk 2010-05-07 01:20:31 +00:00
parent b1b1a8d724
commit e3af4bbd17
8 changed files with 39 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog
View file

@ -43,6 +43,7 @@ Version 1.9.0-svn:
* added new "small mushrooms" embellishment
* fix for dwarven castle to cave wall alignment issue by Alarantalara
* made encampment and orc forts use regular dirt rather than a custom terrain
* created new editor group: ÔembellishmentsÕ, and added desert plants to that group
* User interface:
* Added the era AI in the list of AI shown when opening a game
* Added dialog for installation of add-on dependencies

7
data/core/editor/terrain-groups.cfg
View file

@ -32,6 +32,13 @@
core=yes
[/editor_group]
[editor_group]
id=embellishments
name= _ "embellishments"
icon="group_embellishments"
core=yes
[/editor_group]
[editor_group]
id=forest
name= _ "forest"

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

@ -284,21 +284,21 @@
{TERRAIN_BASE_RANDOM Dd desert}
# only use the smaller plant tiles when adjacent to castles, chasms etc
{OVERLAY_RESTRICTED_PF Dd^ (C*,K*,Q*) 5 overlay desert-plant}
{OVERLAY_RESTRICTED_PF Dd^ (C*,K*,Q*) 5 overlay desert-plant2}
{OVERLAY_RESTRICTED_PF Dd^ (C*,K*,Q*) 5 overlay desert-plant3}
{OVERLAY_RESTRICTED_PF *^Edp (C*,K*,Q*) 33 overlay desert-plant}
{OVERLAY_RESTRICTED_PF *^Edp (C*,K*,Q*) 50 overlay desert-plant2}
{OVERLAY_RESTRICTED_PF *^Edp (C*,K*,Q*) 100 overlay desert-plant3}
# and then any plant tile elsewhere
{OVERLAY_PF Dd^ 0.1 overlay desert-plant}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant2}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant3}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant4}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant5}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant6}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant7}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant8}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant9}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant10}
{OVERLAY_PF Dd^ 0.1 overlay desert-plant11}
{OVERLAY_PF *^Edp 9 overlay desert-plant}
{OVERLAY_PF *^Edp 10 overlay desert-plant2}
{OVERLAY_PF *^Edp 11 overlay desert-plant3}
{OVERLAY_PF *^Edp 12.5 overlay desert-plant4}
{OVERLAY_PF *^Edp 14 overlay desert-plant5}
{OVERLAY_PF *^Edp 17 overlay desert-plant6}
{OVERLAY_PF *^Edp 20 overlay desert-plant7}
{OVERLAY_PF *^Edp 25 overlay desert-plant8}
{OVERLAY_PF *^Edp 33 overlay desert-plant9}
{OVERLAY_PF *^Edp 50 overlay desert-plant10}
{OVERLAY_PF *^Edp 100 overlay desert-plant11}
#10% 10% 10% 70%
{TERRAIN_BASE_P Ds 10 sand-rock1}
@ -336,15 +336,13 @@
# Water base terrains
#ANIMATED
{TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}
{TERRAIN_BASE_B Wo ANIMATION_15 water/ocean}
#30% 30% 40%
{TERRAIN_BASE_B Ww ANIMATION_15 water/coast}
{TERRAIN_BASE_B Wt ANIMATION_15 water/coast-tropical}
{TERRAIN_BASE_B Ww ANIMATION_15 water/coast}
{TERRAIN_BASE_B Wt ANIMATION_15 water/coast-tropical}
#33% 67%
{TERRAIN_BASE_P Wwf 33 water/ford2}
{TERRAIN_BASE Wwf water/ford}
{TERRAIN_BASE_RANDOM Wwf water/ford}
{TERRAIN_BASE_RANDOM Wwr water/reef}
@ -453,11 +451,13 @@
{WALL_TRANSITION_L Co (!,Co*,Ko*) 1 castle/orcish/fort}
{WALL_TRANSITION2_L Ko Co* (!,Co*,Ko*) 1 castle/orcish/keep-fort}
{WALL_TRANSITION_L Ko (!,Ko*) 1 castle/orcish/keep}
# I don't think the following line does anything. Those images were deleted, but nothing seems messed up
{TRANSITION_BASE_LF Co (!,Co,!,Co*) 0 castle_soil castle/orcish/dirt}
{WALL_TRANSITION_L (Co,Coa) (!,Co*,Ko*) 1 castle/winter-orcish/fort}
{WALL_TRANSITION2_L (Ko,Koa) Co* (!,Co*,Ko*) 1 castle/winter-orcish/keep-fort}
{WALL_TRANSITION_L (Ko,Koa) (!,Ko*) 1 castle/winter-orcish/keep}
# I don't think the following line does anything. Those images were deleted, but nothing seems messed up
{TRANSITION_BASE_LF Coa (!,Coa,!,Co*) 0 castle_soil castle/winter-orcish/dirt}
# Desert castle

13
data/core/terrain.cfg
View file

@ -519,7 +519,7 @@
name= _ "Stones"
string=^Es
aliasof=_bas
editor_group=flat
editor_group=embellishments
[/terrain_type]
[terrain_type]
@ -528,7 +528,16 @@
name= _ "Mushrooms"
string=^Em
aliasof=_bas
editor_group=flat
editor_group=embellishments
[/terrain_type]
[terrain_type]
symbol_image=desert-plant
id=mushrooms_small
name= _ "desert plants"
string=^Edp
aliasof=_bas
editor_group=embellishments, desert
[/terrain_type]

BIN
images/buttons/group_embellishments-active-pressed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
images/buttons/group_embellishments-active.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
images/buttons/group_embellishments-pressed.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
images/buttons/group_embellishments.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB