Merge branch 'eras_sections'

data/core/help.cfg

@@ -1,7 +1,7 @@
 #textdomain wesnoth-help
 [help]
     [toplevel]
-        sections=introduction,gameplay,units,abilities_section,traits_section,weapon_specials,factions_section,terrains_section,addons,commands,encyclopedia
+        sections=introduction,gameplay,units,abilities_section,traits_section,weapon_specials,eras_section,terrains_section,addons,commands,encyclopedia
         topics=about,license
     [/toplevel]
 
@@ -52,10 +52,12 @@
     [/section]
 
     [section]
-        id=factions_section
-        title= _ "Factions"
-        generator=factions
-        sort_topics=generated
+        id=eras_section
+        title= _ "Eras"
+        sections_generator=eras
+        sort_sections=generated
+	sort_topics=yes
+	topics=..eras_section
     [/section]
 
     [section]
@@ -95,6 +97,17 @@
         generator="contents:generated"
     [/topic]
 
+    [topic]
+	id=..eras_section
+	title= _ "Eras"
+	text=_"A faction is a collection of units and leaders. Factions are assigned to sides in multiplayer games.
+
+" + _"An era is a collection of factions, intended to be played against one another. Besides the mainline eras that come with the game, many user-made factions are available from add-ons.
+
+"
+	generator="contents:generated"
+    [/topic]
+
     [topic]
         id=..abilities_section
         title= _ "Abilities"
@@ -569,7 +582,9 @@ Single-player campaigns are collections of scenarios that fit together to tell a
 
 For gameplay purposes, various races of creatures in the world cooperate with each other in factions. Factions are grouped in balanced sets with a common theme; for example, the main factions of Wesnoth can be found in the included Default Era.
 
-In <italic>text='Multiplayer'</italic> mode, you can choose an era when creating a new game, and players can pick from the available factions for that era when setting up their sides and teams." + _ "
+In <italic>text='Multiplayer'</italic> mode, you can choose an era when creating a new game, and players can pick from the available factions for that era when setting up their sides and teams." + _"
+
+You can see what eras you have loaded in the <ref>text='eras' dst='..eras_section'</ref> of the help." + _ "
 
 <header>text='Multiplayer Modifications'</header>" + _ "
 

data/multiplayer/factions/drakes-aoh.cfg

@@ -9,6 +9,9 @@
     random_leader=Drake Flameheart,Inferno Drake,Drake Enforcer,Drake Warden,Drake Blademaster
     recruit=Drake Burner,Fire Drake,Drake Clasher,Drake Glider,Drake Fighter,Saurian Skirmisher,Saurian Augur,Drake Warrior,Drake Flare,Drake Thrasher,Sky Drake,Drake Arbiter,Saurian Ambusher,Saurian Soothsayer,Saurian Oracle
     terrain_liked=Hh, Ha, Ds, Ss
+    description=_"<img>src='portraits/drakes/inferno.png~BG()' align='middle'</img>
+
+The <bold>text='Drakes'</bold> are a faction of dragon-like <ref>text='Drakes' dst='..race_drake'</ref> and their lizard <ref>text='Saurian' dst='..race_lizard'</ref> allies. Drakes are descendants of dragons, but smaller in size. Saurians are considerably smaller than Drakes and from different ancestry. Together, the Drake faction has high mobility but low defense, leading to unusual tactics for a <ref>text='Default Era' dst='..era_era_default'</ref> faction."
     [ai]
         recruitment_pattern=fighter,fighter,archer,healer,scout,scout
     [/ai]

data/multiplayer/factions/drakes-default.cfg

@@ -9,4 +9,7 @@
     random_leader=Drake Flare,Fire Drake,Drake Arbiter,Drake Thrasher,Drake Warrior
     recruit=Drake Burner,Drake Clasher,Drake Glider,Drake Fighter,Saurian Skirmisher,Saurian Augur
     terrain_liked=Hh, Ha, Ds, Ss
+    description=_"<img>src='portraits/drakes/inferno.png~BG()' align='middle'</img>
+
+The <bold>text='Drakes'</bold> are a faction of dragon-like <ref>text='Drakes' dst='..race_drake'</ref> and their lizard <ref>text='Saurian' dst='..race_lizard'</ref> allies. Drakes are descendants of dragons, but smaller in size. Saurians are considerably smaller than Drakes and from different ancestry. Together, the Drake faction has high mobility but low defense, leading to unusual tactics for a <ref>text='Default Era' dst='..era_era_default'</ref> faction."
 [/multiplayer_side]

data/multiplayer/factions/knalgans-aoh.cfg

@@ -8,6 +8,9 @@
     leader=Dwarvish Lord,Dwarvish Dragonguard,Dwarvish Sentinel,Assassin,Huntsman,Ranger
     recruit=Dwarvish Guardsman,Dwarvish Stalwart,Dwarvish Fighter,Dwarvish Steelclad,Dwarvish Ulfserker,Dwarvish Berserker,Dwarvish Thunderer,Dwarvish Thunderguard,Thief,Rogue,Poacher,Trapper,Footpad,Outlaw,Gryphon Rider,Gryphon Master
     terrain_liked=Hh, Ha, Mm
+    description=_"<img>src='portraits/dwarves/ulfserker.png~BG()' align='middle'</img>
+
+The <bold>text='Knalgan Alliance'</bold> is a faction of <ref>text='Dwarves' dst='..race_dwarf'</ref> and their outlaw <ref>text='Human' dst='..race_human'</ref> allies. Dwarves are an old race who live underground and have tough, but short, warriors. The outlaws are humans who are not socially acceptable among others of their race, but have become allies of the dwarves due to common enemies. This leads to a combination of tough and defensive dwarves who are only good on certain terrain and humans who can cover ground that dwarves are not good at fighting in."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]

data/multiplayer/factions/knalgans-default.cfg

@@ -8,6 +8,9 @@
     leader=Dwarvish Steelclad,Dwarvish Thunderguard,Dwarvish Stalwart,Rogue,Trapper
     recruit=Dwarvish Guardsman,Dwarvish Fighter,Dwarvish Ulfserker,Dwarvish Thunderer,Thief,Poacher,Footpad,Gryphon Rider
     terrain_liked=Hh, Ha, Mm
+    description=_"<img>src='portraits/dwarves/ulfserker.png~BG()' align='middle'</img>
+
+The <bold>text='Knalgan Alliance'</bold> is a faction of <ref>text='Dwarves' dst='..race_dwarf'</ref> and their outlaw <ref>text='Human' dst='..race_human'</ref> allies. Dwarves are an old race who live underground and have tough, but short, warriors. The outlaws are humans who are not socially acceptable among others of their race, but have become allies of the dwarves due to common enemies. This leads to a combination of tough and defensive dwarves who are only good on certain terrain and humans who can cover ground that dwarves are not good at fighting in."
     [ai]
         [aspect]
             id=recruitment_pattern

data/multiplayer/factions/loyalists-aoh.cfg

@@ -9,6 +9,9 @@
     random_leader=General,Royal Guard,Halberdier,Master Bowman,Mage of Light,Arch Mage
     recruit=Cavalryman,Dragoon,Horseman,Lancer,Knight,Spearman,Swordsman,Pikeman,Javelineer,Fencer,Duelist,Heavy Infantryman,Shock Trooper,Bowman,Longbowman,Mage,Red Mage,White Mage,Merman Fighter,Merman Warrior,Ogre,Lieutenant
     terrain_liked=Gg, Ww, Wo
+    description=_"<img>src='portraits/humans/general.png~BG()' align='middle'</img>
+
+The <bold>text='Loyalists'</bold> are a faction of <ref>text='Humans' dst='..race_human'</ref> who are loyal to the throne of Wesnoth. Humans are a versatile race who specialize in many different areas. Similarly, the Loyalist faction is a very versatile melee-oriented faction with important ranged support from bowmen and mages."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,mixed fighter,scout
     [/ai]

data/multiplayer/factions/loyalists-default.cfg

@@ -9,6 +9,9 @@
     random_leader=Lieutenant,Swordsman,Pikeman,Javelineer,Longbowman,White Mage,Red Mage
     recruit=Cavalryman,Horseman,Spearman,Fencer,Heavy Infantryman,Bowman,Mage,Merman Fighter
     terrain_liked=Gg, Ww, Wo
+    description=_"<img>src='portraits/humans/general.png~BG()' align='middle'</img>
+
+The <bold>text='Loyalists'</bold> are a faction of <ref>text='Humans' dst='..race_human'</ref> who are loyal to the throne of Wesnoth. Humans are a versatile race who specialize in many different areas. Similarly, the Loyalist faction is a very versatile melee-oriented faction with important ranged support from bowmen and mages."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,mixed fighter,scout
     [/ai]

data/multiplayer/factions/northerners-aoh.cfg

@@ -9,6 +9,9 @@
     random_leader=Orcish Warlord,Troll Warrior,Orcish Slurbow
     recruit=Orcish Grunt,Orcish Warrior,Troll Whelp,Troll,Troll Rocklobber,Wolf Rider,Goblin Knight,Goblin Pillager,Orcish Archer,Orcish Crossbowman,Orcish Assassin,Orcish Slayer,Naga Fighter,Naga Warrior,Goblin Spearman,Goblin Impaler,Goblin Rouser
     terrain_liked=Hh, Ha, Mm, Ss
+    description=_"<img>src='portraits/orcs/sovereign.png~BG()' align='middle'</img>
+
+The <bold>text='Northerners'</bold> are a faction of <ref>text='Orcs' dst='..race_orc'</ref> and their allies who live in the north of the Great Continent, thus their name. Northerners consist of the warrior orcs race, the enslaved <ref>text='goblins' dst='..race_goblin'</ref>, <ref>text='trolls' dst='..race_troll'</ref> who are tricked into combat by the orcs, and the serpentine <ref>text='naga' dst='..race_naga'</ref>. The Northerners play best by taking advantage of having many low-cost and high HP soldiers."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]

data/multiplayer/factions/northerners-default.cfg

@@ -8,6 +8,9 @@
     leader=Orcish Warrior,Troll,Troll Rocklobber,Orcish Crossbowman,Orcish Slayer
     recruit=Orcish Grunt,Troll Whelp,Wolf Rider,Orcish Archer,Orcish Assassin,Naga Fighter,Goblin Spearman
     terrain_liked=Hh, Ha, Mm, Ss
+    description=_"<img>src='portraits/orcs/sovereign.png~BG()' align='middle'</img>
+
+The <bold>text='Northerners'</bold> are a faction of <ref>text='Orcs' dst='..race_orc'</ref> and their allies who live in the north of the Great Continent, thus their name. Northerners consist of the warrior orcs race, the enslaved <ref>text='goblins' dst='..race_goblin'</ref>, <ref>text='trolls' dst='..race_troll'</ref> who are tricked into combat by the orcs, and the serpentine <ref>text='naga' dst='..race_naga'</ref>. The Northerners play best by taking advantage of having many low-cost and high HP soldiers."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]

data/multiplayer/factions/rebels-aoh.cfg

@@ -9,6 +9,9 @@
     random_leader=Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter,Mage of Light,Arch Mage,Silver Mage,Elvish Shyde,Elvish Enchantress
     recruit=Elvish Fighter,Elvish Hero,Elvish Captain,Elvish Archer,Elvish Marksman,Elvish Ranger,Mage,Red Mage,White Mage,Elvish Shaman,Elvish Druid,Elvish Sorceress,Elvish Scout,Elvish Rider,Wose,Elder Wose,Merman Hunter,Merman Spearman,Merman Netcaster
     terrain_liked=Ff, Fa, Ss, Ww
+    description=_"<img>src='portraits/elves/druid.png~BG()' align='middle'</img>
+
+The <bold>text='Rebels'</bold> are a faction of <ref>text='Elves' dst='..race_elf'</ref> and their various forest-dwelling allies. They get their human name, Rebels, from the time of Heir to the Throne, when they started the rebellion against the evil Queen Asheviere. Elves are a magical race that are masters of the bow and are capable of living many years longer than humans. In harmony with nature, the elves find allies with the <ref>text='human' dst='..race_human'</ref> mages, certain <ref>text='merfolk' dst='..race_merman'</ref>, and <ref>text='tree creatures' dst='..race_wose'</ref> called 'Woses.' Rebels are best played taking advantage of their high forest defense, mastery of ranged attacks, and the elves' neutral alignment."
     [ai]
         recruitment_pattern=fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]

data/multiplayer/factions/rebels-default.cfg

@@ -9,6 +9,9 @@
     random_leader=Elvish Captain,Elvish Hero,Elvish Ranger,Elvish Marksman,Elvish Druid,Elvish Sorceress,White Mage,Red Mage
     recruit=Elvish Fighter,Elvish Archer,Mage,Elvish Shaman,Elvish Scout,Wose,Merman Hunter
     terrain_liked=Ff, Fa, Ss, Ww
+    description=_"<img>src='portraits/elves/druid.png~BG()' align='middle'</img>
+
+The <bold>text='Rebels'</bold> are a faction of <ref>text='Elves' dst='..race_elf'</ref> and their various forest-dwelling allies. They get their human name, Rebels, from the time of Heir to the Throne, when they started the rebellion against the evil Queen Asheviere. Elves are a magical race that are masters of the bow and are capable of living many years longer than humans. In harmony with nature, the elves find allies with the <ref>text='human' dst='..race_human'</ref> mages, certain <ref>text='merfolk' dst='..race_merman'</ref>, and <ref>text='tree creatures' dst='..race_wose'</ref> called 'Woses.' Rebels are best played taking advantage of their high forest defense, mastery of ranged attacks, and the elves' neutral alignment."
     [ai]
         recruitment_pattern=fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]

data/multiplayer/factions/undead-aoh.cfg

@@ -9,6 +9,9 @@
     random_leader=Lich,Necromancer,Draug,Banebow
     recruit=Skeleton,Revenant,Deathblade,Skeleton Archer,Bone Shooter,Walking Corpse,Soulless,Ghost,Wraith,Shadow,Vampire Bat,Blood Bat,Ghoul,Necrophage,Dark Adept,Dark Sorcerer
     terrain_liked=Ss, Hh, Ha, Ww
+    description=_"<img>src='portraits/undead/wraith.png~BG()' align='middle'</img>
+
+The <bold>text='Undead'</bold> are a faction of <ref>text='undead' dst='..race_undead'</ref> creatures and <ref>text='human' dst='..race_human'</ref> practitioners of dark arts that usually accompany them. Often, these 'Dark Adepts' are the units that do the most damage for the faction, but they have a major vulnerability - their practicing of this forbidden, evil magic has consumed all their energy and so they have no melee attack at all. The Undead are a very aggressive faction and the most powerful <ref>text='Default Era' dst='..era_era_default'</ref> faction at nighttime."
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]

data/multiplayer/factions/undead-default.cfg

@@ -9,6 +9,9 @@
     random_leader=Dark Sorcerer,Revenant,Deathblade,Bone Shooter
     recruit=Skeleton,Skeleton Archer,Walking Corpse,Ghost,Vampire Bat,Dark Adept,Ghoul
     terrain_liked=Ss, Hh, Ha, Ww
+    description=_"<img>src='portraits/undead/wraith.png~BG()' align='middle'</img>
+
+The <bold>text='Undead'</bold> are a faction of <ref>text='undead' dst='..race_undead'</ref> creatures and <ref>text='human' dst='..race_human'</ref> practitioners of dark arts that usually accompany them. Often, these 'Dark Adepts' are the units that do the most damage for the faction, but they have a major vulnerability - their practicing of this forbidden, evil magic has consumed all their energy and so they have no melee attack at all. The Undead are a very aggressive faction and the most powerful <ref>text='Default Era' dst='..era_era_default'</ref> faction at nighttime."
     [ai]
         recruitment_pattern=fighter,fighter,archer,fighter,scout,archer
     [/ai]