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

HttT: remove obsolete "wmllint: recognize" magic comments

Browse source 
The exception is Gryphon Mountain, where the magic comments are updated to
recognize the awakened ids.

This is not the only approach that could be used. wmllint could be upgraded
to recognize the transformed ids in [modify_unit]. This is more involved
than I want to do right now, for what I expect to be a corner case.

The other way would be to also filter the awakening events by type as well
as id, and not change the id at all. The original awakening code killed the
old unit and created a new one in its place, and the new id distinguished
the new unit from the old one. However, now that we are modifying an existing
unit, we do not need to change ids, especially since this is not seen by
the player.

For now, though, the easiest path is just to tweak the already existing
magic comments.
This commit is contained in:
Groggy Dice 2013-12-28 09:25:11 -05:00
parent 7728a15bf6
commit cb098cb60d
7 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg
View file

@ -155,8 +155,6 @@
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 27 12 (Kalba) ( _ "Kalba")}
{NAMED_LOYAL_UNIT 1 (Merman Fighter) 31 14 (Gnaba) ( _ "Gnaba")}
# wmllint: recognize Kalba
# wmllint: recognize Gnaba
[message]
speaker=Konrad
@ -178,7 +176,6 @@
[/message]
{NAMED_LOYAL_UNIT 1 (Outlaw) 20 10 (Delurin) ( _ "Delurin")}
# wmllint: recognize Delurin
[redraw]
side=1

2
data/campaigns/Heir_To_The_Throne/scenarios/07_Crossroads.cfg
View file

@ -485,7 +485,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 1 (Elvish Archer) 11 13 (Niodien) ( _ "Niodien")}
# wmllint: recognize Niodien
[message]
speaker=Niodien
@ -507,7 +506,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 1 (Elvish Fighter) 5 15 (Loflar) ( _ "Loflar")}
# wmllint: recognize Loflar
[message]
speaker=Loflar

1
data/campaigns/Heir_To_The_Throne/scenarios/08_The_Princess_of_Wesnoth.cfg
View file

@ -330,7 +330,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 2 (Duelist) 6 40 (Ronry) ( _ "Ronry")}
# wmllint: recognize Ronry
[scroll_to_unit]
x=6

6
data/campaigns/Heir_To_The_Throne/scenarios/10_Gryphon_Mountain.cfg
View file

@ -113,9 +113,9 @@
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 12 18 (Graak) ( _ "Graak")}
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 16 16 (Grook) ( _ "Grook")}
{NAMED_LOYAL_UNIT 3 (Sleeping Gryphon) 10 14 (Gruak) ( _ "Gruak")}
# wmllint: recognize Graak
# wmllint: recognize Grook
# wmllint: recognize Gruak
# wmllint: recognize Rampant Graak
# wmllint: recognize Rampant Grook
# wmllint: recognize Rampant Gruak
{VARIABLE gryphon_disposition 1}
[/event]

2
data/campaigns/Heir_To_The_Throne/scenarios/13_The_Dwarven_Doors.cfg
View file

@ -628,7 +628,6 @@
[/filter]
{NAMED_LOYAL_UNIT 5 (Cuttle Fish) 13 13 (Cuttle Fish) ( _ "Cuttle Fish")}
# wmllint: recognize Cuttle Fish
[message]
speaker=Cuttle Fish
@ -661,7 +660,6 @@
[+unit]
profile=portraits/lisar.png
[/unit]
# wmllint: recognize Li'sar
{LISAR_GUARD_DOORS}
{LISAR_GUARD_DOORS}
{LISAR_GUARD_DOORS}

2
data/campaigns/Heir_To_The_Throne/scenarios/15_The_Lost_General.cfg
View file

@ -157,7 +157,6 @@
[/filter]
{NAMED_LOYAL_UNIT 2 (Dwarvish Fighter) 17 24 (Burlin) ( _ "Burlin")}
# wmllint: recognize Burlin
[message]
speaker=Burlin
@ -195,7 +194,6 @@
[/modifications]
{IS_LOYAL}
[/unit]
# wmllint: recognize Ulfdain
[teleport]
[filter]
x,y=$x1,$y1

3
data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
View file

@ -571,7 +571,6 @@
side=4
[/move_unit_fake]
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Glarilon) ( _ "Glarilon")}
# wmllint: recognize Glarilon
[message]
speaker=Glarilon
message= _ "My lords! I have found you at last."
@ -584,7 +583,6 @@
side=4
[/move_unit_fake]
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Thalindil) ( _ "Thalindil")}
# wmllint: recognize Thalindil
[message]
speaker=Thalindil
message= _ "(exhausted) We have... (pant) finally found you!"
@ -615,7 +613,6 @@
side=4
[/move_unit_fake]
{NAMED_LOYAL_UNIT 4 (Elvish Rider) $temp_x $temp_y (Rholandir) ( _ "Rholandir")}
# wmllint: recognize Rholandir
[message]
speaker=Rholandir
message= _ "Lord Kalenz, Lord Konrad, our forces are nigh! Do not lose hope!"