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

Oc portrait reference fixes. Goes with 2010-03-23T21:01:33Z!lari.nieminen@iki.fi.

Browse source
This commit is contained in:
Eric S. Raymond 2010-03-23 21:23:21 +00:00
parent 796a086952
commit a860b23752
19 changed files with 50 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/campaigns/Descent_Into_Darkness/scenarios/05_Orc_War.cfg
View file

@ -67,7 +67,7 @@
type=Orcish Warlord
id=Borth
name=_ "Borth"
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
recruit=Goblin Spearman,Orcish Archer,Orcish Crossbowman,Wolf Rider,Orcish Grunt,Goblin Knight,Orcish Warrior,Troll Whelp
{GOLD 110 130 150}
@ -97,7 +97,7 @@
type=Orcish Slurbow
id="P'Gareth"
name=_ "P'Gareth"
profile=portraits/orcs/warlord5.png
profile=portraits/orcs/transparent/grunt-3.png
canrecruit=yes
recruit=Orcish Archer,Orcish Crossbowman,Goblin Pillager,Orcish Grunt,Orcish Assassin
{GOLD 110 130 150}
@ -127,7 +127,7 @@
type=Orcish Warlord
id="K'Vark"
name=_ "K'Vark"
profile=portraits/orcs/warlord.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
recruit=Orcish Archer,Orcish Crossbowman,Troll Whelp,Wolf Rider,Orcish Grunt
{GOLD 110 130 150}

2
data/campaigns/Descent_Into_Darkness/scenarios/06_Return_to_Parthyn.cfg
View file

@ -52,7 +52,7 @@
type=Orcish Warlord
id=Borth
name=_ "Borth"
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
{GOLD 120 160 200}
#ifdef EASY

6
data/campaigns/Heir_To_The_Throne/scenarios/01_The_Elves_Besieged.cfg
View file

@ -279,7 +279,7 @@
[/message]
[message]
speaker=Urug-Telfar
image=portraits/orcs/warlord4.png
image=portraits/orcs/transparent/grunt-2.png
message= _ "Attack the elves, my grunts, and take their villages. Let us claim this land for the Queen!"
[/message]
@ -287,13 +287,13 @@
#ifdef HARD
[message]
speaker=Knafa-Tan
image=portraits/orcs/warlord.png
image=portraits/orcs/transparent/warlord.png
message= _ "Remember, it is rumored that the filthy mage and one that he protects are in these parts. They are the ones we want!"
[/message]
#else
[message]
speaker=Knafa-Tan
image=portraits/orcs/warlord.png
image=portraits/orcs/transparent/warlord.png
message= _ "Ha ha! We will rip the filthy elves to pieces!"
[/message]
#endif

2
data/campaigns/Heir_To_The_Throne/scenarios/02_Blackwater_Port.cfg
View file

@ -332,7 +332,7 @@
[/message]
[message]
speaker=Mokolo Qimur
image=portraits/orcs/warlord3.png
image=portraits/orcs/transparent/grunt-2.png
message= _ "So many foul humans riding on horses! There is no way we can defeat them. Quick, we must make our escape!"
[/message]
[endlevel]

2
data/campaigns/Heir_To_The_Throne/scenarios/04_The_Bay_of_Pearls.cfg
View file

@ -59,7 +59,7 @@
name= _ "Dwaba-Kukai"
side=2
canrecruit=yes
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
recruit=Vampire Bat,Naga Fighter
[ai]
recruitment_pattern=scout,fighter

2
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View file

@ -245,7 +245,7 @@
[/message]
[message]
speaker=Gaga-Breuk
image=portraits/orcs/warlord2.png
image=portraits/orcs/transparent/warlord.png
message= _ "Look! Some of the southerners, men of Wesnoth, are trying to cross into our lands! We will slaughter them by the river's edge!"
[/message]
[message]

4
data/campaigns/Legend_of_Wesmere/scenarios/01_The_Uprooting.cfg
View file

@ -252,7 +252,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
type=Orcish Warrior
id=Qumseh
name= _ "Qumseh"
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
x=28
y=2
@ -288,7 +288,7 @@ This is the story of Kalenz, and of the Elves in the days of the humans in Wesno
type=Orcish Warrior
id=Graur-Tan
name= _ "Graur-Tan"
profile=portraits/orcs/warlord.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
x=2
y=4

2
data/campaigns/Legend_of_Wesmere/scenarios/03_Kalian.cfg
View file

@ -362,7 +362,7 @@
type=Orcish Warlord
id=Mutaf-uru
name= _ "Mutaf-uru"
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
side=5
canrecruit=yes
x=7

6
data/campaigns/Legend_of_Wesmere/scenarios/07_Elves_last_stand.cfg
View file

@ -180,7 +180,7 @@
type=Orcish Warlord
id=Mordrum
name= _ "Mordrum"
profile=portraits/orcs/warlord4.png
profile=portraits/orcs/transparent/grunt-2.png
canrecruit=yes
x=4
y=12
@ -212,7 +212,7 @@
type=Orcish Warlord
id=Urug-Pir
name=_ "Urug-Pir"
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
canrecruit=yes
x=6
y=21
@ -282,7 +282,7 @@
type=Orcish Warlord
id=Grubr
name= _ "Grubr"
profile=portraits/orcs/warlord5.png
profile=portraits/orcs/transparent/grunt-3.png
canrecruit=yes
x=25
y=42

14
data/campaigns/Legend_of_Wesmere/scenarios/14_Human_Alliance.cfg
View file

@ -210,7 +210,7 @@
type=Orcish Warlord
id=Tan-Grub
name=_ "Tan-Grub"
profile="portraits/orcs/warlord.png"
profile="portraits/orcs/transparent/warlord.png"
canrecruit=yes
#ifdef EASY
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Knight, Goblin Spearman
@ -460,7 +460,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord.png"
profile="portraits/orcs/transparent/warlord.png"
side=7
x=1
y=5
@ -472,7 +472,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord2.png"
profile="portraits/orcs/transparent/warlord.png"
side=8
x=1
y=28
@ -484,7 +484,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord3.png"
profile="portraits/orcs/transparent/grunt-2.png"
side=9
x=1
y=32
@ -572,7 +572,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord3.png"
profile="portraits/orcs/transparent/grunt-2.png"
side=10
x=2
y=7
@ -584,7 +584,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord4.png"
profile="portraits/orcs/transparent/grunt-2.png"
side=11
x=1
y=40
@ -596,7 +596,7 @@
type=Orcish Warlord
generate_name=yes
random_traits=yes
profile="portraits/orcs/warlord5.png"
profile="portraits/orcs/transparent/grunt-3.png"
side=12
x=1
y=45

8
data/campaigns/Legend_of_Wesmere/scenarios/16_The_Chief_must_die.cfg
View file

@ -99,7 +99,7 @@
type=Orcish Warlord
id=Tamitahan
name=_ "Tamitahan"
profile=portraits/orcs/warlord.png
profile=portraits/orcs/transparent/warlord.png
side=3
canrecruit=yes
{GOLD 150 230 300}
@ -131,7 +131,7 @@
id=Khrubar
type=Orcish Warlord
name=_ "Khrubar"
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
{GOLD 100 100 100 }
#ifdef EASY
@ -157,7 +157,7 @@
type=Orcish Warlord
id=Gvur
name=_ "Gvur"
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
side=5
canrecruit=yes
{GOLD 100 100 100}
@ -187,7 +187,7 @@
type=Orcish Warlord
id=Ozul
name=_ "Ozul"
profile=portraits/orcs/warlord4.png
profile=portraits/orcs/transparent/grunt-2.png
side=6
canrecruit=yes
{GOLD 100 100 100}

2
data/campaigns/Liberty/scenarios/03_A_Strategy_Of_Hope.cfg
View file

@ -64,7 +64,7 @@
type=Orcish Warrior
id="Urk Delek"
name= _ "Urk Delek"
profile=portraits/orcs/warlord5.png
profile=portraits/orcs/transparent/grunt-3.png
facing=sw
side=3
canrecruit=yes

8
data/campaigns/Son_Of_The_Black_Eye/scenarios/15_Civil_War.cfg
View file

@ -80,7 +80,7 @@
name= _ "Braga"
side=2
canrecruit=yes
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
recruit=Goblin Pillager,Orcish Grunt,Orcish Slayer,Orcish Archer
{GOLD 200 300 400}
team_name=rebels
@ -100,7 +100,7 @@
name= _ "Meato"
side=3
canrecruit=yes
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
recruit=Goblin Knight,Orcish Warrior,Troll,Wolf Rider
{GOLD 200 300 400}
team_name=rebels
@ -120,7 +120,7 @@
name= _ "Ragvan"
side=4
canrecruit=yes
profile=portraits/orcs/warlord4.png
profile=portraits/orcs/transparent/grunt-2.png
recruit=Goblin Pillager,Orcish Warrior,Orcish Assassin,Orcish Crossbowman
{GOLD 200 300 400}
team_name=rebels
@ -140,7 +140,7 @@
name= _ "Kergai"
side=5
canrecruit=yes
profile=portraits/orcs/warlord.png
profile=portraits/orcs/transparent/warlord.png
recruit=Troll Rocklobber,Orcish Warrior,Orcish Slayer,Goblin Impaler
{GOLD 200 300 400}
team_name=rebels

2
data/campaigns/The_Hammer_of_Thursagan/scenarios/03_Strange_Allies.cfg
View file

@ -41,7 +41,7 @@
type="Orcish Warrior"
id="Marth-Tak"
name=_"Marth-Tak"
profile=portraits/orcs/warlord4.png
profile=portraits/orcs/transparent/grunt-2.png
canrecruit="1"
side="2"
team_name="northern_alliance"

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/05_Invaders.cfg
View file

@ -52,7 +52,7 @@
type=Orcish Warlord
id=Tan-Malgar
name= _ "Tan-Malgar"
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
side=2
canrecruit=yes
recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Spearman
@ -78,7 +78,7 @@
type=Orcish Warlord
id=Tan-Grolak
name= _ "Tan-Grolak"
profile=portraits/orcs/warlord5.png
profile=portraits/orcs/transparent/grunt-3.png
side=3
canrecruit=yes
#ifdef EASY
@ -123,7 +123,7 @@
type=Orcish Warlord
id="Tan-Uthkar"
name= _ "Tan-Uthkar"
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
side=4
canrecruit=yes
recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Warrior, Goblin Spearman

6
data/campaigns/The_Hammer_of_Thursagan/scenarios/10_The_Siege_of_Kal_Kartha.cfg
View file

@ -73,7 +73,7 @@
type=Orcish Warlord
id=Tan-Morgh
name= _ "Tan-Morgh"
profile=portraits/orcs/warlord4.png
profile=portraits/orcs/transparent/grunt-2.png
side=3
canrecruit=yes
#ifdef EASY
@ -120,7 +120,7 @@
type=Orcish Warlord
id=Tan-Garukh
name= _ "Tan-Garukh"
profile=portraits/orcs/warlord3.png
profile=portraits/orcs/transparent/grunt-2.png
side=4
canrecruit=yes
recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Spearman
@ -153,7 +153,7 @@
type=Orcish Warlord
id="Tan-Wagran"
name= _ "Tan-Wagran"
profile=portraits/orcs/warlord.png
profile=portraits/orcs/transparent/warlord.png
side=5
canrecruit=yes
recruit=Orcish Archer, Orcish Grunt, Wolf Rider, Orcish Warrior, Goblin Spearman

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

@ -180,20 +180,20 @@
[message]
speaker=Tan-Vrodis
image="portraits/orcs/warlord.png"
image="portraits/orcs/transparent/warlord.png"
message= _ "HUMANS... I see humans!"
[/message]
[message]
speaker=Tan-Bok
image="portraits/orcs/warlord2.png"
image="portraits/orcs/transparent/warlord.png"
# wmllint: local spelling Hogar
message= _ "Ha, Hogar! You said we wouldn't see any action this far back from the front."
[/message]
[message]
speaker=Tan-Hogar
image="portraits/orcs/warlord3.png"
image="portraits/orcs/transparent/grunt-2.png"
message= _ "Shut yer mouth! Let's just get 'em."
[/message]
[/event]

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

@ -35,7 +35,7 @@
id="Ut'Tan-Grilg"
name= _ "Ut'Tan-Grilg"
side=2
profile=portraits/orcs/warlord2.png
profile=portraits/orcs/transparent/warlord.png
canrecruit=yes
#ifdef EASY
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Knight, Goblin Spearman
@ -71,7 +71,7 @@
id=Tan-Pulk
name= _ "Tan-Pulk"
side=3
profile=portraits/orcs/warlord5.png
profile=portraits/orcs/transparent/grunt-3.png
canrecruit=yes
#ifdef EASY
recruit=Orcish Archer, Orcish Assassin, Orcish Grunt, Wolf Rider, Orcish Crossbowman, Goblin Pillager, Goblin Spearman

6
data/tools/wmllint
View file

@ -475,6 +475,12 @@ linechanges = (
("slasher-", "arbiter-"),
# Changes after 1.7.5
("portraits/nagas/fighter+female.png", "portraits/nagas/fighter.png"),
# Changes after 1.8rc1
("portraits/orcs/warlord.png", "portraits/orcs/transparent/warlord.png"),
("portraits/orcs/warlord2.png","portraits/orcs/transparent/warlord.png"),
("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"),
)
def validate_on_pop(tagstack, closer, filename, lineno):