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

Changes requested to fulfil the FR in bug #16029...

Browse source 
...(wmllint rules needed for updating maps as per 2010-05-16T07:52:30Z!lari.nieminen@iki.fi).
This commit is contained in:
Eric S. Raymond 2010-05-16 13:06:26 +00:00
parent bf226a9412
commit 6b7cd26142
11 changed files with 44 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
View file

@ -196,7 +196,7 @@
delayed_variable_substitution=yes
[store_locations]
terrain=Gs,Gg,Re,Gs^Fp,Gg^Vo,Gg^Vc,Hh^Vo,Hh^Vc
terrain=Gs,Gg,Re,Gs^Fp,Gg^Vo,Gg^Vc,Hh^Voh,Hh^Vc
variable=non_snowy_locs
[/store_locations]
@ -269,13 +269,13 @@
[case]
value=Hh^Vo
{VARIABLE terrain Ha^Voa}
{VARIABLE terrain Ha^Voha}
[/case]
[case]
value=Hh^Vc
{VARIABLE terrain Ha^Vca}
{VARIABLE terrain Ha^Vcha}
[/case]
# just a fallback in case something goes wrong

8
data/campaigns/Legend_of_Wesmere/utils/low-macros.cfg
View file

@ -52,7 +52,7 @@
[rule]
old=Hh^Vo
new=Aa
terrain=Ha^Voa
terrain=Ha^Voha
[/rule]
#dwarf Village
@ -62,7 +62,7 @@
terrain=Ha^Vhha
[/rule]
[rule]
old=Mm^Vhh
old=Mm^Vhm
new=Aa
terrain=Ms^Vhha
[/rule]
@ -83,7 +83,7 @@
[rule]
old=Hh^Vc
new=Aa
terrain=Ha^Vca
terrain=Ha^Vcha
[/rule]
#forest
[rule]
@ -153,7 +153,7 @@
[/rule]
#mountain village
[rule]
old=Mm^Vhh
old=Mm^Vhm
new=Aa
terrain=Ms^Vhha
[/rule]

2
data/core/help.cfg
View file

@ -477,7 +477,7 @@ Thick-bodied and clumsy, slow individuals of goblins and other species take a mo
[topic]
id=terrain_flat
title= _ "Flat"
text= "<img>src=terrain/flat/grass-r1.png align=left box=no</img> <img>src=terrain/flat/grass-flowers2.png align=middle box=no</img><img>src=terrain/flat/farm-veg-spring-icon.png align=right box=no</img>
text= "<img>src=terrain/flat/grass1.png align=left box=no</img> <img>src=terrain/flat/grass-flowers2.png align=middle box=no</img><img>src=terrain/flat/farm-veg-spring-icon.png align=right box=no</img>
" + _ "Grassland represents open plains, whether cultivated, cut back for grazing, or wild. Being open ground, Grassland is both very easy to move across, but is also difficult to defend oneself in. Typically, those units that perform best on grassland are either cavalry, or very agile units which take advantage of the open space.

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^Vhh
terrain=Mm^Vhm
[/filter_location]
[/filter]
{MODIFY_TERRAIN "Mm" $x1 $y1}

6
data/multiplayer/scenarios/6p_Team_Survival.cfg
View file

@ -17,7 +17,7 @@ _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Dd , Dd^Do , Md , Re , Gg , Gg , Ww , Ww , Ww , Hh , Re , Ww , Gs^Fp , Ww , Xu , Ww , Ww , Gs^Fp , Ww , Re , Ww , Ww^Vm , Ww , Ds , Ww , Re , Re , Mm , Gs , Ss , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Ft , Hd , Gs^Ft , Re , Gg , Ww^Vm , Wo , Wo , Ww , Gs^Ft , Ww^Bw| , Ww , Gg , Ww , Xu , Ww , Gs^Fp , Wwf , Gg , Ww^Bw| , Ww , Wo , Wo , Ww , Ww , Gs^Ft , Re , Gs , Gs , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs , Gs , Gg , Re , Re , Ww , Ww , Ww , Gs^Fp , Ww , Rr , Ww , Wwf , Ww , Xu , Ww , Gg , Gg , Rr , Rr , Hh , Ww , Ww , Ww , Hh , Gs , Re , Hh , Gs^Ft , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Fp , Gg , Hh , Gg , Ww , Ww^Bw\ , Rr , Hh , Mm^Vhh , Hh , Rr , Gs^Fp , Gg , Ww , Xu , Ww , Gg , Hh , Rr , Gs^Fp , Mm^Vhh , Gs^Fp , Ww , Gs^Ft , Re , Re , Gs , Gs^Vht , Gs^Ft , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Fp , Gg , Hh , Gg , Ww , Ww^Bw\ , Rr , Hh , Mm^Vhm , Hh , Rr , Gs^Fp , Gg , Ww , Xu , Ww , Gg , Hh , Rr , Gs^Fp , Mm^Vhm , Gs^Fp , Ww , Gs^Ft , Re , Re , Gs , Gs^Vht , Gs^Ft , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Ww , Gg^Ve , Gg , Gs^Fp , Wwf , Gg , Rr , Gs^Fp , Rr , Rr , Gg , Gg , Gg , Ww , Xu , Ww , Gg , Gg , Gg , Rr , Rr , Hh , Rr , Ww^Bw/ , Ww , Ww , Wwf , Gs , Ww , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , Xu , Xu , Ww , Xu , Xu , Ww , Ww , Ww , Gs^Fp , Gg , Hh , Rr , Gg , Rr , Ch , Hh , Gg , Ww , Xu , Ww , Gg , Gs^Fp , Ch , Rr , Gg , Rr , Gs^Fp , Ww , Gg , Gs^Fp , Ww , Ww , Xu , Xu , Ww , Xu , Xu , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , Xu , Xu , Ww , Ww , Gs^Ft , Ww , Ww , Xu , Xu , Ww , Ww , Gg , Gg , Gg , Gs^Fp , Ch , 2 Kh , Ch , Gg , Ww , Xu , Ww , Gg , Ch , 3 Kh , Ch , Hh , Gg , Gg , Wwf , Ww , Ww , Xu , Xu , Ww , Ww , Gs^Fp , Ww , Ww , Xu , Xu , _s , _s , _s , _s
@ -26,7 +26,7 @@ _s , _s , Xu , Ss , Gs , Gs
_s , _s , Xu , Ss , Gs^Ft , Mm , Re , Re , Gs , Re , Re , Ww , Ww , Wwf , Gg , Ww , Ww , Xu , Xu , Ww , Xu , Xu , Xu , Ql , Xu , Ql , Xu , Xu , Xu , Ww , Xu , Xu , Ww , Ww , Gg , Gg , Gg , Wwf , Ww , Gg , Re , Gs^Ft , Md , Dd^Do , Dd , Ww , Xu , _s , _s
_s , _s , Xu , Ss , Ss^Vhs , Hh , Re , Gs^Ft , Ww , Hh , Gs^Ft , Ww^Bw\ , Rr , Gs^Fp , Gg , Gg , Gg , Ww , Ww , Xu , Ql , Ql , Ql , Ql , Xu , Ql , Ql , Ql , Ql , Xu , Ww , Ww , Gg , Gg , Gg , Hh , Rr , Gg , Ww^Bw/ , Re , Gg , Re , Re , Hd , Gs , Ww , Xu , _s , _s
_s , _s , Xu , Ss , Ss , Gs , Ww^Bw| , Ww , Ww , Ww , Ww , Ww , Hh , Rr , Gg , Hh , Ch , Gg , Ww , Xu , Ql , Xu , Xu , Xu , Uu^Ii , Xu , Xu , Xu , Ql , Xu , Ww , Gg , Ch , Gs^Fp , Gg , Rr , Gs^Fp , Rr , Ww , Ww , Ww^Vm , Gg , Re , Gs^Ft , Ww , Ww , Xu , _s , _s
_s , _s , Xu , Ss , Ww , Ww , Re , Ds , Ww , Wo , Ww , Gs^Fp , Mm^Vhh , Rr , Rr , Ch , 7 Kh , Ww , Wo , Xu , Xu , Ql , Xu , Uu^Ii , 1 Kh , Uu^Ii , Xu , Ql , Xu , Xu , Wo , Ww , 4 Kh , Ch , Rr , Rr , Mm^Vhh , Hh , Ww , Wo , Ww , Gg , Re , Ds , Ww , Ss , Xu , _s , _s
_s , _s , Xu , Ss , Ww , Ww , Re , Ds , Ww , Wo , Ww , Gs^Fp , Mm^Vhm , Rr , Rr , Ch , 7 Kh , Ww , Wo , Xu , Xu , Ql , Xu , Uu^Ii , 1 Kh , Uu^Ii , Xu , Ql , Xu , Xu , Wo , Ww , 4 Kh , Ch , Rr , Rr , Mm^Vhm , Hh , Ww , Wo , Ww , Gg , Re , Ds , Ww , Ss , Xu , _s , _s
_s , _s , Xu , Ss , Ww , Ds , Re , Gg , Ww^Vm , Wo , Ww , Hh , Gs^Fp , Rr , Gg , Ch , Ch , Ww , Ww , Xu , Ql , Ql , Xu , Uu^Ii , Uu^Ii , Uu^Ii , Xu , Ql , Ql , Xu , Ww , Ww , Ch , Ch , Gg , Rr , Hh , Gs^Fp , Ww , Wo , Ww , Ds , Ww^Bw| , Ww , Ss , Ss , Xu , _s , _s
_s , _s , Xu , Ww , Gs , Gs^Ft , Re , Gg , Gg , Ww , Ww^Bw/ , Rr , Rr , Rr , Gg , Gs^Fp , Gg , Gg , Ww , Xu , Ql , Xu , Ql , Xu , Xu , Xu , Ql , Xu , Ql , Xu , Ww , Gg , Gg , Hh , Gg , Rr , Rr , Ww , Gs^Ft , Ww , Ww , Ww , Re , Gs , Ss^Vhs , Ss , Xu , _s , _s
_s , _s , Xu , Ww , Dd , Hd , Md , Re , Re , Re , Ww , Gg , Gg , Hh , Gg , Gg , Ww , Ww , Xu , Xu , Xu , Ql , Xu , Ql , Xu , Ql , Xu , Ql , Xu , Xu , Xu , Ww , Ww , Gg , Gg , Gs^Fp , Ww , Ww^Bw\ , Re , Hh , Gs , Gs^Ft , Re , Hh , Gs^Ft , Ss , Xu , _s , _s
@ -35,7 +35,7 @@ _s , _s , Xu , Ww , Ww , Dd
_s , _s , _s , Xu , Xu , Ww , Ww , Gs , Gs^Fp , Gg^Ve , Ww , Ww , Xu , Xu , Ww , Ww , Gg , Gg , Hh , Ch , 6 Kh , Ww , Gg , Ww , Xu , Ww , Gg , Ww , 5 Kh , Ch , Gs^Fp , Gg , Gg , Ww , Ww , Xu , Xu , Ww , Ww , Gs , Gs^Ft , Gs^Ft , Ww , Ww , Xu , Xu , _s , _s , _s
_s , _s , _s , _s , _s , Xu , Xu , Ww , Ww , Ww , Xu , Xu , Ww , Ww , Gg , Wwf , Gs^Fp , Gg , Gg , Ch , Ch , Ch , Gg , Ww , Xu , Ww , Gg , Ch , Ch , Ch , Gg , Gg , Hh , Gg , Gs^Fp , Ww , Ww , Xu , Xu , Ww , Ww , Ww , Xu , Xu , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , Xu , Xu , Xu , Ww , Ww , Wwf , Gs^Fp , Ww , Ww , Rr , Rr , Rr , Rr , Gg , Gs^Fp , Gg , Ww , Xu , Ww , Gg , Hh , Gg , Rr , Rr , Rr , Rr , Gg , Wwf , Ww , Gg , Ww , Ww , Xu , Xu , Xu , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Ft , Gs , Gs , Ww , Re , Ww^Bw/ , Ww , Hh , Mm^Vhh , Rr , Rr , Gg , Gg , Ww , Xu , Ww , Gg , Gg , Rr , Rr , Mm^Vhh , Gs^Fp , Rr , Gg , Ww , Gs^Fp , Hh , Gg^Ve , Gs^Fp , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Ft , Gs , Gs , Ww , Re , Ww^Bw/ , Ww , Hh , Mm^Vhm , Rr , Rr , Gg , Gg , Ww , Xu , Ww , Gg , Gg , Rr , Rr , Mm^Vhm , Gs^Fp , Rr , Gg , Ww , Gs^Fp , Hh , Gg^Ve , Gs^Fp , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs^Ft , Gs^Vht , Re , Re , Hh , Gs^Ft , Ww , Gs^Fp , Hh , Gs^Fp , Rr , Hh , Gg , Ww , Xu , Ww , Wwf , Gs^Fp , Rr , Hh , Gs^Fp , Hh , Ww , Ww^Bw\ , Re , Gg , Gg , Gg , Gs , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs , Hh , Re , Gs , Ww , Ww , Wo , Ww , Ww , Rr , Gg , Gg , Gs^Fp , Ww , Xu , Ww , Gg , Ww , Ww^Bw| , Ww , Ww , Ww , Wo , Ww , Gg , Re , Gs^Ft , Gs , Gs^Ft , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s
_s , _s , _s , _s , _s , _s , _s , _s , Xu , Ww , Gs , Gs , Re , Gs^Ft , Ww , Ww , Ww , Wo , Ww , Ww^Bw| , Ww , Wwf , Ww , Ww , Xu , Ww , Gs^Fp , Ww , Re , Gs^Ft , Ww , Wo , Ww , Ww^Vm , Gg , Re , Md , Hd , Dd , Ww , Xu , _s , _s , _s , _s , _s , _s , _s , _s

2
data/multiplayer/scenarios/ANL_utils/ANL_auto_working.cfg
View file

@ -168,7 +168,7 @@
type={TYPES}
side="$side_number"
[filter_location]
terrain=Hh^Vhh,Ha^Vhha,Mm^Vhh
terrain=Hh^Vhh,Ha^Vhha,Mm^Vhm
[/filter_location]
[/filter]
variable=miners

14
data/multiplayer/scenarios/ANL_utils/ANL_worker_options.cfg
View file

@ -56,7 +56,7 @@ message= _ "Nothing"
# Convert to grassland
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Convert to Grassland" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Convert to Grassland" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Re"}
[command]
{COMPLETE_ACTION 0}
@ -155,7 +155,7 @@ message= {MENU_IMG_TXT2 "terrain/forest/pine-tile.png" ("<span color='green'>" +
# Chop Down Forest
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Chop Down Forest" + "</span>") ("<span size='small'>" +_"Earns: 1g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Chop Down Forest" + "</span>") ("<span size='small'>" +_"Earns: 1g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Gs^Fp,Gs^Ft,Aa^Fpa,Gg^Fet"}
[command]
{VARIABLE finished yes}
@ -210,7 +210,7 @@ message= {MENU_IMG_TXT2 "terrain/village/human-mountain-tile.png" ("<span color=
{CONDITION worker.gold greater_than_equal_to 25}
[then]
{COMPLETE_ACTION (-25)}
{MODIFY_TERRAIN "Mm^Vhh" $x1 $y1}
{MODIFY_TERRAIN "Mm^Vhm" $x1 $y1}
{ANL_CAPTURE_VILLAGE}
{BUILD_SOUND_1}
[/then]
@ -242,7 +242,7 @@ message= {MENU_IMG_TXT2 "terrain/water/ford.png" ("<span color='green'>" + _"Mak
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 5g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 5g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Ww"}
[command]
[if]
@ -278,7 +278,7 @@ message= {MENU_IMG_TXT2 "terrain/water/coast.png" ("<span color='green'>" + _"De
# Landfill
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 1g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Landfill" + "</span>") ("<span size='small'>" +_"Cost: 1g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Wwf"}
[command]
[if]
@ -299,7 +299,7 @@ message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"
# Break Up Cave
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Smash Cave Floor" + "</span>") ("<span size='small'>" +_"Cost: 2g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Smash Cave Floor" + "</span>") ("<span size='small'>" +_"Cost: 2g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Uu,Uu^Ii"}
[command]
[if]
@ -399,7 +399,7 @@ message= {MENU_IMG_TXT2 "terrain/village/elven-tile.png" ("<span color='green'>"
# Clear Rubble
[option]
message= {MENU_IMG_TXT2 "terrain/flat/grass-r8.png" ("<span color='green'>" + _"Clear the Ground" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
message= {MENU_IMG_TXT2 "terrain/flat/grass6.png" ("<span color='green'>" + _"Clear the Ground" + "</span>") ("<span size='small'>" +_"Cost: 0g" + "</span>")}
{ANL_SHOW_IF ("Peasant") "Rd"}
[command]
{COMPLETE_ACTION (-0)}

2
data/multiplayer/scenarios/Random_Scenario.cfg
View file

@ -194,7 +194,7 @@
[/village]
[village]
terrain=Mm
convert_to=Mm^Vhh
convert_to=Mm^Vhm
rating=3
adjacent_liked=Gg, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]

2
data/multiplayer/scenarios/Random_Scenario_Marsh.cfg
View file

@ -168,7 +168,7 @@
[village]
terrain=Mm
convert_to=Mm^Vhh
convert_to=Mm^Vhm
rating=3
adjacent_liked=Gg, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]

2
data/multiplayer/scenarios/Random_Scenario_Winter.cfg
View file

@ -196,7 +196,7 @@
[village]
terrain=Mm
convert_to=Mm^Vhh
convert_to=Mm^Vhm
rating=3
adjacent_liked=Gg, Ww, Ww, Ww, Ww^Bw|, Ww^Bw/, Ww^Bw\, Rr, Rr, Re, Re, Gg^Ve, Gg^Vh, Hh, Gs^Fp
[/village]

21
data/tools/wmllint
View file

@ -481,6 +481,27 @@ linechanges = (
("portraits/orcs/warlord3.png","portraits/orcs/transparent/grunt-2.png"),
("portraits/orcs/warlord4.png","portraits/orcs/transparent/grunt-2.png"),
("portraits/orcs/warlord5.png","portraits/orcs/transparent/grunt-3.png"),
# Changes just before 1.9.0
("flat/grass-r8", "flat/grass6"),
("flat/grass-r7", "flat/grass5"),
("flat/grass-r6", "flat/grass6"),
("flat/grass-r5", "flat/grass5"),
("flat/grass-r4", "flat/grass4"),
("flat/grass-r3", "flat/grass3"),
("flat/grass-r2", "flat/grass2"),
("flat/grass-r1", "flat/grass1"),
("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"),
)
def validate_on_pop(tagstack, closer, filename, lineno):