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

TRoW: exchange "who" and "whofield" magic comments for "recognize"

Browse source 
In scenario 16, El'Isomithir's id uses a straight apostrophe, and in 18 a
slanted one. The maintainer can decide which to go with, or simply leave
it be.
This commit is contained in:
Groggy Dice 2013-12-28 19:30:31 -05:00
parent f7a2a189ef
commit 6cd77630ab
18 changed files with 6 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/01_A_Summer_of_Storms.cfg
View file

@ -114,8 +114,8 @@
[event]
name=prestart
# wmllint: whofield HERO 2
{HERO (Warrior King) (King Eldaric IV) ( _ "King Eldaric IV") 1 28 15 "portraits/eldaric.png"}
# wmllint: recognize King Eldaric IV
[objectives]
side=1

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/02_The_Fall.cfg
View file

@ -336,8 +336,6 @@
[/modifications]
[/unit]
# wmllint: recognize Lady Outlaw
[set_variable]
name=have_lady
value=1
@ -368,8 +366,6 @@
{VARIABLE lady_store.canrecruit no}
{VARIABLE lady_store.side 1}
# wmllint: recognize Lady Outlaw
[set_variable]
name=have_lady
value=0

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/04b_The_Midlands.cfg
View file

@ -266,7 +266,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 3 (Goblin Knight) 12 37 (Grilg) ( _ "Grilg")}
# wmllint: recognize Grilg
{LOYAL_UNIT 3 (Wolf Rider) 11 38}
{LOYAL_UNIT 3 (Wolf Rider) 13 38}
@ -302,7 +301,6 @@
[+unit]
facing=nw
[/unit]
# wmllint: recognize Vrogar
{LOYAL_UNIT 4 (Orcish Assassin) 35 38}
{LOYAL_UNIT 4 (Orcish Assassin) 37 38}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/07_Return_to_Oldwood.cfg
View file

@ -272,8 +272,6 @@
[/modifications]
[/unit]
# wmllint: recognize Lady Jessene
{CLEAR_VARIABLE lady_store}
[scroll_to_unit]

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/08_Clearwater_Port.cfg
View file

@ -222,7 +222,6 @@
{NAMED_LOYAL_UNIT 2 (Peasant) 26 18 () ( _ "Angry Farmer")}
{NAMED_LOYAL_UNIT 2 (Peasant) 28 19 () ( _ "Angry Farmer")}
{NAMED_LOYAL_UNIT 2 (Peasant) 29 22 () ( _ "Angry Farmer")}
# wmllint: recognize Angry Farmer
[objectives]
side=1

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/09_Fallen_Lich_Point.cfg
View file

@ -543,7 +543,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 4 (Yeti) 12 11 (Rarlg) ( _ "Rarlg")}
# wmllint: recognize Rarlg
[message]
speaker=Rarlg
@ -572,7 +571,6 @@
[/scroll_to_unit]
{NAMED_LOYAL_UNIT 4 (Yeti) 15 11 (Raul-Rarlg) ( _ "Raul-Rarlg")}
# wmllint: recognize Raul-Rarlg
[/event]
[event]

5
data/campaigns/The_Rise_Of_Wesnoth/scenarios/12_A_Final_Spring.cfg
View file

@ -361,7 +361,6 @@
[/move_unit_fake]
{HERO (Merman Warrior) (Lord Typhon) ( _ "Lord Typhon") 1 3 20 ("portraits/typhon.png")}
# wmllint: recognize Lord Typhon
{LOYAL_UNIT 1 (Merman Fighter) 2 20}
{LOYAL_UNIT 1 (Merman Hunter) 4 19}
@ -458,6 +457,7 @@
y=22,22,23,23
[/move_unit_fake]
# wmllint: whofield LIVING_INTEL 2
{LIVING_INTEL (Familiar) (Familiar) ( _ "Familiar") "portraits/familiar.png" 5 42 23}
[+unit]
facing=sw
@ -470,11 +470,11 @@
y=22,22,23,23,24
[/move_unit_fake]
# wmllint: whofield UNDEAD_INTEL 2
{UNDEAD_INTEL (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord Jevyan") "portraits/jevyan.png" 5 42 24}
[+unit]
facing=sw
[/unit]
# wmllint: recognize Lich-Lord Jevyan
[message]
speaker=Lich-Lord Jevyan
@ -486,7 +486,6 @@
[/message]
{UNDEAD_INTEL (Death Knight) (Fool Prince) ( _ "Fool Prince") "portraits/undead/transparent/death-knight.png" 5 43 24}
# wmllint: recognize Fool Prince
[message]
speaker=Lich-Lord Jevyan

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/13_Peoples_in_Decline.cfg
View file

@ -251,7 +251,6 @@
{VARIABLE_OP yy1 rand "16..19"}
{NAMED_LOYAL_UNIT 4 (Sea Serpent) $xx1 $yy1 (Bitey the Serpent) ( _ "Bitey the Serpent")}
# wmllint: recognize Bitey The Sepent
[message]
side=1
@ -300,7 +299,6 @@
[/move_unit_fake]
{LIVING_INTEL (Familiar) (Familiar) ( _ "Familiar") "portraits/familiar.png" 4 4 2}
# wmllint: recognize Familiar
# wmllint: directory spelling Neep
[message]
speaker=Familiar

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/14_Rough_Landing.cfg
View file

@ -374,7 +374,6 @@
[/move_unit_fake]
{LIVING_INTEL (Familiar) (Familiar) ( _ "Familiar") "portraits/familiar.png" 4 3 26}
# wmllint: recognize Familiar
[message]
speaker=Familiar

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/15_A_New_Land.cfg
View file

@ -370,7 +370,6 @@
[+unit]
facing=sw
[/unit]
# wmllint: recognize Lady Dionli
[message]
speaker=Lady Dionli

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/16_The_Kalian.cfg
View file

@ -135,7 +135,6 @@
[/teleport]
{HERO (Elvish Marshal) ("Lord El'Isomithir") ( _ "Lord El’Isomithir") 4 13 14 ("portraits/isomithir.png")}
# wmllint: recognize Lord El’Isomithir
[/event]
# wmllint: local spelling Dionli
@ -525,7 +524,6 @@
[/move_unit_fake]
{HERO (Lieutenant) (Commander Aethyr) ( _ "Commander Aethyr") 1 19 24 ("portraits/aethyr-second.png")}
# wmllint: recognize Commander Aethyr
[delay]
time=500

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17a_The_Dragon.cfg
View file

@ -366,7 +366,6 @@
[+unit]
profile=portraits/shekkahan.png
[/unit]
# wmllint: recognize Shek'kahan
[set_variable]
name=dragon_awake

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17b_Lizard_Beach.cfg
View file

@ -233,7 +233,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 2 (Naga Warrior) 2 15 (Riaa) ( _ "Riaa")}
# wmllint: recognize Riaa
[message]
speaker=Riaa

1
data/campaigns/The_Rise_Of_Wesnoth/scenarios/17d_Cursed_Isle.cfg
View file

@ -145,7 +145,6 @@
[/message]
{UNDEAD_INTEL (Vampire Lady) "Midnight Queen" _"Midnight Queen" "unit_image" 2 ({X}) ({Y})}
# wmllint: recognize Midnight Queen
{LOYAL_UNIT 3 (Blood Bat) ({X}) ({Y})}
{LOYAL_UNIT 2 (Blood Bat) ({X}) ({Y})}

2
data/campaigns/The_Rise_Of_Wesnoth/scenarios/18_A_Spy_in_the_Woods.cfg
View file

@ -100,7 +100,7 @@
[/unstore_unit]
{HERO (Elvish Marshal) ("Lord El’Isomithir") ( _ "Lord El’Isomithir") 4 13 14 ("portraits/isomithir.png")}
# wmllint: recognize Lord El’Isomithir
# wmllint: whofield clear HERO
[/event]
[event]

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/19_The_Vanguard.cfg
View file

@ -523,7 +523,6 @@
value=1
{NAMED_LOYAL_UNIT $unit.side Deathblade $|spawn_x $|spawn_y Norte _"Norte"}
# wmllint: recognize Norte
{LOYAL_UNDEAD_UNIT $unit.side (Chocobone) $|spawn_x $|spawn_y}
#ifndef EASY
@ -542,7 +541,6 @@
value=2
{NAMED_LOYAL_UNIT $unit.side Banebow $|spawn_x $|spawn_y Rabbin _"Rabbin"}
# wmllint: recognize Rabbin
{LOYAL_UNDEAD_UNIT $unit.side (Chocobone) $|spawn_x $|spawn_y}
{LOYAL_UNDEAD_UNIT $unit.side (Chocobone) $|spawn_x $|spawn_y}
@ -567,7 +565,6 @@
value=3
{NAMED_LOYAL_UNIT $unit.side Draug $|spawn_x $|spawn_y "General Kafka" _"General Kafka"}
# wmllint: recognize General Kafka
{LOYAL_UNDEAD_UNIT $unit.side (Chocobone) $|spawn_x $|spawn_y}
{LOYAL_UNDEAD_UNIT $unit.side (Chocobone) $|spawn_x $|spawn_y}

4
data/campaigns/The_Rise_Of_Wesnoth/scenarios/20_Return_of_the_Fleet.cfg
View file

@ -256,7 +256,6 @@
[/move_unit_fake]
{LIVING_INTEL (Familiar) (Familiar) ( _ "Familiar") "portraits/familiar.png" 2 28 2}
# wmllint: recognize Familiar
[move_unit_fake]
type=Ancient Lich
@ -266,7 +265,7 @@
[/move_unit_fake]
{UNDEAD_INTEL (Ancient Lich) (Lich-Lord Jevyan) ( _ "Lich-Lord Jevyan") "portraits/jevyan.png" 2 25 2}
# wmllint: recognize Lich-Lord Jevyan
# wmllint: whofield clear UNDEAD_INTEL
[message]
speaker=Lich-Lord Jevyan
@ -481,7 +480,6 @@
[/filter_location]
[/filter]
# wmllint: recognize Flixta
{NAMED_LOYAL_UNIT 4 (Saurian Flanker) 34 14 (Flixta) ( _ "Flixta")}
{LOYAL_UNIT 4 (Saurian Oracle) 34 16}
{LOYAL_UNIT 4 (Saurian Soothsayer) 33 16}

3
data/campaigns/The_Rise_Of_Wesnoth/scenarios/22_The_Rise_of_Wesnoth.cfg
View file

@ -256,7 +256,7 @@
[/unit_overlay]
{LIVING_INTEL (Familiar) (Familiar) ( _ "Familiar") "portraits/familiar.png" 2 40 39}
# wmllint: recognize Familiar
# wmllint: whofield clear LIVING_INTEL
[objectives]
side=1
@ -1301,7 +1301,6 @@
[/move_unit_fake]
{NAMED_LOYAL_UNIT 2 (Naga Warrior) 4 34 (Abraxas) ( _ "Abraxas")}
# wmllint: recognize Abraxas
[scroll_to_unit]
id=Abraxas