Author: esr
Date: Tue Oct 7 06:04:23 2008
New Revision: 29935
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29935&view=rev
Log:
With these changes (including a slightly smarter wmllint)
Legend of Wesmere wmllints clean.
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Ancient_Alliance.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
trunk/data/tools/wmllint
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg Tue
Oct 7 06:04:23 2008
@@ -47,6 +47,7 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
@@ -75,6 +76,7 @@
[/modifications]
[/unit]
[/side]
+ #wmllint: validate-on
[side]
side=2
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/02_Hostile_mountains.cfg
Tue Oct 7 06:04:23 2008
@@ -39,6 +39,7 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
@@ -61,6 +62,7 @@
[/avoid]
[/ai]
[/side]
+ #wmllint: validate-on
[side]
type=Troll Warrior
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg (original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg Tue Oct 7
06:04:23 2008
@@ -37,6 +37,7 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
@@ -57,6 +58,7 @@
aggression=0.0
[/ai]
[/side]
+ #wmllint: validate-on
# dummy side because we don't have a second ally like in elves last stand
[side]
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg Tue
Oct 7 06:04:23 2008
@@ -33,11 +33,13 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
[/side]
+ #wmllint: validate-on
[side]
type=Saurian Ambusher
id=Shurm
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
Tue Oct 7 06:04:23 2008
@@ -34,11 +34,13 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
[/side]
+ #wmllint: validate-on
[side]
type=Saurian Ambusher
id=Hraurg
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
---
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
(original)
+++
trunk/data/campaigns/Legend_of_Wesmere/scenarios/06_Acquaintance_in_Need.cfg
Tue Oct 7 06:04:23 2008
@@ -34,11 +34,13 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
[/side]
+ #wmllint: validate-on
[side]
side=2
canrecruit=yes
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
Tue Oct 7 06:04:23 2008
@@ -33,6 +33,7 @@
[/part]
[/story]
#friends
+ #wmllint: validate-off
[side]
# wmllint: recognize Kalenz
{KALENZ}
@@ -53,6 +54,7 @@
grouping=defensive
[/ai]
[/side]
+ #wmllint: validate-on
[side]
type=Elvish Marshal
id="El'Isomithir"
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/09_Bounty_hunters.cfg Tue
Oct 7 06:04:23 2008
@@ -37,11 +37,13 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES},{DWARVES}
[/side]
+ #wmllint: validate-on
[side]
type=Saurian Flanker
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/10_Cliffs_of_Thoria.cfg
Tue Oct 7 06:04:23 2008
@@ -30,13 +30,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES},{DWARVES}
fog=yes
[/side]
-
+ #wmllint: validate-on
[side]
type=Troll Warrior
id=Tafrul
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/11_Battle_of_the_book.cfg
Tue Oct 7 06:04:23 2008
@@ -27,12 +27,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES},{DWARVES}
fog=yes
[/side]
+ #wmllint: validate-on
[side]
type=Drake Mage
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/13_News_from_the_front.cfg
Tue Oct 7 06:04:23 2008
@@ -30,12 +30,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
# why fog?
fog=yes
[/side]
+ #wmllint: validate-on
[event]
name=prestart
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Ancient_Alliance.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Ancient_Alliance.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Ancient_Alliance.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/14_Ancient_Alliance.cfg
Tue Oct 7 06:04:23 2008
@@ -44,12 +44,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES},{DWARVES}
#TODO no minimum gold?
[/side]
+ #wmllint: validate-on
[side]
type=General
id=Aldar
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
Tue Oct 7 06:04:23 2008
@@ -48,11 +48,13 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
#TODO disallow recruit
[/side]
+ #wmllint: validate-on
[side]
type=Orcish Sovereign
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/17_Breaking_the_siege.cfg
Tue Oct 7 06:04:23 2008
@@ -32,6 +32,7 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
@@ -42,6 +43,7 @@
[side]
{URADREDIA}
[/side]
+ #wmllint: validate-on
[side]
type=Orcish Warlord
@@ -200,7 +202,7 @@
{WINTER_MASK 17_Breaking_the_siege.mask}
[/event]
- #wmllint: recognize Uraderia
+ #wmllint: recognize Uradredia
[event]
name=start
[message]
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/19_Costly_Revenge.cfg Tue
Oct 7 06:04:23 2008
@@ -36,12 +36,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
# TODO no minimum gold here?
[/side]
+ #wmllint: validate-on
[side]
type=Saurian Flanker
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/21_Elvish_Assassins.cfg
Tue Oct 7 06:04:23 2008
@@ -47,12 +47,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
{GOLD 100 100 100}
[/side]
+ #wmllint: validate-on
[side]
type=Elvish Ranger
Modified:
trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/22_Northern_Battle.cfg Tue
Oct 7 06:04:23 2008
@@ -33,16 +33,17 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
{GOLD 100 100 100}
[/side]
-
[side]
{URADREDIA}
[/side]
+ #wmllint: validate-on
[side]
# Landar gets unstored here
Modified: trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg
(original)
+++ trunk/data/campaigns/Legend_of_Wesmere/scenarios/23_End_of_War.cfg Tue Oct
7 06:04:23 2008
@@ -25,12 +25,14 @@
[/part]
[/story]
+ #wmllint: validate-off
[side]
{KALENZ}
# wmllint: recognize Kalenz
recruit={ELVES}
{GOLD 200 160 160}
[/side]
+ #wmllint: validate-on
[side]
side=2
no_leader=yes
Modified: trunk/data/tools/wmllint
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wmllint?rev=29935&r1=29934&r2=29935&view=diff
==============================================================================
--- trunk/data/tools/wmllint (original)
+++ trunk/data/tools/wmllint Tue Oct 7 06:04:23 2008
@@ -598,7 +598,9 @@
(rl, recruit) = recruitlist
for rtype in recruit:
if rtype not in unit_types:
- print '"%s", line %d: %s is not a known unit type' %
(filename, rl, rtype)
+ # Assume WML coder knew what he was doing if macro
reference
+ if not rtype.startswith("{"):
+ print '"%s", line %d: %s is not a known unit type' %
(filename, rl, rtype)
continue
elif rtype not in usage:
if not rtype in derivedlist:
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
