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

Village-code changes requested by zookeeper,

Browse source 
...and wmllint code to perform them.
This commit is contained in:
Eric S. Raymond 2010-09-13 16:43:50 +00:00
parent 33fceff06b
commit 4147c6c77f
4 changed files with 22 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@
{VILLAGE_RANDOM *^Vh village/human}
{VILLAGE_RANDOM *^Vha village/human-snow}
{VILLAGE *^Vhh,*^Vhm village/human-hills}
{VILLAGE *^Vhh,*^Vhh village/human-hills}
{VILLAGE *^Vhha village/human-snow-hills}
{VILLAGE_RANDOM *^Vhc village/human-city}
@ -200,9 +200,9 @@
{VILLAGE *^Vht village/tropical-forest}
#Crude villages (grassland)
{VILLAGE_RANDOM *^Vc,*^Vch,*^Vcm village/hut}
{VILLAGE_RANDOM *^Vc,*^Vc,*^Vc village/hut}
{VILLAGE_RANDOM *^Vca,*^Vcha village/hut-snow}
{VILLAGE_RANDOM *^Vca,*^Vca village/hut-snow}
{VILLAGE_RANDOM *^Vl village/log-cabin}
{VILLAGE *^Vla village/log-cabin-snow}
@ -218,9 +218,9 @@
{VILLAGE_P *^Vd 100 village/drake5}
#Orcish villages
{VILLAGE_RANDOM *^Vo,*^Voh village/orc}
{VILLAGE_RANDOM *^Vo,*^Vo village/orc}
{VILLAGE_RANDOM *^Voa,*^Voha village/orc-snow}
{VILLAGE_RANDOM *^Voa,*^Voa village/orc-snow}
#Elven villages
#10% 25% 25% 40%

14
data/core/terrain.cfg
View file

@ -1108,7 +1108,7 @@
id=orcish_hill_village
# name= _ "Village"
# editor_name= _ "Orcish Hill Village"
string=^Voh
string=^Vo
aliasof=Vi, _bas
default_base=Hh
heals=8
@ -1121,7 +1121,7 @@
id=orcish_snow_hills_village
# name= _ "Village"
# editor_name= _ "Snowy Orcish Hill Village"
string=^Voha
string=^Voa
aliasof=Vi, _bas
default_base=Ha
heals=8
@ -1242,7 +1242,7 @@
id=snow-mountain_village
# name= _ "Village"
# editor_name= _ "Snowy Stone Mountain Village"
string=^Vhms
string=^Vhha
aliasof=Vi, _bas
default_base=Ms
heals=8
@ -1255,7 +1255,7 @@
id=mountain_village
# name= _ "Village"
# editor_name= _ "Stone Mountain Village"
string=^Vhm
string=^Vhh
aliasof=Vi, _bas
default_base=Mm
heals=8
@ -1361,7 +1361,7 @@
id=hut_hills_village
# name= _ "Village"
# editor_name= _ "Hills Hut"
string=^Vch
string=^Vc
aliasof=Vi, _bas
default_base=Hh
heals=8
@ -1374,7 +1374,7 @@
id=hut_snow_hills_village
# name= _ "Village"
# editor_name= _ "Snowy Hill Hut"
string=^Vcha
string=^Vca
aliasof=Vi, _bas
default_base=Ha
heals=8
@ -1387,7 +1387,7 @@
id=hut_mountains_village
# name= _ "Village"
# editor_name= _ "Mountain Hut"
string=^Vcm
string=^Vc
aliasof=Vi, _bas
default_base=Mm
heals=8

2
data/multiplayer/scenarios/4p_A_New_Land.cfg
View file

@ -567,7 +567,7 @@
[filter]
side=5,6,7,8
[filter_location]
terrain=Mm^Vhm
terrain=Mm^Vhh
[/filter_location]
[/filter]
{MODIFY_TERRAIN "Mm" $x1 $y1}

25
data/tools/wmllint
View file

@ -124,22 +124,15 @@ from wesnoth.wmliterator import *
# Changes meant to be done on maps and .cfg lines.
mapchanges = (
("Ha^Voa", "Ha^Voha"),
("Hh^Vo,", "Hh^Voh,"),
("Hh^Vo\r", "Hh^Voh\r"),
("Hh^Vo\n", "Hh^Voh\n"),
("Mm^Vhh", "Mm^Vhm"),
("Hh^Vc,", "Hh^Vch,"),
("Hh^Vc\r", "Hh^Vch\r"),
("Hh^Vc\n", "Hh^Vch\n"),
("Ha^Vca", "Ha^Vcha"),
("Mm^Vc,", "Mm^Vcm,"),
("Mm^Vc\r", "Mm^Vcm\r"),
("Mm^Vc\n", "Mm^Vcm\n"),
("Ggf,", "Gg^Emf,"),
("Ggf\r", "Gg^Emf\r"),
("Ggf\n", "Gg^Emf\n"),
)
("^Voha", "^Voa"),
("^Voh", "^Vo"),
("^Vhms", "^Vhha"),
("^Vhm", "^Vhh"),
("^Vcha", "^Vca"),
("^Vch", "^Vc"),
("^Vcm", "^Vc"),
("Ggf,", "Gg^Emf"),
)
# Global changes meant to be done on all lines. Suppressed by noconvert.
linechanges = (