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

Teach wmllint that [filter_opponent] takes an SUF.

Browse source 
Fix more comments.
This commit is contained in:
Eric S. Raymond 2008-03-13 10:06:24 +00:00
parent 3ffd2be5b5
commit c2490d2cde
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/campaigns/Northern_Rebirth/scenarios/10a_Stolen_Gold.cfg
View file

@ -1089,8 +1089,6 @@
[move_unit_fake]
type=Drake Fighter
description="Bak'man"
user_description= _ "Bak'man"
side=7
x=1,2
y=16,15
@ -1098,7 +1096,8 @@
[unit]
type=Drake Fighter
user_description= _ "Halk"
id="Bak'man"
user_description= _ "Bak'man"
side=7
id=Halk
x=3

4
data/campaigns/Under_the_Burning_Suns/scenarios/06b_In_the_Domain_of_Dwarves.cfg
View file

@ -795,7 +795,7 @@
#[/message]
#[message]
#description=Dwarf Sergeant
#id=Dwarf Sergeant
#message= _ "What!?!.....Right...First task boys, kill the intruder!"
#[/message]
@ -810,7 +810,7 @@
[/filter]
#[filter]
# description=Dwarf Sergeant
# id=Dwarf Sergeant
#[/filter]
#[filter_second]

12
data/campaigns/Under_the_Burning_Suns/scenarios/scen3_alt/challenge.cfg
View file

@ -62,9 +62,9 @@
Whether used offensively or defensively, this attack presses the engagement until one of the combatants is slain, or 30 rounds of attacks have occurred."
value=30
[filter_opponent]
description=Zur
id=Zur
[or]
description=Grak
id=Grak
[/or]
[/filter_opponent]
[/berserk]
@ -78,9 +78,9 @@ This attack always has a 70% chance to hit regardless of the defensive ability o
value=70
cumulative=no
[filter_opponent]
description=Zur
id=Zur
[or]
description=Grak
id=Grak
[/or]
[/filter_opponent]
[/chance_to_hit]
@ -90,9 +90,9 @@ This attack always has a 70% chance to hit regardless of the defensive ability o
description= _ "First Strike:
This unit always strikes first with this attack, even if they are defending."
[filter_opponent]
description=Zur
id=Zur
[or]
description=Grak
id=Grak
[/or]
[/filter_opponent]
[/firststrike]

7
data/tools/wmllint
View file

@ -14,7 +14,7 @@
# * strings that need a translation mark and should not have them
# * strings that have a translation mark and should not
# * translatable strings containing macro references
# * filter references by description= not matched by an actual unit
# * filter references by id= not matched by an actual unit
# * abilities or traits without matching special notes, or vice-versa
# * consistency between recruit= and recruitment_pattern= instances
# * double space after punctuation in translatable strings.
@ -560,7 +560,8 @@ def standard_unit_filter():
# It's under("message") rather than within("message") because
# [message] can contain [option] markup with menu item description=
# attributes that should not be altered.
return within(("filter", "filter_second", "filter_adjacent",
return within(("filter", "filter_second",
"filter_adjacent", "filter_opponent",
"unit_filter", "secondary_unit_filter",
"special_filter", "special_filter_second",
"neighbor_unit_filter",
@ -2142,7 +2143,7 @@ if __name__ == '__main__':
print "%s, line %d: [unit] may need conversion to [unit_type]" % \
(filename, lineno)
# Handle SingleUnitWML or Standard Unit Filter or SideWML
# Also, hen macro calls have description= in them, the arg is
# Also, when macro calls have description= in them, the arg is
# a SUF being passed in.
if (under("unit") and not "units" in filename) or \
standard_unit_filter() or \