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

Run wmlindent

Browse source
This commit is contained in:
Bär Halberkamp 2016-09-15 18:04:16 +02:00
parent b20cb7c413
commit ce05a573cf
13 changed files with 97 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -681,8 +681,8 @@
search_recall_list=no
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[/role]
[message]
role=ThankfulMerman
@ -753,9 +753,9 @@
search_recall_list=no
type="Elvish Sylph,Great Mage,"+
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage,"+
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage,"+
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage"
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage,"+
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage,"+
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage"
[/role]
[message]
role=Supporter

12
data/campaigns/Heir_To_The_Throne/scenarios/05a_Muff_Malal_Peninsula.cfg
View file

@ -98,12 +98,12 @@
[auto_recall][/auto_recall]
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider,Paladin,Grand Knight,Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider,Knight,Lancer,White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout,Horseman,Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[else]
[unit]
side=1

30
data/campaigns/Heir_To_The_Throne/scenarios/06_The_Siege_of_Elensefar.cfg
View file

@ -173,23 +173,23 @@
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher"
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher"
[else]
[unit]
side=1

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

@ -152,26 +152,26 @@
type="Elvish Sylph,Great Mage," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Assassin," +
"Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Elvish Shyde,Elvish Enchantress,Elvish Outrider," +
"Paladin,Grand Knight," +
"Mage of Light,Arch Mage,Silver Mage," +
"Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Highwayman,Fugitive,Huntsman,Ranger," +
"Assassin," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Rogue," +
"Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,Elvish Rider," +
"Knight,Lancer," +
"White Mage,Red Mage," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Bandit,Outlaw,Trapper," +
"Rogue," +
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher," +
"Thief"
"Elvish Fighter,Elvish Archer,Elvish Shaman,Elvish Scout," +
"Horseman," +
"Mage," +
"Merman Fighter,Merman Hunter,Mermaid Initiate," +
"Thug,Footpad,Poacher," +
"Thief"
[else]
[unit]
side=1

24
data/campaigns/Heir_To_The_Throne/scenarios/12_Northern_Winter.cfg
View file

@ -147,18 +147,18 @@
[auto_recall][/auto_recall]
type="Thief," +
"Poacher,Footpad,Thug," +
"Mage," +
"Horseman," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Red Mage,White Mage," +
"Lancer,Knight," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Silver Mage,Arch Mage,Mage of Light," +
"Grand Knight,Paladin," +
"Great Mage"
"Poacher,Footpad,Thug," +
"Mage," +
"Horseman," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Red Mage,White Mage," +
"Lancer,Knight," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Silver Mage,Arch Mage,Mage of Light," +
"Grand Knight,Paladin," +
"Great Mage"
[else]
[unit]
side=1

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

@ -177,11 +177,11 @@
[auto_recall][/auto_recall]
type="Elvish Outrider," +
"Paladin,Grand Knight," +
"Elvish Rider," +
"Knight,Lancer," +
"Elvish Scout," +
"Horseman"
"Paladin,Grand Knight," +
"Elvish Rider," +
"Knight,Lancer," +
"Elvish Scout," +
"Horseman"
[else]
[unit]
side=1
@ -199,8 +199,8 @@
[auto_recall][/auto_recall]
type="Highwayman,Fugitive,Huntsman,Ranger," +
"Bandit,Outlaw,Trapper," +
"Thug,Footpad,Poacher"
"Bandit,Outlaw,Trapper," +
"Thug,Footpad,Poacher"
[/role]
[/event]
@ -662,22 +662,22 @@
[/message]
[role]
type="Thief," +
"Poacher,Footpad,Thug," +
"Horseman," +
"Elvish Scout,Elvish Archer,Elvish Fighter," +
"Fighter," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Lancer,Knight," +
"Elvish Rider,Elvish Marksman,Elvish Ranger,Elvish Hero,Elvish Captain," +
"Elvish Lord," +
"Commander," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Grand Knight,Paladin," +
"Elvish Outrider,Elvish Sharpshooter,Elvish Avenger,Elvish Champion,Elvish Marshal," +
"Elvish High Lord," +
"Lord"
"Poacher,Footpad,Thug," +
"Horseman," +
"Elvish Scout,Elvish Archer,Elvish Fighter," +
"Fighter," +
"Rogue," +
"Trapper,Outlaw,Bandit," +
"Lancer,Knight," +
"Elvish Rider,Elvish Marksman,Elvish Ranger,Elvish Hero,Elvish Captain," +
"Elvish Lord," +
"Commander," +
"Assassin," +
"Ranger,Huntsman,Fugitive,Highwayman," +
"Grand Knight,Paladin," +
"Elvish Outrider,Elvish Sharpshooter,Elvish Avenger,Elvish Champion,Elvish Marshal," +
"Elvish High Lord," +
"Lord"
role=whiner
[/role]
[message]

8
data/campaigns/Heir_To_The_Throne/scenarios/19c_Cliffs_of_Thoria.cfg
View file

@ -198,8 +198,8 @@
[role]
role=merman-advisor
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
reassign=no
[auto_recall][/auto_recall]
[else]
@ -871,8 +871,8 @@ Soooo... It is you who sent your subordinates to attack us. Now when we’ve des
reassign=no
search_recall_list=no
type="Merman Triton,Merman Hoplite,Merman Javelineer,Merman Entangler,Mermaid Diviner,Mermaid Siren," +
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
"Merman Warrior,Merman Spearman,Merman Netcaster,Mermaid Priestess,Mermaid Enchantress," +
"Merman Fighter,Merman Hunter,Mermaid Initiate"
[/role]
[message]
role=merman-advisor

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

@ -215,8 +215,8 @@
red,green,blue=255,255,192
description= _ "20% of finishing gold carried over to the next scenario." + "
<span foreground='white'><big>"+
#textdomain wesnoth
_"Notes:"+"</big></span>"
#textdomain wesnoth
_"Notes:"+"</big></span>"
#textdomain wesnoth-trow
[/note]
[note]

4
data/campaigns/The_South_Guard/scenarios/08a_Return_to_Kerlath.cfg
View file

@ -207,8 +207,8 @@
side=3
search_recall_list=no
type="Master Bowman,Royal Guard,Halberdier," +
"Longbowman,Swordsman,Pikeman,Javelineer," +
"Bowman,Spearman"
"Longbowman,Swordsman,Pikeman,Javelineer," +
"Bowman,Spearman"
[/role]
[/else]
[/role]

4
data/campaigns/Two_Brothers/scenarios/01_Rooting_Out_a_Mage.cfg
View file

@ -289,8 +289,8 @@ Will he heed the call? I do not know if he has kept the amulet; we have not spok
[role]
type="Royal Guard,Halberdier,Master Bowman,Paladin,Grand Knight,Fugitive," +
"Swordsman,Pikeman,Javelineer,Longbowman,Knight,Lancer,Outlaw," +
"Spearman,Bowman,Horseman,Footpad"
"Swordsman,Pikeman,Javelineer,Longbowman,Knight,Lancer,Outlaw," +
"Spearman,Bowman,Horseman,Footpad"
role=Reporter
[not]
id=Arvith

8
data/campaigns/tutorial/scenarios/01_Tutorial_part_1.cfg
View file

@ -149,7 +149,7 @@
caption= _ "Welcome to Wesnoth!"
image=wesnoth-icon.png
message= _ "For this tutorial, you are playing Konrad. You are standing on the keep, and your mentor Delfador is on the east side of the river. You can move the mouse over a unit to see a summary of its abilities and stats on the right of the screen." +
{CONTINUE_MSG}
{CONTINUE_MSG}
[/message]
) (
[message]
@ -157,7 +157,7 @@
caption= _ "Welcome to Wesnoth!"
image=wesnoth-icon.png
message= _ "For this tutorial, you are playing Li’sar. You are standing on the keep, and your mentor Delfador is on the east side of the river. you can move the mouse over a unit to see a summary of its abilities and stats on the right of the screen." +
{CONTINUE_MSG}
{CONTINUE_MSG}
[/message]
)}
@ -201,7 +201,7 @@
caption= _ "Movement"
image=wesnoth-icon.png
message= _ "When you select a unit, in this case Konrad, the places he can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex uses one movement point, but moving across different types of hexes, or <i>terrains</i>, can use up more. You will learn more about that later. To move, simply click on your destination. You can press <b>u</b> to undo a move if you move to the wrong place." +
{CONTINUE_MSG}
{CONTINUE_MSG}
[/message]
) (
[message]
@ -209,7 +209,7 @@
caption= _ "Movement"
image=wesnoth-icon.png
message= _ "When you select a unit, in this case Li’sar, the places she can move to are highlighted. All units have a certain number of <i>movement points</i>, which dictate how many hexes that unit can move per turn. Normally, moving one hex uses one movement point, but moving across different types of hexes, or <i>terrains</i>, can use up more. You will learn more about that later. To move, simply click on your destination. You can press <b>u</b> to undo a move if you move to the wrong place." +
{CONTINUE_MSG}
{CONTINUE_MSG}
[/message]
)}

6
data/core/help.cfg
View file

@ -173,7 +173,7 @@ The interactive <bold>text='Tutorial'</bold> introduces the basics of Wesnoth ga
After you master the basics, try out a beginner campaign, such as <italic>text='Heir to the Throne'</italic> or <italic>text='The South Guard'</italic>. A full list of installed campaigns can be found via the <bold>text='Campaign'</bold> option on the main menu. As Wesnoth can be quite challenging, you may wish to start on easy before progressing to higher difficulties." + "
<img>src=help/tooltip.png align=right float=yes</img>" +
_ "While playing, keep in mind that you can mouse-over many items in the game, such as the information displayed in the status pane, to see a brief description explaining each item. This is especially useful when you encounter new elements, such as <ref>dst='..abilities_section' text='abilities'</ref>, for the first time." + _ "
_ "While playing, keep in mind that you can mouse-over many items in the game, such as the information displayed in the status pane, to see a brief description explaining each item. This is especially useful when you encounter new elements, such as <ref>dst='..abilities_section' text='abilities'</ref>, for the first time." + _ "
<header>text='Fundamentals of Gameplay'</header>
@ -229,10 +229,10 @@ There are two important exceptions to upkeep: units with the loyal trait and lea
id=hitpoints
title= _ "Hitpoints and Experience"
text= "<img>src=help/hpxp.png align=right float=yes</img>" + _ "Each unit has a certain number of <italic>text='hitpoints'</italic> (HP). If the hitpoints of a unit drop below 1, the unit dies. Each unit also has a certain number of <italic>text='experience points'</italic> (XP). A freshly recruited unit starts with no experience points, and gains experience by fighting enemies." +
"
"
" +
_ "The hitpoints and experience points are both indicated in the status pane using two numbers (the current value and the maximum value the unit can have)." + "
_ "The hitpoints and experience points are both indicated in the status pane using two numbers (the current value and the maximum value the unit can have)." + "
<img>src=help/hp-bars.png align=left float=yes</img>" + _ "The hitpoints are also indicated by an energy bar next to each unit, which is green, yellow or red. A unit with at least 1 experience point has a blue experience bar, which turns white as the unit is about to <ref>dst='advancement' text='advance'</ref>."
[/topic]

2
data/core/terrain.cfg
View file

@ -797,7 +797,7 @@ Most units receive 20 to 40% defense in sand."
name= _ "Mountains"
editor_name= _ "Desert Mountains"
string=Mdd
aliasof=Mt
aliasof=Mt
editor_group=rough, desert
[/terrain_type]