Merge lp:~widelands-dev/widelands/i18n into lp:widelands

[GunChleoc]

A whole bunch of changes for i18n:

- Translators get control over ordering of placeholders
- Proper plural forms
- Other string design improvements

Because I can't compile at the moment, check my commit comments for things that still need to be tested before the merge:

http://bazaar.launchpad.net/~widelands-dev/widelands/i18n/revision/6878

[GunChleoc (gunchleoc)]

After I could compile and test, this is the stuff that still needs looking into:

===============================

/test/maps/expedition.wmf/scripting/init.lua
- upper or lowercase needed here?
  wait_for_message("Expedition Ready")
  wait_for_message("Port Space Found")

===============================

/utils/test/test_lua-xgettext.py

- 2 differences, please check:

def run_test(self):
self.p.parse(self.code, self.filename)

+ print self.p.findings - do we need this line? It's in gci18nfixes, but missing from i18n

and at EOF:

- # k = SomeTestClass()
- # unittest.TextTestRunner().run(k)
+ k = SomeTestClass()
+ unittest.TextTestRunner().run(k)

===============================

Help messages in nethost.cc

[SirVer (sirver)]

> - upper or lowercase needed here?

The strings have been changed to be titelized and unfortunately we depend on them being the same. So uppercase should be correct.

> /utils/test/test_lua-xgettext.py

the print line and the comments (or non comments) are fine either way.

> Help messages in nethost.cc

lgtm.

review: Approve

=== modified file 'campaigns/atl01.wmf/elemental'
--- campaigns/atl01.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/atl01.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -6,7 +6,7 @@
 map_h="160"
 nr_players="1"
 world="greenland"
-name=_"01 - From Nemesis to Genesis"
+name=_"01 – From Nemesis to Genesis"
 author="SirVer,Nasenbaer"
 descr=_ "After landing on a mysterious island close to Atlantis, the remaining Atlanteans struggle to make a new home for themselves."
 background="campaigns/atl01.wmf/pics/everythinglost.jpg"
 
=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -3,6 +3,7 @@
 -- =======================================================================
 
 use("aux", "formatting")
+use("aux", "format_scenario")
 
 function jundlina(title, text)
    return speech("map:princess.png", "2F9131", title, text)
@@ -23,126 +24,126 @@
    return speech("map:ostur.png", "375FFC", "Ostur", text)
 end
 
--- Append an objective text to a dialog box in a nice fashion.
-function new_objectives(...)
-   local s = rt(
-   "<p font=DejaVuSerif font-size=18 font-weight=bold font-color=D1D1D1>"
-   .. _"New Objectives" .. "</p>")
-
-   for idx,obj in ipairs{...} do
-      s = s .. obj.body
-   end
-   return s
-end
-
 -- =======================================================================
 --                                Objectives
 -- =======================================================================
 obj_ensure_build_wares_production = {
    name = "obj_ensure_build_wares_production",
-   title = _ "Ensure the supply of build wares",
-   body = objective_text(_"The supply of build wares", _
-[[Build a quarry, two woodcutter's houses, two forester's houses and a
-sawmill.]]
+   title = _ "Ensure the supply of building wares",
+   number = 6,
+   body = objective_text(_"Supply Building Wares", _
+[[Supply basic building material for your economy:]] .. "<br>" ..
+[[• ]] .. _[[Build a quarry]] .. "<br>" ..
+[[• ]] .. _[[Build two woodcutter’s houses]] .. "<br>" ..
+[[• ]] .. _[[Build two forester’s houses]] .. "<br>" ..
+[[• ]] .. _[[Build a sawmill]]
    ),
 }
 
 obj_expand = {
    name = "obj_expand",
-   title = _ "Expand your territory and explore the island",
-   body = objective_text(_"Expand and Explore", _
-[[The island is huge and as long as we are not sure that we are alone
-here, we cannot relax. Explore and conquer it, this is the
-only way to protect us from threats on the island and from Atlantis.]]
+   title = _ "Expand your territory and explore",
+   number = 1,
+   body = objective_text(_"Expand and Explore", _(
+[[The island is huge and as long as we are not sure that we are alone here, we cannot relax. ]] ..
+[[Explore and conquer it, this is the only way to protect us from threats on the island and from Atlantis.]]) .. [[<br>]] ..
+[[• ]] .. _[[Build military sites to expand your territory]]
    ),
 }
 
 obj_make_food_infrastructure = {
    name = "obj_make_food_infrastructure",
    title = _ "Establish a solid food production",
-   body = objective_text(_"Establish a food production", _
-[[Food is very important for mines and military training areas. Establish
-a well working food environment by building at least one farm, one blackroot
-farm and a mill. The two kinds of flour together with water from a well
-will be baked into bread in a bakery, so build a bakery and a well, too.<br><br>
-The other two important food wares are smoked fish and smoked meat. Raw meat
-is delivered from a hunter. A fisher gets the fish out of the sea while a
-fish breeder makes sure that a school of fish does not go extinct by breeding
-more. Make sure that there are always fish left, otherwise the fish breeder
-won't be able to breed new ones. The smoking happens in a smokery, you
-will need at least two of those.<br><br>
-- Build a Farm and a Blackroot farm<br>
-- Build a mill to make flour and blackroot flour<br>
-- Build a well<br>
-- Build a bakery to bake bread from flour, blackroot flour and water.<br>
-- Build a hunter's house to get raw meat<br>
-- Build a fisher's house close to water to get raw fish<br>
-- Build a fishbreeder's house close to the fisher to make sure the fish do not die out<br>
-- Build two smokeries to smoke raw meat and fish.]]
+   number = 10,
+   body = objective_text(_"Food Production", _(
+[[Food is very important for mines and military training areas. ]] ..
+[[Establish a well working food environment by building at least one farm, one blackroot farm and a mill. ]] ..
+[[The two kinds of flour together with water from a well will be baked into bread in a bakery, ]] ..
+[[so build a bakery and a well, too.]]) .. [[<br><br>]] ..
+_([[The other two important food wares are smoked fish and smoked meat. ]] ..
+[[Raw meat is delivered from a hunter. ]] ..
+[[A fisher gets the fish out of the sea while a fish breeder makes sure that a school of fish does not go extinct ]] ..
+[[by breeding more. Make sure that there are always fish left, ]] ..
+[[otherwise the fish breeder won’t be able to breed new ones. ]] ..
+[[The smoking happens in a smokery, you will need at least two of those.]]) .. [[<br>]] ..
+[[• ]] .. _[[Build a farm and a blackroot farm]] .. "<br>" ..
+[[• ]] .. _[[Build a mill to make flour and blackroot flour]] .. "<br>" ..
+[[• ]] .. _[[Build a well]] .. "<br>" ..
+[[• ]] .. _[[Build a bakery to bake bread from flour, blackroot flour and water]] .. "<br>" ..
+[[• ]] .. _[[Build a hunter’s house to get raw meat]] .. "<br>" ..
+[[• ]] .. _[[Build a fisher’s house close to water to get raw fish]] .. "<br>" ..
+[[• ]] .. _[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]] .. "<br>" ..
+[[• ]] .. _[[Build two smokeries to smoke raw meat and fish]]
    )
 }
 
 obj_spidercloth_production = {
    name = "obj_spidercloth_production",
-   title = _ "Build a spiderfarm and a weaving mill",
-   body = objective_text(_"Establish a spidercloth production", _
-[[The weavers produce spidercloth and tabards in the weaving-mill. Spidercloth
-is needed for the construction of some buildings and clothing while tabards
-are the uniforms of soldiers. The weaving-mill needs gold yarn and spider yarn
-as inputs. Spider yarn is produced by the spiderfarm while gold yarn is
-produced by the gold weaver out of gold.<br><br>
-- Build a Weaving-Mill<br>
-- Build a Spiderfarm<br>
-- Build a Goldweaver<br>]]
+   title = _ "Build a spider farm and a weaving mill",
+   number = 3,
+   body = objective_text(_"Spidercloth Production", _(
+[[The weavers produce spidercloth and tabards in the weaving-mill. ]] ..
+[[Spidercloth is needed for the construction of some buildings and clothing, ]] ..
+[[while tabards are the uniforms of soldiers. ]] ..
+[[The weaving-mill needs gold yarn and spideryarn as raw material. ]] ..
+[[Spideryarn is produced by the spider farm, while gold yarn is produced by the gold weaver out of gold.]]) .. "<br>" ..
+[[• ]] .. _[[Build a weaving-mill]] .. "<br>" ..
+[[• ]] .. _[[Build a spider farm]] .. "<br>" ..
+[[• ]] .. _[[Build a goldweaver]]
  )
 }
 
 obj_make_heavy_industry_and_mining = {
    name = "obj_make_heavy_industry_and_mining",
    title = _ "Build industry and mines",
-   body = objective_text(_"Build industry and mines", _
-[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine
-is digging for crystal, quartz and diamond - all of them are rare materials and
-very seldom found. While it searches for them, it produces a lot of stone.<br>
-The ores have to be smelted in smelting works before they can be used. The
-refined materials are then used in the weapon smithy, the armor smithy and the
-tool smithy.<br><br>
-- Build a mine of each kind. Make sure to send geologists to the mountain first.<br>
-- Build a smelting works.<br>
-- Build an armor smithy and a weapon smithy.<br>
-- Build a tool smithy.<br>]]
+   number = 5,
+   body = objective_text(_"Industry and Mines", _(
+[[Iron ore, gold ore and coal are mined in the respective mines. ]] ..
+[[The crystal mine will dig for crystal, quartz and diamond – all of them are precious materials and ]] ..
+[[very rarely found. It will produce a lot of stone while searching for them.]]) .. "<br>" ..
+_([[The ores have to be smelted at a smelting works before they can be used. ]] ..
+[[The refined materials are then used in the weapon smithy, the armor smithy and the toolsmithy.]]) .. "<br>" ..
+[[• ]] .. _[[Build a mine of each type. Make sure to send geologists to the mountain first.]] .. "<br>" ..
+[[• ]] .. _[[Build a smelting works]] .. "<br>" ..
+[[• ]] .. _[[Build an armor smithy and a weapon smithy]] .. "<br>" ..
+[[• ]] .. _[[Build a toolsmithy]]
  )
 }
 
 obj_make_training_buildings = {
    name = "obj_make_training_buildings",
-   title = _"Build training buildings",
-   body = objective_text(_"Build training buildings to improve your soldiers", _
-[[As all other tribes, the Atlanteans are also able to train soldiers: the
-dungeon trains attack - the major attribute of the Atlanteans - and the
-labyrinth trains evasion, health points and defense. The items produced by the
-industry are used to train better soldiers in the two training buildings.<br><br>
-- Build a dungeon and a labyrinth.<br>]])
+   title = _"Build training buildings for soldiers",
+   number = 2,
+   body = objective_text(_"Soldier Training Buildings", _(
+[[Like all other tribes, the Atlanteans are also able to train soldiers: ]] ..
+[[the dungeon trains attack – the major attribute of the Atlanteans – and the labyrinth trains ]] ..
+[[evasion, health and defense. The items produced by the industry are used to train better soldiers ]] ..
+[[in the two training buildings.]]) .. "<br>" ..
+[[• ]] .. _[[Build a dungeon and a labyrinth]]
+ )
 }
 
 obj_horsefarm_and_warehouse = {
    name = "obj_horsefarm_and_warehouse",
    title = _"Build a warehouse and a horsefarm",
-   body = objective_text(_"Build a warehouse and a horsefarm", _
-[[As your road network gets longer and more complicated, you should employ
-horses to help out your carriers. Horses are bred in horsefarms using water and
-corn. A warehouse will also help to ensure your transportation system does not
-collapse.]])
+   number = 2,
+   body = objective_text(_"Warehouse and Horsefarm", _(
+[[As your road network gets longer and more complicated, you should employ horses ]] ..
+[[to help out your carriers. Horses are bred at horse farms using water and corn. ]] ..
+[[A warehouse will also help to ensure that your transportation system does not collapse.]]) .. "<br>" ..
+[[• ]] .. _[[Build a warehouse]] .. "<br>" ..
+[[• ]] .. _[[Build a horse farm]])
 }
 
 obj_build_ships = {
    name = "obj_build_ships",
    title = _ "Build 3 ships to escape from the island",
-   body = objective_text(_"Escape from the island", _
-[[There is a lake at the top of the island. Build 3 ships in these waters
-and you might be able to rescue your people when the island is swallowed
-completely by the ocean. Build a shipyard close to the lake to start
-building ships.]]
+   number = 1,
+   body = objective_text(_"Escape From the Island", _(
+[[There is a lake at the top of the island. ]] ..
+[[Build three ships in these waters and you might be able to rescue your people ]] ..
+[[before the island is swallowed completely by the ocean.]])  .. "<br>" ..
+[[• ]] .. _[[Build a shipyard close to the lake to start building ships]]
    )
 }
 
@@ -153,175 +154,168 @@
 -- This is an array or message descriptions
 initial_messages = {
 {
-   title = _ "Proudest to the death",
+   title = _ "Proud to the Death",
    body = rt(
-      h1(_"Favored by the god") ..
-      p(_
-[[On the hidden and lost island of Atlantis, a proud tribe settled since the
-world was very young. Ruled by the bloodline of King Ajanthul - the first human
-to be empowered by the sea god Lutas to breathe above the sea level - and the
-wise clerics, who provided the link to Lutas - they prospered and became
-civilized.]]
-      ) .. p(_
-[[This story happens during the regency of King Askandor, the 43rd successor of
-King Ajanthul. He has been a good king, ruling Atlantis with wisdom and
-foresight. But with age, he became afraid of dying and so he began looking for
-a cure to death even though most clerics warned him. Some said, endless life
-was only for the gods and to seek for it was forbidden.]]
-      )
+      h1(_"Favored by the God") ..
+      p(_(
+[[On the hidden and lost island of Atlantis, a proud tribe settled since the ]] ..
+[[world was very young. Ruled by the bloodline of King Ajanthul – the first human ]] ..
+[[to be empowered by the sea god Lutas to breathe above sea level – and the ]] ..
+[[wise clerics, who provided the link to Lutas – they prospered and became ]] ..
+[[civilized.]]
+      )) .. p(_(
+[[This story is taking place during the reign of King Askandor, the 43rd successor of King Ajanthul. ]] ..
+[[He had been a good king, ruling Atlantis with wisdom and foresight. ]] ..
+[[But with age, he became afraid of dying and so he began looking for ]] ..
+[[a cure for death even though most clerics warned him against it. ]] ..
+[[Some said that endless life was only for the gods and that to seek for it was forbidden.]]
+      ))
    ),
 },
 {
-   title = _ "The god's disgrace",
+   title = _ "Disgraced Before the God",
    body = rt(
-      h1(_"The god's punishment") ..
-      p(_
-[[But all seemed well. Only the horses seemed to feel something was wrong.
-In the nights, they went crazy and were full of fear. It was not long before the
-horsebreeder Xydra figured out what was wrong with them: The sea level in front
-of their stable was rising in an ever accelerating speed.]]
-   ) .. p(_
-[[The clerics went into their meditation and the reason for the rising water
-was soon to be found: The god Lutas had lost faith in the Atlanteans because of
-the boldness of their king. He decided to withdraw the rights that were granted
-to King Ajanthul and his children. And so, he called them back below the sea
-again.]]
-   )
+      h1(_"The God’s Punishment") ..
+      p(_(
+[[But all seemed well. Only the horses seemed to feel something was wrong. ]] ..
+[[During the nights, they went crazy and were full of fear. ]] ..
+[[It was not long before the horse breeder Xydra figured out what was wrong with them: ]] ..
+[[the sea level in front of their stable was rising with ever increasing speed.]]
+   )) .. p(_(
+[[The clerics retreated into meditation and the reason for the rising water was soon to be found: ]] ..
+[[the god Lutas had lost faith in the Atlanteans because of the boldness of their king. ]] ..
+[[He decided to withdraw the rights that were granted to King Ajanthul and his children. ]] ..
+[[And so, he called them back below the sea again.]]
+   ))
 )
 },
 {
-   title = _ "Uproar and confusion",
+   title = _ "Uproar and Confusion",
    body = rt(
-      h1(_"Chaos emerges...") ..
-      p(_
-[[Guilt-ridden, the king committed suicide. Without a monarch, the people
-turned to the clerics, but those had no substantial help to offer. Most
-accepted their fate while others tried to change the god's mind by offering
-animals in his temple. But to no avail...]]
-   ) .. p(_
-[[Jundlina, the late king's daughter and the highest priestess of the god
-was the most determined cleric. As countless offerings didn't change the
-situation, she convinced herself that to soothe the god, an offer of great
-personal value was needed. So she offered him her most beloved:
-her husband, father of her only child.]]
-   ) .. p(_
-[[But not even this changed the mind of the god. The water kept on rising.
-Nearly driven crazy by guilt, pain and anger, Jundlina became a heretic:
-Secretly, she gathered people of the common folk who were not in line with the
-decision of the clerics to accept the god's will. Together with them, she set
-the temple on fire and stole a ship to flee from the god's influence of
-Atlantis. This small group started praying to Satul, the fire god and the worst
-enemy of Lutas.]]
-   ) .. p(_
-[[Leaving the dying Atlantis and their past behind, they started a quest to
-find a place sheltered by the fire and protected from the sea.]]
-   )
+      h1(_"Emerging Chaos...") ..
+      p(_(
+[[Guilt-ridden, the king committed suicide. ]] ..
+[[Without a monarch, the people turned to the clerics, but they had no substantial help to offer. ]] ..
+[[Most accepted their fate while others tried to change the god’s mind by offering animals in his temple. ]] ..
+[[But to no avail...]]
+   )) .. p(_(
+[[Jundlina, the late king’s daughter and the highest priestess of the god was the most determined cleric. ]] ..
+[[As countless offerings didn’t change the situation, she convinced herself that to soothe the god, ]] ..
+[[an offer of great personal value was needed. So she offered him her most beloved: ]] ..
+[[her husband, the father of her only child.]]
+   )) .. p(_(
+[[But not even this changed the mind of the god. The water kept on rising. ]] ..
+[[Nearly driven insane by guilt, pain and anger, Jundlina became a heretic: ]] ..
+[[Secretly, she gathered people of the common folk who were not in line ]] ..
+[[with the decision of the clerics to accept the god’s will. ]] ..
+[[Together with them, she set the temple on fire and stole a ship to flee from the god’s influence over Atlantis. ]] ..
+[[This small group started praying to Satul, the fire god and the worst enemy of Lutas.]]
+   )) .. p(_(
+[[Leaving the dying Atlantis and their past behind, they started on a quest to ]] ..
+[[find a place sheltered by the fire and protected from the sea.]]
+   ))
 )
 },
 } -- end of initial messages.
 
 first_briefing_messages = {
 {
-   title = _ "The princess' memoir",
-   body = jundlina(_ "Jundlina writes down her memories", _
-[[We left Atlantis and sailed east. We entered the forbidden sea on the sixth
-day without noticing any pursuers from Atlantis and without Lutas having smashed
-our ship. Now, we are out of his reach. One day later, we sighted an island
-which seems to have one of these fire spitting mountains on it. I deemed this
-a sign from the fire god and we landed on its shore.]]
-   .. "<br><br>" .. _
-[[We spent the last week building two watchtowers on the mountains close to
-our landing area; and, of course, a hall for us all. We have very talented
-constructors in our group - still, the buildings do not match the art we
-had on Atlantis. I hope they will withstand the next rain. At least, the towers
-will warn us if a ship from Atlantis follows us and if the island is inhabited,
-we will see attackers a long time before they arrive.]]
-   .. "<br><br>" .. _
-[[We have established ourselves on this island. The next step is now to make it
-a home. I reckon we need to establish a sustainable economy and explore our
-surroundings. I called for specialists and will follow their advice.]]
-   )
-},
-{
-   title = _ "Loftomor and Sidolus arrive",
-   body = jundlina( _"Jundlina", _
-[[May Satul warm you both. Loftomor, you have been the island's most renowned
-architect. Sidolus, you are a seasoned warrior and strategist. I have called
-you before me to seek your counsel: What needs to be done to make this our new
-home?]]
-   )
-},
-{
-   title = _ "Loftomor speaks",
-   body = loftomor(_
-[[May Satul warm you, Jundlina! The most important things for building a
-settlement are the building materials. There are some trees here, so we should
-build housings for some woodcutters and of course also for foresters, so
-we do not run out of trees. Oh, and we mustn't forget the sawmill, for most
-buildings can't be made out of trunks alone. Stronger buildings also need
-stone, but there is plenty to the north-east of here; we just need to build a
-quarry and my stonemasons will go to work promptly.]]
-   ) .. new_objectives(obj_ensure_build_wares_production)
-},
-{
-   title = _ "Sidolus speaks",
+   title = _ "The Princess’ Memoir",
+   body = jundlina(_ "Jundlina Writes Down Her Memories", _(
+[[We left Atlantis and sailed east. ]] ..
+[[We entered the forbidden sea on the sixth day without noticing any pursuers from Atlantis ]] ..
+[[and without Lutas having smashed our ship. Now, we are out of his reach. ]] ..
+[[One day later, we sighted an island which seems to have one of these fire spitting mountains on it. ]] ..
+[[I deemed this a sign from the fire god and we landed on its shore.]])
+   .. "<br><br>" .. _(
+[[We spent the last week building two watchtowers on the mountains close to our landing area; ]] ..
+[[and, of course, a hall for us all. We have very talented constructors in our group – still, ]] ..
+[[the buildings do not match the art we had on Atlantis. I hope they will withstand the next rain. ]] ..
+[[At least, the towers will warn us if a ship from Atlantis follows us and if the island is inhabited, ]] ..
+[[we will see attackers a long time before they arrive.]])
+   .. "<br><br>" .. _(
+[[We have established ourselves on this island. The next step is now to make it a home. ]] ..
+[[I reckon we need to establish a sustainable economy and to explore our surroundings. ]] ..
+[[I called for specialists and will follow their advice.]])
+   )
+},
+{
+   title = _ "Loftomor and Sidolus Arrive",
+   body = jundlina( _"Jundlina", _(
+[[May Satul warm you both. Loftomor, you have been the island’s most renowned architect. ]] ..
+[[Sidolus, you are a seasoned warrior and strategist. I have called you before me to seek your counsel: ]] ..
+[[what needs to be done to make this our new home?]]
+   ))
+},
+{
+   title = _ "Loftomor Speaks",
+   body = loftomor(_(
+[[May Satul warm you, Jundlina! ]] ..
+[[The most important things for building a settlement are the building materials. ]] ..
+[[There are some trees here, so we should build housings for some woodcutters and of course also for foresters, ]] ..
+[[so we will not run out of trees. Oh, and we mustn’t forget the sawmill, ]] ..
+[[for most buildings can’t be made out of logs alone. Stronger buildings also need stone, ]] ..
+[[but there is plenty to the north-east of here; ]] ..
+[[we just need to build a quarry, and my stonemasons will go to work promptly.]]
+   )) .. new_objectives(obj_ensure_build_wares_production)
+},
+{
+   title = _ "Sidolus Speaks",
    body = sidolus(_
-[[May Satul warm you, Jundlina! I agree with what Loftomor proposes. We need
-a good supply of building materials for we have to expand our territory swiftly.
-I will not feel safe on this island as long as we have not seen all shores
-on it. I brought plenty of good men from Atlantis. The military might is
-available. We only need some housings to live in.]]
+[[May Satul warm you, Jundlina! I agree with what Loftomor proposes. ]] ..
+[[We need a good supply of building materials for we have to expand our territory swiftly. ]] ..
+[[I will not feel safe on this island as long as we have not seen all its shores it. ]] ..
+[[I brought plenty of good men from Atlantis. The military might is available. ]] ..
+[[We only need some housing to live in.]]
    ) ..  new_objectives(obj_expand)
 }
 }
 
 food_story_message = {
 {
-   title = _ "Jundlina is satisfied",
-   body = jundlina(_"Jundlina's Memoirs", _
-[[Our building infrastructure is done and I spent some days making sure that
-they work well together. Now, there are other pressing matters. I called
-Colionder, my personal cook, before me to get his help with sorting some things
-out.]]
-   )
-},
-{
-   title = _ "Colionder arrives",
-   body = colionder(_
-[[May Satul warm you, Jundlina. Can I be of any service to you or the
-god?]]
-   )
-},
-{
-   title = _ "Jundlina replies",
-   body = jundlina(_"Jundlina", _
-[[May Satul warm you too, Colionder. Yes, I wondered if there is not a way
-that we can centralize our food production. We lose a lot of productivity
-because our people are accustomed to making their own food. I feel if we
-could split responsibilities, it would be better for us all. I want your
-thoughts on this.]]
-   )
-},
-{
-   title = _ "Colionder is in thought",
-   body = colionder(_
-[[Ahh, but I think this is impossible to change. The preparing and eating of
-food is something deeply ingrained in us Atlanteans - it is just a ceremony
-that we need for our well being. So I guess we cannot take this away from
-the individuals completely. But we might find a compromise in between: For me,
-making bread is a troublesome task: grinding the blackroot and corn to flour
-and then baking the bread is tedious and boring: I feel a more industrial
-approach would be helpful here. I for one would love to just have fresh bread
-delivered to my house every day. Oooh and even more important: the smoking of
-fish and meat to cleanse them and improve their taste is terrible.  My house is
-full of smoke and stinks for weeks after it. Don't you think that this could be
-done in a special building were the side effects do not matter?  I think those
-two things would be accepted by the people and would reduce the cooking times
-without taking away the ritual.]]
- )
-},
-{
-   title = _ "Jundlina agrees",
+   title = _ "Jundlina is Satisfied",
+   body = jundlina(_"Jundlina’s Memoirs", _(
+[[Our building infrastructure is finished and I spent some days making sure that everybody is working well together. ]] ..
+[[Now, there are other pressing matters. ]] ..
+[[I called Colionder, my personal cook, before me to get his help with sorting some things out.]]
+   ))
+},
+{
+   title = _ "Colionder Arrives",
+   body = colionder(_
+[[May Satul warm you, Jundlina. Can I be of any service to you or the god?]]
+   )
+},
+{
+   title = _ "Jundlina Replies",
+   body = jundlina(_"Jundlina", _(
+[[May Satul warm you too, Colionder. ]] ..
+[[Yes, I wondered if there is a way that we could centralize our food production. ]] ..
+[[We lose a lot of productivity because our people are accustomed to making their own food. ]] ..
+[[I feel if we could split responsibilities, it would be better for us all. ]] ..
+[[I want your thoughts on this.]]
+   ))
+},
+{
+   title = _ "Colionder is in Thought",
+   body = colionder(p(_(
+[[Ahh, but I think this is impossible to change. ]] ..
+[[The preparing and eating of food is something deeply ingrained in us Atlanteans]] ..
+[[ – it is a ceremony that we just need for our well-being. ]] ..
+[[So I guess we cannot take this away from the individuals completely.]])) .. p(_(
+[[But we might find a compromise in between: for me, making bread is a troublesome task. ]] ..
+[[Grinding the blackroot and corn to flour and then baking the bread is tedious and boring; ]] ..
+[[I feel a more industrial approach would be helpful here. ]] ..
+[[I for one would love to just have fresh bread delivered to my house every day.]])) .. p(_(
+[[Oooh and even more important: the smoking of fish and meat to cleanse them and improve their taste is terrible. ]] ..
+[[My house is full of smoke and stinks for weeks afterwards. ]] ..
+[[Don’t you think that this could be done in a special building were the side effects do not matter? ]] ..
+[[I think those two things would be accepted by the people ]] ..
+[[and would reduce the cooking time without taking away the ritual.]]
+ )))
+},
+{
+   title = _ "Jundlina Agrees",
    body = jundlina(_
 [[Your words sound wise to me, Colionder. So be it then.]]
    ) .. new_objectives(obj_make_food_infrastructure)
@@ -330,135 +324,129 @@
 
 food_story_ended_messages = {
    {
-      title = _ "Jundlina is satisfied",
-      body = jundlina(_ "Jundlina is reviewing the reports", _
-[[Seems like our food production is finished and everybody is working together
-nicely. It is really starting to feel like home here.]]
-      )
+      title = _ "Jundlina is Satisfied",
+      body = jundlina(_ "Jundlina is Reviewing the Reports", _(
+[[Seems like our food production is finished and everybody is working together nicely. ]] ..
+[[It is really starting to feel like home here.]]
+      ))
    }
 }
 
 spidercloth_messages = {
    {
-      title = _"A man comes to Jundlina",
-      body = opol(_
-[[May Satul warm you, Jundlina. My Name is Opol and I am the highest weaver of
-the guild abandoning Atlantis and Lutas with you. I come with sad news indeed:
-We have no more spidercloth. Not a single piece is to be found in our
-warehouses.  Could you not help the weaver guild by arranging the building of a
-weaving-mill and a spiderfarm? The spiders deliver the finest silk and we will
-produce the finest spidercloth from it. We offer to also produce the tabards
-for young soldiers and the golden tabards for officers for you in exchange.
-You will need them for sure as soon as you want to recruit new soldiers.]])
+      title = _"A Man Comes to Jundlina",
+      body = opol(p(_(
+[[May Satul warm you, Jundlina. ]] ..
+[[My Name is Opol, and I am the highest weaver of the guild abandoning Atlantis and Lutas with you. ]] ..
+[[I come with sad news indeed: we have no more spidercloth. Not a single piece is to be found in our warehouses. ]] ..
+[[Could you not help the weavers’ guild by arranging the building of a weaving-mill and a spider farm? ]] ..
+[[The spiders deliver the finest silk and we will produce the finest spidercloth from it.]])) .. p(_(
+[[We offer to also produce the tabards for young soldiers and the golden tabards for officers for you in exchange. ]] ..
+[[You will need them for sure as soon as you want to recruit new soldiers.]])))
  },
  {
-    title = _ "Jundlina replies",
-    body = jundlina(_ "Jundlina replies", _
-[[May Satul warm you too, Opol. I wanted to delay production of spider cloth,
-but I understand your urgency. Your suggestion sounds fair to me, I will build
-your weaving-mill and spiderfarm. I will also build a goldweaver so that the
-golden tabards you make will not be golden by name alone.]]
-    ) ..  new_objectives(obj_spidercloth_production)
+    title = _ "Jundlina Replies",
+    body = jundlina(_ "Jundlina Replies", _(
+[[May Satul warm you too, Opol. I wanted to delay production of spidercloth, but I understand your urgency. ]] ..
+[[Your suggestion sounds fair to me, I will build your weaving-mill and spider farm. ]] ..
+[[I will also build a goldweaver so that the golden tabards you make will not be golden by name alone.]]
+    )) ..  new_objectives(obj_spidercloth_production)
  }
 }
 
 spidercloth_story_ended_messages = {
    {
-      title = _ "Opol seeks out Jundlina",
-      body = opol(_
-[[May Satul warm you, Jundlina!. The weaving-mill, goldweaver and spiderfarm
-buildings are complete and are starting their work at this very moment. The
-weaving guild is very grateful for your support and we will stand by our word
-and deliver the first tabard very soon.]]
-      )
+      title = _ "Opol Seeks Out Jundlina",
+      body = opol(_(
+[[May Satul warm you, Jundlina! ]] ..
+[[The weaving-mill, goldweaver and spider farm buildings are complete ]] ..
+[[and are starting their work at this very moment. The weavers’ guild is very grateful for your support ]] ..
+[[and we will stand by our word and deliver the first tabard very soon.]]
+      ))
    },
    {
-      title = _ "Jundlina replies",
-      body = jundlina(_
-[[This is good news indeed, Opol. Our economy is developing very well. Go back
-to your work now, Opol, and may Satul warm you and all your guild members!]]
-      )
+      title = _ "Jundlina Replies",
+      body = jundlina(_(
+[[This is good news indeed, Opol. Our economy is developing very well. ]] ..
+[[Go back to your work now, Opol, and may Satul warm you and all your guild members!]]
+      ))
    }
 }
 
 
 heavy_industry_story = {
    {
-      title = _ "Sidolus seeks out Jundlina",
-      body = sidolus(_
-[[May Satul warm you, Jundlina. Have you considered mining for goods in the
-mountains around us? We are running short of quartz, crystal and diamonds for
-our buildings. Also we could use more iron, gold and especially coal. If we
-find an ample supply of those commodities, we could start producing weapons
-and tools; this would help enormously. Of course, we would need smelters,
-a weapon smithy, an armor smithy and a tool smithy. And maybe even more.]]
-      )
+      title = _ "Sidolus Seeks Out Jundlina",
+      body = sidolus(_(
+[[May Satul warm you, Jundlina. Have you considered mining for resources in the mountains around us? ]] ..
+[[We are running short of quartz, crystal and diamonds for our buildings. ]] ..
+[[Also we could use more iron, gold and especially coal. If we find an ample supply of those commodities, ]] ..
+[[we could start producing weapons and tools; this would help enormously. ]] ..
+[[Of course, we would need smelters, a weapon smithy, an armor smithy and a toolsmithy. And maybe even more.]]
+      ))
    },
    {
-      title = _ "Jundlina replies",
-      body = jundlina(_"Jundlina nods", _
-[[I have considered this, Sidolus. I think, it is about time. We will make this
-a priority for now. You shall get your industry and soon!]]
-      ) .. new_objectives(obj_make_heavy_industry_and_mining)
+      title = _ "Jundlina Replies",
+      body = jundlina(_"Jundlina Nods", _(
+[[I have considered this, Sidolus. I think, it is about time. We will make this a priority for now. ]] ..
+[[You shall get your industry and soon!]]
+      )) .. new_objectives(obj_make_heavy_industry_and_mining)
    },
 }
 
 training_story = {
    {
-      title = _ "Jundlina summons Sidolus",
-      body = jundlina(_ "Jundlina is angry", _
-[[What is this I hear, Sidolus? I received words about your soldiers
-misbehaving and bullying the common folk. What is this nonsense all about? They
-are servants for the common good and must not misuse their powers. This is
-inexcusable! Explain this, if you will!]]
-      )
-   },
-   {
-      title = _ "Sidolus seems contrite",
-      body = sidolus(_
-[[I agree with you and I have punished the trouble makers severely. But it is
-very difficult to keep my men quiet: they are bored and have nothing to do. I
-would like to ramp up their drill. I think more routine in their life would
-keep them occupied and focused on their duties. I would need a dungeon and a
-labyrinth for them.  I have the plans ready, but I guess they won't come
-cheap.]]
-      )
-   },
-   {
-      title = _"Jundlina replies",
-      body = jundlina(_
-[[I do not fear the cost and labor as long as it keeps your people at bay. You
-shall get your buildings. But note that I will not tolerate any rogue soldier;
-if similar things happen again, I will make you responsible for them.
-Dismissed.]]
-      ) .. new_objectives(obj_make_training_buildings)
+      title = _ "Jundlina Summons Sidolus",
+      body = jundlina(_ "Jundlina is Angry", _(
+[[What is this I hear, Sidolus? I received words about your soldiers misbehaving and bullying the common folk. ]] ..
+[[What is this nonsense all about? They are servants for the common good and must not misuse their powers. ]] ..
+[[This is inexcusable! Explain this, if you will!]]
+      ))
+   },
+   {
+      title = _ "Sidolus Seems Contrite",
+      body = sidolus(_(
+[[I agree with you and I have punished the troublemakers severely. ]] ..
+[[But it is very difficult to keep my men quiet: they are bored and have nothing to do. ]] ..
+[[I would like to ramp up their drill. ]] ..
+[[I think more routine in their life would keep them occupied and focused on their duties. ]] ..
+[[I would need a dungeon and a labyrinth for them. ]] ..
+[[I have the plans ready, but I guess they won’t come cheap.]]
+      ))
+   },
+   {
+      title = _"Jundlina Replies",
+      body = jundlina(_(
+[[I do not fear the cost and labor as long as it keeps your people at bay. You shall get your buildings. ]] ..
+[[But note that I will not tolerate any rogue soldier; if similar things happen again, ]] ..
+[[I will make you responsible for them. Dismissed.]]
+      )) .. new_objectives(obj_make_training_buildings)
    }
 }
 
 training_story_end = {
    {
-      title = _ "Jundlina received a letter",
-      body = jundlina(_"Jundlina", _
-[[I received an invitation from Sidolus. The first day of training in the newly
-finished labyrinth will be tomorrow. The dungeon is done as well and will start
-its work soon. I am looking forward to tomorrow; I am very interested in how our
-soldiers are trained and I wonder if the additional workload will keep them from
-bullying the civil population.]]
-      )
+      title = _ "Jundlina Received a Letter",
+      body = jundlina(_"Jundlina", _(
+[[I received an invitation from Sidolus. The first day of training in the newly finished labyrinth will be tomorrow. ]] ..
+[[The dungeon is done as well and will start its work soon. I am looking forward to tomorrow; ]] ..
+[[I am very interested in how our soldiers are trained, and I wonder if the additional workload ]] ..
+[[will keep them from bullying the civil population.]]
+      ))
    }
 }
 
 horsefarm_and_warehouse_story = {
    {
-      title = _ "Jundlina considers the economy",
-      body = jundlina(_"Jundlina", _
-[[People are complaining about crowded streets and slow transportation. We
-need to help out our carriers on the roads. I decided to build a horsefarm
-so that the horses can help with the heavy wares.<br>
-Another way to take load from our roads is to build warehouses. We have claimed
-the mountain now, it seems a good idea to have a warehouse on the plateau to
-avoid having to transport everything up and down the slopes.]]
-      ) .. new_objectives(obj_horsefarm_and_warehouse)
+      title = _ "Jundlina Considers the Economy",
+      body = jundlina(_"Jundlina", p(_(
+[[People are complaining about crowded streets and slow transportation. ]] ..
+[[We need to help out our carriers on the roads. ]] ..
+[[I have decided to build a horse farm so that the horses can help with the heavy wares.]])) .. p(_(
+[[Another way to take load from our roads is to build warehouses. ]] ..
+[[We have claimed the mountain now, it seems a good idea to have a warehouse on the plateau ]] ..
+[[to avoid having to transport everything up and down the slopes.]]
+      ))) .. new_objectives(obj_horsefarm_and_warehouse)
    }
 }
 
@@ -469,21 +457,19 @@
 {
    posx = 100000,
    posy = 0,
-   title = _ "A dangerous finding",
-   body = jundlina(_ "Jundlina is in thought", _
-[[We found an old building, destroyed and burned by flames. I am very worried
-about this finding. The building is not of any kind I've ever seen. It is
-certainly not designed by any Atlantean architect I've ever heard about. The
-building is crude, the assemblage is sloppy. But the materials are very
-enduring: the wood used for it seemed to have been burned in a strange way
-before it was used as building material - it is hard as stone.<br><br>
-The implications frighten me. Are there others on this island? Where are they
-then? They work with fire, are they praying to Satul too? Are they friends or
-foe? And why is the building burned down? Has this island seen war? Is a
-war being waged on it right now?<br><br>
-We must improve our military capabilities. If there are foes on the island, we
-have to be prepared when we meet them. We should also enforce the fortification
-of our borders.]]
+   title = _ "A Dangerous Discovery",
+   body = jundlina(_ "Jundlina is in Thought", p(_(
+[[We found an old building, destroyed and burned by flames. I am very worried about this discovery. ]] ..
+[[The building is not of any kind I’ve ever seen. ]] ..
+[[It is certainly not designed by any Atlantean architect I’ve ever heard about. ]] ..
+[[The building is crude, the assemblage is sloppy. But the materials are very enduring: ]] ..
+[[the wood used for it seemed to have been burned in a strange way before it was used as building material]] ..
+[[ – it is hard as stone.]])) .. p(_(
+[[The implications frighten me. Are there others on this island? Where are they then? ]] ..
+[[They work with fire, are they praying to Satul too? Are they friends or foe? ]] ..
+[[And why is the building burned down? Has this island seen war? Is a war being waged on it right now?]])) .. p(_(
+[[We must improve our military capabilities. If there are foes on the island, we have to be prepared when we meet them. ]] ..
+[[We should also enforce the fortification of our borders.]]))
    )
 }
 }
@@ -492,14 +478,13 @@
 {
    posx = 100000,
    posy = 0,
-   title = _ "Another building.",
-   body = jundlina(_ "Jundlina is worried", _
-[[We found one more building of this strange making. We have yet to see any of
-its builders. But obviously there has been a community on this island before
-and obviously it has been militarized. I have to check on our military status
-with my generals. I will not allow that a potential enemy will find us
-unprepared.]]
-   )
+   title = _ "Another Building",
+   body = jundlina(_ "Jundlina is Worried", _(
+[[We found one more building of this strange making. We have yet to see any of its builders. ]] ..
+[[But obviously there has been a community on this island before and obviously it was militarized. ]] ..
+[[I have to check on our military status with my generals. ]] ..
+[[I will not allow that a potential enemy will find us unprepared.]]
+   ))
 }
 }
 
@@ -507,15 +492,15 @@
 {
    posx = 100000,
    posy = 0,
-   title = _ "One more building",
-   body = jundlina(_
-[[And yet another of these buildings. We know now that the tribe that built
-them once had complete control over the island. But I am no longer so scared of
-potential enemies. We know so much of this island already and there is no trace
-of this old economy to be found. I am starting to relax, but I will not let
-our guard down as we continue to explore this beautiful island. But without
-obvious dangers I am feeling very much at home here already.]]
-   )
+   title = _ "One More Building",
+   body = jundlina(_(
+[[And yet another of these buildings. ]] ..
+[[We know now that the tribe that built them once had complete control over the island. ]] ..
+[[But I am no longer so scared of potential enemies. ]] ..
+[[We know so much of this island already and there is no trace of this old economy to be found. ]] ..
+[[I am starting to relax, but I will not let our guard down as we continue to explore this beautiful island. ]] ..
+[[But without obvious dangers, I am feeling very much at home here already.]]
+   ))
 }
 }
 
@@ -526,74 +511,69 @@
 {
    posx = 100000,
    posy = 0,
-   title = _ "The water is rising!",
-   body = jundlina(_"Jundlina", _
-[[May Satul save us! Lutas is still trying to get to us. A scout informed me
-that the ocean is rising quickly. We have to reach higher ground and evacuate
-everybody and as much wares from the headquarters up the mountains. How can we
-escape?]]
-   )
-},
-{
-   title = _ "A young man approaches",
-   body = ostur(_
-[[May Satul warm you, Jundlina. My name is Ostur and I construct ships. I have
-invented a new kind of ship: smaller than those we are used to, but much
-sturdier. If we build them correctly, I am confident that we can go with them
-a much longer distance and maybe escape from Lutas' influence.]]
- )
-},
-{
-   title = _ "Jundlina replies",
-   body = jundlina(_ "Jundlina", _
-[[Ostur, we have no time. The water rises too fast and if we build the ships on
-shore they will vanish in the sea before they can float. I fear we are doomed!]]
-   ),
+   title = _ "The Water is Rising!",
+   body = jundlina(_"Jundlina", _(
+[[May Satul save us! Lutas is still trying to get to us. A scout informed me that the ocean is rising quickly. ]] ..
+[[We have to reach higher ground and evacuate everybody and as much wares as we can ]] ..
+[[from the headquarters up the mountains. How can we escape?]]
+   ))
+},
+{
+   title = _ "A Young Man Approaches",
+   body = ostur(_(
+[[May Satul warm you, Jundlina. My name is Ostur and I construct ships. ]] ..
+[[I have invented a new kind of ship: smaller than those we are used to, but much sturdier. ]] ..
+[[If we build them correctly, I am confident that we can sail a much longer distance with them ]] ..
+[[and maybe escape from Lutas’ influence.]]
+ ))
+},
+{
+   title = _ "Jundlina Replies",
+   body = jundlina(_ "Jundlina", _(
+[[Ostur, we have no time. The water rises too fast, and if we build the ships on the shore ]] ..
+[[they will vanish in the sea before they can float. I fear we are doomed!]]
+   )),
 },
 {
    posx = 100000,
    posy = 0,
-   title = _"Ostur seems confident",
+   title = _"Ostur Seems Confident",
    pre_func = function()
       local lake_field = map:get_field(75,80)
       p1:reveal_fields(lake_field:region(10))
       scroll_smoothly_to(lake_field)
       sleep(200)
    end,
-   body = ostur(_
-[[A friend of mine explored the island on his own and he told me of a big lake
-at the top of the mountain. I suggest we build the ships in this lake and wait
-until the island drowns beneath us. Then we can sail away. It is a bold plan,
-but I think, it could work.]]
-   )
+   body = ostur(_(
+[[A friend of mine explored the island on his own and he told me of a big lake at the top of the mountain. ]] ..
+[[I suggest we build the ships in this lake and wait until the island drowns beneath us. Then we can sail away. ]] ..
+[[It is a bold plan, but I think it could work.]]
+   ))
 },
 {
-   title = _ "Jundlina replies",
-   body = jundlina(_
-[[Your red hair is a signal from the fire god. I will trust you and support your
-plan. Our survival lays in your hands now, Ostur.
-<br><br>Swift now, we need a house for Ostur next to the lake and we need
-planks, trunks and spidercloth for the construction there. Forget about
-everything else, we need those wares on top of the mountain before our
-warehouses are all swallowed by the sea.]]
-   ) .. new_objectives(obj_build_ships)
+   title = _ "Jundlina Replies",
+   body = jundlina(p(_(
+[[Your red hair is a signal from the fire god. I will trust you and support your plan. ]] ..
+[[Our survival lies in your hands now, Ostur.]])) .. p(_(
+[[Swift now, we need a house for Ostur next to the lake, and we need planks, logs and spidercloth ]] ..
+[[for the construction there. Forget about everything else, ]] ..
+[[we need those wares on top of the mountain before our warehouses are all swallowed by the sea.]]
+   ))) .. new_objectives(obj_build_ships)
 }
 }
 
 scenario_won = {
    {
-      title = _ "Jundlina is relieved",
-      body = jundlina(_"Jundlina", _
-[[Praise Satul! Ostur, the young ship builder did it. We have three ships -
-never have I seen sturdier ones - with enough room to carry all of us and some
-wares too. And this rescue came just in time: Lutas is about to swallow the rest
-of this island, the water rises faster by the hour. But we can make our escape
-now and start over in some country farther away... I expect a long journey, but
-we will find the land of Satul in the end. This is what I promised my people.
-And myself.]]
-      ) .. rt(h1(_ "Congratulations") .. p(_
-[[You have won this mission. Continue with the next one or keep playing for
-as long as you like.]]
+      title = _ "Jundlina is Relieved",
+      body = jundlina(_"Jundlina", _(
+[[Praise Satul! Ostur, the young ship builder did it. ]] ..
+[[We have three ships – never have I seen sturdier ones – with enough room to carry all of us and some wares too. ]] ..
+[[And this rescue came just in time: Lutas is about to swallow the rest of this island, ]] ..
+[[the water rises faster by the hour. But we can make our escape now and start over in some country farther away... ]] ..
+[[I expect a long journey, but we will find the land of Satul in the end. ]] ..
+[[This is what I promised my people. And myself.]]
+      )) .. rt("<p font-size=10> <br></p>" .. h1(_ "Congratulations") .. p(_
+[[You have won this mission. Continue with the next one or keep playing for as long as you like.]]
       )),
    },
 }
 
=== modified file 'campaigns/cconfig'
--- campaigns/cconfig	2011-10-03 11:44:28 +0000
+++ campaigns/cconfig	2014-03-05 18:47:45 +0000
@@ -24,25 +24,25 @@
 [global]
 version = 6
 # Barbarians Introduction
-campname0=_"Barbarians - The second Empire"
+campname0=_"Barbarians – The Second Empire"
 campsect0=barbariantut
 campdiff0=1
 campdiffdescr0=_"Easy. Introduces the Barbarians"
-campdesc0=_"When Chat’Karuth died, he was an old man, father to three strong and ambitious sons and warlord to an army that could match any enemy willing to rise against the ancient forests. Though at the end of his glorious reign, Chat’Karuth left his eldest son, Thron, to succeed him as the tribe's warlord – a decision that left his two brothers unsatisfied. The old warlord knew that. As his father instructed him, Thron left the capital of Al’thunran, the home of the Throne Among the Trees and withdrew his forces to the high hills where he buried the corpse of his father. There he swore to the gods and his father's spirit that he’d return to re-established order. While his brothers raged in blind war against Thron and the few forces he left to secure the borders of Al’thunran, the young warlord seeks to reunite his ambitious brothers and force the tribes to march once again under a common banner."
+campdesc0=_"When Chat’Karuth died, he was an old man, father to three strong and ambitious sons, and warlord to an army that could match any enemy willing to rise against the ancient forests. Though at the end of his glorious reign, Chat’Karuth chose his eldest son, Thron, to succeed him as the tribe’s warlord – a decision that left his two brothers unsatisfied. The old warlord knew that. As his father instructed him, Thron left the capital of Al’thunran, the home of the Throne Among the Trees, and withdrew his forces to the high hills where he buried the corpse of his father. There he swore to the gods and his father’s spirit that he’d return to re-established order. While his brothers have raged blind war against Thron and the few forces he left to secure the borders of Al’thunran, the young warlord seeks to reunite his ambitious brothers and force the tribes to march once again under a common banner."
 campvisi0=1
 # Empire Introduction
-campname1=_"Empire - The Months of Exile"
+campname1=_"Empire – The Months of Exile"
 campsect1=empiretut
 campdiff1=1
 campdiffdescr1=_"Easy. Introduces the Empire"
-campdesc1=_"Six months ago, Lutius - a young general of the Empire - was sent with 150 soldiers to the frontier beyond the northern forests where Barbarian tribes were crossing onto land held by the Empire. His task was to defend the Empire's land. At first, everything was calm. He even talked to a few barbarian children and thought about a peaceful life - side by side with this archaic folk. He began to feel safer and his army began to drop their attention off the potential enemy. That was their undoing. One night in March his unprepared army was attacked by 100 barbarian footmen and was completely scattered. Only with his bare life he and a handful of his soldiers survived."
+campdesc1=_"Six months ago, Lutius – a young general of the Empire – was sent with 150 soldiers to the frontier beyond the northern forests where Barbarian tribes were crossing onto land held by the Empire. His task was to defend the Empire’s land. At first, everything was calm. He even talked to a few barbarian children and thought about a peaceful life – side by side with this archaic folk. He began to feel safer and his army began to drop their attention off the potential enemy. That was their undoing. One night in March his unprepared army was attacked by 100 barbarian footmen and was completely scattered. Only with his bare life he and a handful of his soldiers survived."
 campvisi1=0
 # Atlantean Introduction
-campname2=_"Atlanteans - The Run for the Fire"
+campname2=_"Atlanteans – The Run for the Fire"
 campsect2=atlanteans
 campdiff2=2
 campdiffdescr2=_"Challenging. Introduces the Atlanteans"
-campdesc2=_"When the God lost faith in the Atlanteans and drowned their island, one woman's struggle for justice and a second chance for her people would become the stuff of legends. Leading the remaining Atlanteans into a new future in a new part of the World, Jundlina became the most powerful human of her time, but at a high cost: her humanity and soul."
+campdesc2=_"When their God lost faith in the Atlanteans and drowned their island, one woman’s struggle for justice and a second chance for her people would become the stuff of legends. Leading the remaining Atlanteans into a new future in a new part of the World, Jundlina became the most powerful human of her time, but at a high cost: her humanity and soul."
 campvisi2=0
 cnewvisi2=empiretut01
 
@@ -61,29 +61,29 @@
 #####
 
 [barbariantut00]
-name=_"01 - Eyes in the Dark"
+name=_"01 – Eyes in the Dark"
 visible=1
 path="campaigns/t01.wmf"
 
 [barbariantut01]
-name=_"02 - A Place to call Home"
+name=_"02 – A Place to Call Home"
 visible=0
 path="campaigns/t02.wmf"
 
 [barbariantut02]
-name=_"03 - This Land is our Land"
+name=_"03 – This Land is Our Land"
 newvisi="campsect1"
 visible=0
 path="campaigns/t03.wmf"
 
 
 [empiretut00]
-name=_"01 - The Strands of Malac' Mor"
+name=_"01 – The Strands of Malac’ Mor"
 visible=1
 path="campaigns/emp01.wmf"
 
 [empiretut01]
-name=_"02 - An Outpost for Exile"
+name=_"02 – An Outpost for Exile"
 visible=0
 path="campaigns/emp02.wmf"
 
@@ -95,7 +95,7 @@
 
 
 [atlanteans00]
-name=_"01 - From Nemesis to Genesis"
+name=_"01 – From Nemesis to Genesis"
 visible=1
 path="campaigns/atl01.wmf"
 
 
=== modified file 'campaigns/emp01.wmf/elemental'
--- campaigns/emp01.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/emp01.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -4,7 +4,7 @@
 map_h=64
 nr_players=1
 world=desert
-name=_"01 - The Strands of Malac' Mor"
+name=_"01 – The Strands of Malac’ Mor"
 author=Nasenbaer
-descr=_"After losing an important battle against the barbarians which lead to the loss of a big part of the Empire's territory, Lutius leaves Fremil to start a new life. But his destiny takes his ship into a heavy storm, which nearly destroys it. Only with a lot of luck he manages to beach his damaged ship on an unknown desert strand and save his people. For now."
+descr=_"After losing an important battle against the barbarians which lead to the loss of a big part of the Empire’s territory, Lutius leaves Fremil to start a new life. But his destiny takes his ship into a heavy storm, which nearly destroys it. Only with a lot of luck he manages to beach his damaged ship on an unknown desert strand and save his people. For now."
 background="tribes/empire/pics/campmap-emp01.jpg"
 
=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -1,181 +1,232 @@
+-- =========================
+-- Some formating functions
+-- =========================
+
+use("aux", "formatting")
+use("aux", "format_scenario")
+
+function lutius(title, text)
+   return speech("map:Lutius.png", "2F9131", title, text)
+end
+function saledus(title, text)
+   return speech("map:Saledus.png", "8F9131", title, text)
+end
+function amalea(title, text)
+   return speech("map:Amalea.png", "AF7511", title, text)
+end
+
 -- =======================================================================
 --                           Texts - No logic here
 -- =======================================================================
 
 
+-- ===========
+-- objectives
+-- ===========
+obj_build_barracks = {
+   name = "build_barracks",
+   title=_"Build a barracks",
+   number = 1,
+   body = objective_text(_"Barracks", 
+[[• ]] .. _[[Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]]),
+}
+
+obj_build_lumberjack = {
+   name = "build_lumberjack",
+   title=_"Build a lumberjack’s house",
+   number = 1,
+   body = objective_text(_"Lumberjack’s House", 
+[[• ]] .. _[[Build a lumberjack’s house at the red house symbol, south of your provisional headquarters.]] .. "<br><br>" ..
+[[→ ]] .. _([[Cutting down enough trees for more buildings will take a while. ]] ..
+[[You can speed the game up by using PAGE UP and slow it down again with PAGE DOWN.]])),
+}
+
+obj_build_sawmill_and_lumberjacks = {
+   name = "build_sawmill_and_lumberjacks",
+   title=_"Build 2 lumberjack’s houses and a sawmill",
+   number = 3,
+   body = objective_text(_"Two Lumberjack’s Houses and a Sawmill", 
+[[• ]] .. _[[Build two more lumberjack’s houses and a sawmill as soon as there is enough space for them.]]),
+}
+
+obj_build_forester = {
+   name = "build_forester",
+   title=_"Build a forester’s house",
+   number = 1,
+   body = objective_text(_"Forester’s House", 
+[[• ]] .. _[[Build a forester’s house to preserve the wood resources of this island.]]),
+}
+
+obj_build_quarry = {
+   name = "build_quarry",
+   title=_"Build a quarry",
+   number = 5,
+   body = objective_text(_"Quarry", 
+[[• ]] .. _[[Build a quarry in the south to cut some stones and marble out of the rocks.]] .. "<br><br>" ..
+[[→ ]] .. _[[These might be used for future buildings.]]),
+}
+
+
+
 -- ==================
 -- Texts to the user
 -- ==================
 diary_page_1 = {
-   title =_ "A dark night",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-   _"Diary of Lutius" ..
-   "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "What has become of our Empire? I really ask this question - why did my king forbid me from fighting against that monsterous barbarian tribe, who first acted as a peaceful friend and then attacked my army in the darkest night?<br> With an army of 150 men, I was assigned to patrol on our northern frontier, which lies near the Galdin Mountains in a great, beautiful and ancient forest. Soon, we met a barbarian tribe, which at first was friendly. A few of my men even traded with them and their kids came to us, to admire our clean and tidy uniforms and weapons.<br> But in our fifth night in that region, they attacked us with no reason. I lost dozens of good men, and found myself imprisoned and brought to their chieftain. He spat at me, mocked me and told me to leave this land forever. He did not want new land and did not want our land, but he told me that THIS forest was their land - and would stay theirs until the ghosts take the last man of his folk!<br> Three weeks later, I came back to Fremil to speak with our king. He was furious at the Barbarians, yet disallowed an attack of these tribes. He believed that our army was too weak to survive in a war against the barbarians.<br> Still, I saw no way that I could erase my shame - without fighting against the Barbarians. So I left Fremil by boat to find myself a new world, and a new life, somewhere in the south. Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors." ]] ..
-   "</p></rt>",
+   title =_ "A Dark Night",
+   body=lutius(_"Diary of Lutius",
+   _([[What has become of our Empire? I really ask this question – why did my king forbid me ]] ..
+[[from fighting against that monstrous barbarian tribe, who first acted as a peaceful friend ]] ..
+[[and then attacked my army in the darkest night?]]) .. "<br><br>" ..
+_([[With an army of 150 men, I was assigned to patrol on our northern frontier, ]] ..
+[[which lies near the Galdin Mountains in a great, beautiful and ancient forest. ]] ..
+[[Soon, we met a barbarian tribe, which at first was friendly. A few of my men even traded with them ]] ..
+[[and their kids came to us, to admire our clean and tidy uniforms and weapons.]]) .. "<br><br>" ..
+_([[But during our fifth night in that region, they attacked us with no reason. ]] ..
+[[I lost dozens of good men, and found myself imprisoned and brought to their chieftain. ]] ..
+[[He spat at me, mocked me and told me to leave this land forever. ]] ..
+[[He did not want new land and did not want our land, but he told me that THIS forest was their land]] ..
+[[ – and it would stay theirs until the ghosts took the last man of his folk!]]) .. "<br><br>" ..
+_([[Three weeks later, I returned to Fremil to speak with our king. ]] ..
+[[He was furious at the Barbarians, yet forbade any attack on these tribes. ]] ..
+[[He believed that our army was too weak to survive in a war against the barbarians.]]) .. "<br><br>" ..
+_([[Still, I saw no way that I could erase my shame without fighting against these barbarians. ]] ..
+[[So, I left Fremil by boat to find a new world and a new life for myself, somewhere in the south. ]] ..
+[[Now I am sailing on the perl-gulf with my family, some of my friends and a few of my best warriors.]])),
    w=500,
    posy=1,
 }
 
 diary_page_2 = {
-   title=_"The rough sea",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-   _"Diary of Lutius" ..
-   "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "It seems as if sailing on the perl-gulf was one of our biggest mistakes. Nature was against us and drove us into a dark, wild storm. I really don't know how many hours have passed since the waves rose higher than our boat, but still it would be suicide to go outside.<br> Our ship is badly damaged and is taking in more and more water. We can thank the Gods if we survive this black night with our lives." ]] ..
-   "</p></rt>",
+   title=_"The Rough Sea",
+   body= lutius(_"Diary of Lutius",
+   _([[It seems as if sailing on the perl-gulf was one of our biggest mistakes. ]] ..
+[[Nature was against us and drove us into a dark, wild storm. ]] ..
+[[I really don’t know how many hours have passed since the waves rose higher than our boat, ]] ..
+[[but still it would be suicide to go outside.]]) .. "<br><br>" ..
+_([[Our ship is badly damaged and is taking in more and more water. ]] ..
+[[We can thank the Gods if we survive this black night with our lives.]])),
    w=400,
    posy=1,
 }
 
 diary_page_3 = {
    title=_"Survivor",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-   _"Diary of Lutius" ..
-   "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Finally, the Gods were with us!<br> We landed on an unknown coast and found peaceful rest under the palm trees growing at the shore. But that is about as good as it gets. The truth is:<br> when I woke up this morning, I saw nothing more than sand around us.<br> It really seems as if we landed under the only palm trees existing in this far-away sandy desert. I fear we won't find the help we need to get our ship repaired in good time." ]] ..
-   "</p></rt>",
+   body= lutius(_"Diary of Lutius",
+   _([[Finally, the Gods were with us!]]) .. "<br><br>" ..
+_([[We landed on an unknown coast and found peaceful rest under the palm trees growing at the shore. ]] ..
+[[But that is about as good as it gets. The truth is: when I woke up this morning, I saw nothing but sand around us.]]) ..
+"<br><br>" ..
+_([[It really seems as if we have landed under the only palm trees existing in this far-away sandy desert. ]] ..
+[[I fear we won’t find the help we need to get our ship repaired in good time.]])),
    w=400,
    posy=1,
 }
 
 saledus_1 = {
-   title=_"A foreboding",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-   _"Saledus looks around nervously..." ..
-   "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Sire, I fear we are not safe in this foreign land. Who knows what terrible creatures live beyond this forest, in that mighty desert? What if these creatures enter the woods and await the time to attack us?<br> Well, perhaps my fear is misguided, but it can't be wrong to keep watch in the forests - so that we can be sure to see any potential enemies before they can see us.<br> We really should build a barracks in the eastern portion of the forest. Then one of us can keep watch in the darkness and keep us safe from these creatures."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _"* Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters." ..
-   "</p></rt>",
+   title=_"A Foreboding",
+   body= saledus(_"Saledus looks around nervously...",
+   _([[Sire, I fear we are not safe in this foreign land. ]] ..
+[[Who knows what terrible creatures live beyond this forest, in that mighty desert? ]] ..
+[[What if these creatures enter the woods and await the time to attack us?]]) .. "<br><br>" ..
+_([[Well, perhaps my fear is misguided, but it can’t be wrong to keep watch in the forests]] ..
+[[ – so that we can be sure to see any potential enemies before they can see us.]]) .. "<br><br>" ..
+_([[We really should build a barracks in the eastern portion of the forest. ]] ..
+[[Then one of us can keep watch in the darkness and keep us safe from these creatures.]]))
+.. new_objectives(obj_build_barracks),
    w=400,
 }
 
 
 saledus_2 = {
-   title=_"Safe for now",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-   _"Saledus speaks with a sigh of relief..." ..
-   "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Sire, I saw that the construction of the barracks was complete, so I assigned one of my best soldiers to it to keep watch on the desert.<br> This is a good step forward. Now we can feel a bit safer and can look forward to repair our ship." ]] ..
-   "</p></rt>",
+   title=_"Safe For Now",
+   body= saledus(_"Saledus speaks with a sigh of relief...",
+   _([[Sire, I saw that the construction of the barracks was completed, ]] ..
+[[so I have assigned one of my best soldiers to it to keep watch on the desert.]]) .. "<br><br>" ..
+_([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
    w=400,
 }
+
 amalea_1 = {
    title=_"Young Amalea",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=AF7511>" ..
-   _"Amalea smiles..." ..
-   "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey Lutius, I just met Saledus outside.<br> He told me about the barracks. Well, I am not one of those girls who think we need more barracks - instead, we might concentrate on other things now.<br> It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday and found a nice place for a lumberjack's house, south of our provisional headquarters."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _(
-   "* Build a lumberjack's house at the red house symbol, south of your provisional headquarters. " ..
-   "Cutting down enough trees for more buildings will take a while. You can " ..
-   "speed the game up using PAGE UP and slow it down again with PAGE DOWN."
-   ) .. 
-
-   "</p></rt>",
+   body= amalea(_"Amalea smiles...",
+   _([[Hey Lutius, I just met Saledus outside.]]) .. "<br><br>" ..
+_([[He told me about the barracks. Well, I am not one of those girls who think we need more barracks]] ..
+[[ – instead, we might concentrate on other things now.]]) .. "<br><br>" ..
+_([[It is absolutely clear that we need wood to repair our ship. ]] ..
+[[So, I walked through the forest yesterday and found a nice place for a lumberjack’s house, ]] ..
+[[south of our provisional headquarters.]]))
+.. new_objectives(obj_build_lumberjack),
    w=400,
 }
 
 amalea_2 = {
    title=_"Young Amalea",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=AF7511>" ..
-   _"Amalea recommends..." ..
-   "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey Lutius, I got the message that our first lumberjack started his work today. Perhaps it would be a good idea to wait until he cleans enough space for building up two further lumberjack's houses, so that we can harvest the trunks faster.<br> But unfortunately the trunks are useless for repairing our ship - we need refined lumber, like every ship and every bigger building needs, too. So we should build up a sawmill - as soon as we have enough space for this."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _"* Build two more lumberjack's houses and a sawmill as soon as there is enough space for them." ..
-   "</p></rt>",
+   body= amalea(_"Amalea recommends...",
+   _([[Hey Lutius, I got the message that our first lumberjack has started his work today. ]] ..
+[[Perhaps it would be a good idea to wait until he cleans enough space for constructing two more lumberjack’s houses, ]] ..
+[[so that we can harvest the logs faster.]]) .. "<br><br>" ..
+_([[But unfortunately the logs are useless for repairing our ship – we need refined lumber, ]] ..
+[[like every ship and every bigger building needs, too. ]] ..
+[[So we should build a sawmill – as soon as we have enough space for this.]]))
+.. new_objectives(obj_build_sawmill_and_lumberjacks),
    w=400,
 }
 
 amalea_3 = {
    title=_"Young Amalea",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=AF7511>" ..
-   _"Amalea comes in..." ..
-   "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hi Lutius, I've got two important things to talk about... First the good news:<br> I saw that the construction of the sawmill is complete, so we can begin to refine the trunks that the lumberjacks are harvesting into lumber.<br> But that's just about the only positive thing I know to talk about. The bad news is that our lumberjacks harvest at an unbelievable speed. There are almost no trees left on this island.<br> Lutius, these trees provide shelter from the sandstorms from the desert, shade on the hot days and they are the home of so many gentle animals. We shouldn't leave this island a complete desert.<br> Lutius, I beg you: find someone who takes care about planting new trees."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _"* Build a forester's house to preserve the wood resources of this island." ..
-   "</p></rt>",
+   body= amalea(_"Amalea comes in...",
+   _([[Hi Lutius, I’ve got two important things to talk about... First the good news:]]) .. "<br><br>" ..
+_([[I noticed that the construction of the sawmill is complete, ]] ..
+[[so we can begin to refine the logs that the lumberjacks are harvesting into lumber.]]) .. "<br><br>" ..
+_([[But that’s just about the only positive thing I know to talk about. ]] ..
+[[The bad news is that our lumberjacks harvest at an incredible speed. ]] ..
+[[There are almost no trees left on this island.]]) .. "<br><br>" ..
+_([[Lutius, these trees provide shelter from the sandstorms that sweep in from the desert ]] ..
+[[and shade on the hot days, and they are the home of so many gentle animals. ]] ..
+[[We shouldn’t leave this island a complete desert.]]) .. "<br><br>" ..
+_([[Lutius, I beg you: find someone who takes care of planting new trees.]]))
+.. new_objectives(obj_build_forester),
    w=400,
 }
 
 saledus_3 = {
-   title=_"Thinking about the future",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-   _"Saledus notes..." ..
-   "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.<br> The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-   _"* Build a quarry in the south to cut some stones and marble out of the rocks.<br> These might be used for future buildings." ..
-   "</p></rt>",
+   title=_"Thinking About the Future",
+   body= saledus(_"Saledus notes...",
+   _([[Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. ]] ..
+[[Perhaps we could cut out some useful hard stones and beautiful marble.]]) .. "<br><br>" ..
+_([[The repair of our ship will take a few weeks, anyway, and the resources we harvest now ]] ..
+[[might be the base of strong and big buildings in another land.]]))
+.. new_objectives(obj_build_quarry),
    w=400,
 }
 
 saledus_4 = {
-   title=_"A step forward",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-   _"Saledus looks promising..." ..
-   "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey Lutius, today we got a lot closer to our first castle. The quarry to the south began its work today and will soon provide us with stones and beautiful marble.<br> Now we truly can look forward to settling down on another island." ]] ..
-   "</p></rt>",
+   title=_"A Step Forward",
+   body= saledus(_"Saledus looks promising...",
+   _([[Hey Lutius, today we got a lot closer to our first castle. ]] ..
+[[The quarry to the south began its work today and will soon provide us with stones and beautiful marble.]]) .. "<br><br>" ..
+_([[Now we truly can look forward to settling down on another island.]])),
    w=400,
 }
 
 diary_page_4 = {
    title=_"Mission Complete",
-   body="<rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Today I got the message that our ship is completely repaired. At the moment my people are loading everything onto our newly repaired ship, hoping it will serve us better than last time.<br> Tonight will be our last night on this island. Tomorrow morning we will leave, searching for a new place for our exile.<br> I still wonder if we will ever see Fremil again.<br><br>--------------------- VICTORY! ----------------------<br><br> You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission." ]] ..
-"</p></rt>",
+   body= lutius(
+_([[Today I got the message that our ship is completely repaired. ]] ..
+[[At the moment, my people are loading everything onto our newly repaired ship, ]] ..
+[[hoping it will serve us better than last time.]]) .. "<br><br>" ..
+_([[Tonight will be our last night on this island. ]] ..
+[[Tomorrow morning we will leave, searching for a new place for our exile.]]) .. "<br><br>" ..
+_([[I still wonder if we will ever see Fremil again.]])) ..
+      objective_text(_"Victory", _
+[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]
+   ),
    posy=1
 }
 
 safe_peninsula = {
    title=_"Safe Peninsula",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-   _"Saledus speaks:" ..
-   "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "You have made this peninsula a very secure place. It is time to move on!" ]] ..
-   "</p></rt>"
-}
-
--- ===========
--- objectives
--- ===========
-obj_build_barracks = {
-   name = "build_barracks",
-   title=_"Build a barracks",
-   body= "<rt><p>" ..
-   _"* Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters." ..
-   "</p></rt>"
-}
-obj_build_lumberjack = {
-   name = "build_lumberjack",
-   title=_"Build a lumberjack's house",
-   body= "<rt><p>" ..
-   _(
-   "* Build a lumberjack's house at the red point, south of your provisional headquarters. " ..
-   "Cutting down enough trees for more buildings will take a while. You can " ..
-   "speed the game up using PAGE UP and slow it down again with PAGE DOWN."
-   ) .. 
-   "</p></rt>"
-}
-obj_build_sawmill_and_lumberjacks = {
-   name = "build_sawmill_and_lumberjacks",
-   title=_"Build two lumberjack's houses and a sawmill",
-   body="<rt><p>" ..
-   _"* Build two more lumberjack's houses and a sawmill as soon as there is enough space for them." ..
-   "</p></rt>"
-}
-obj_build_forester = {
-   name = "build_forester",
-   title=_"Build a forester's house",
-   body="<rt><p>" ..
-   _"* Build a forester's house to preserve the wood resources of this island." ..
-   "</p></rt>"
-}
-obj_build_quarry = {
-   name = "build_quarry",
-   title=_"Build a quarry",
-   body="<rt><p>" ..
-   _"* Build a quarry in the south to cut some stones and marble out of the rocks.<br> These might be used for future buildings." ..
-   "</p></rt>"
+   body= saledus(_"Saledus speaks:",
+   _[[You have made this peninsula a very secure place. It is time to move on!]])
 }
 
 
=== modified file 'campaigns/emp02.wmf/elemental'
--- campaigns/emp02.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/emp02.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -6,7 +6,7 @@
 map_h=80
 nr_players=2
 world=desert
-name=_"02 - An Outpost for Exile"
+name=_"02 – An Outpost for Exile"
 author=Nasenbaer
-descr=_"Finally the ship was repaired, so Lutius and his people again went on the quest to find a good place for a new beginning. Only a few days later they land on a green, mediterranean island, looking like paradise. Overjoyed, they set out to explore this new living space."
+descr=_"Finally the ship was repaired, so Lutius and his people returned to the quest to find a good place for a new beginning. Only a few days later, they land on a green, Mediterranean island, looking like paradise. Overjoyed, they set out to explore this new living space."
 background="tribes/empire/pics/campmap-emp02.jpg"
 
=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -1,3 +1,21 @@
+-- =========================
+-- Some formating functions
+-- =========================
+
+use("aux", "formatting")
+use("aux", "format_scenario")
+
+function lutius(title, text)
+   return speech("map:Lutius.png", "2F9131", title, text)
+end
+function saledus(title, text)
+   return speech("map:Saledus.png", "8F9131", title, text)
+end
+function amalea(title, text)
+   return speech("map:Amalea.png", "AF7511", title, text)
+end
+
+
 -- =======================================================================
 --                        Texts only - no logic here
 -- =======================================================================
@@ -8,221 +26,246 @@
 obj_build_woodeconomy = {
    name = "build_woodeconomy ",
    title =_"Build up a wood economy",
-   body ="<rt><p>" ..
-_"* Build three lumberjack's houses, a forester's house and a sawmill." ..
-"</p></rt>",
+   number = 5,
+   body = objective_text(_"Wood Economy", 
+[[• ]] .. _[[Build three lumberjack’s houses, a forester’s house and a sawmill.]]),
 }
 
 obj_build_quarry = {
    name = "build_quarry ",
    title =_"Build a quarry",
-   body ="<rt><p>" ..
-_"* Build a quarry to the south of your headquarters." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Quarry", 
+[[• ]] .. _[[Build a quarry to the south of your headquarters.]]),
 }
 
 obj_build_military_buildings = {
    name = "build_military_buildings ",
    title =_"Protect your colony",
-   body ="<rt><p>" ..
-_"* Build some barracks and sentries around the colony." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Protect Your Colony", 
+[[• ]] .. _[[Build some barracks and sentries around the colony.]]),
 }
 
 obj_build_marblemine = {
    name = "build_marblemine ",
    title =_"Start mining marble",
-   body ="<rt><p>" ..
-_"* Expand to the east, to start mining marble from the mountain." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Marble", 
+[[• ]] .. _[[Expand to the east, to start mining marble from the mountain.]]),
 }
 
 obj_build_mining_infrastructure = {
    name = "build_mining_infrastructure ",
    title =_"Build a stonemason and mining infrastructure",
-   body ="<rt><p>" ..
-_"* Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal burner, iron ore mine, toolsmith's shop, weapon smithy, armour smithy and smelting works)." ..
-"</p></rt>",
+   number = 7,
+   body = objective_text(_"Stonemason and Mining Infrastructure", 
+[[• ]] .. _[[Build a stonemason and then a complete mining and production infrastructure 
+(coal mine and / or charcoal burner, iron ore mine, toolsmithy, weapon smithy, armor smithy and smelting works).]]),
 }
 
 obj_build_Food_infrastructure = {
    name = "build_food_infrastructure",
    title =_"Provide your miners with food",
-   body ="<rt><p>" ..
-_"* To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.<br> Of course this means we will need more resources for preparing this food - like fish, meat or bread.<br> To provide these foodstuffs, you would have to build a fisher's house, a farm, a mill and a bakery.<br> Maybe you will also need a hunter's house,<br> a piggery, a vineyard and some wells.<br> It's up to you what you want to build.<br> But remember - coal and iron ore mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Food For Your Miners", 
+[[• ]] .. _([[To produce some sustaining food for our miners, we could build up a tavern. ]] ..
+[[To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) .. "<br>" ..
+[[• ]] .. _([[Of course this means we will need more resources for preparing this food – like fish, meat or bread.]] .. 
+[[To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) .. "<br>" ..
+[[• ]] .. _[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]] .. "<br><br>" ..
+[[→ ]] .. _([[It’s up to you what you want to build. But remember – coal and iron ore mines need beer, ]] ..
+[[marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish.]])),
 }
 
 obj_build_bigger_military_buildings = {
    name = "build_bigger_military_buildings ",
    title =_"Protect your eastern frontier",
-   body ="<rt><p>" ..
-_"* Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier. To watch deep inside the enemy territory, build a tower." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Protect Your Eastern Frontier", 
+[[• ]] .. _[[Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier.]] ..
+"<br><br>" ..
+[[→ ]] .. _[[To watch deep inside the enemy territory, build a tower.]]),
 }
 
 obj_remove_the_barbarians = {
    name = "remove_the_barbarians ",
    title =_"Destroy the barbarian tribe",
-   body ="<rt><p>" ..
-_"* As soon as you have enough soldiers, attack and completely destroy the barbarian buildings.<br>" ..
-_"* Finally, build up a fortress on the peninsula<br> (near where the barbarian headquarters stood before), to avoid new settlements of other tribes in that region." ..
-"</p></rt>",
+   number = 2,
+   body = objective_text(_"Destroy the Barbarian Tribe", 
+[[• ]] .. _[[As soon as you have enough soldiers, attack and completely destroy the barbarian buildings.]] .. "<br>" ..
+[[• ]] .. _([[Finally, build up a fortress on the peninsula (near where the barbarian headquarters stood before), ]] ..
+[[to avoid new settlements of other tribes in that region.]])),
 }
 
-
 -- =====================
 -- Messages to the User
 -- =====================
 diary_page_5 = {
-   title =_ "A new island",
+   title =_ "A New Island",
    posy= 1,
-   body = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Finally! This island appears to be made for us, it is a gift from the Gods to my people and myself.<br> Until now, we have only seen a small part of this island, but this part alone is already bringing sunlight in my mind. I feel as if we have found a priceless treasure, a land like paradise.<br> On this island, we will start our new life. We will build up an outpost for our exile, which perhaps will become a new, beautiful home for every one of us." ]] ..
-"</p></rt>",
+   body = lutius(_"Diary of Lutius",
+_([[Finally! This island appears to have been made for us, it is a gift from the Gods to my people and myself. ]] ..
+[[Until now, we have only seen a small part of this island, but this part alone is already bringing sunlight to my mind. ]] ..
+[[I feel as if we have found a priceless treasure, a land like paradise.]]) .. "<br><br>" ..
+_([[On this island, we will start our new life. ]] ..
+[[We will build up an outpost for our exile, which perhaps will become a new, beautiful home for every one of us.]])),
 }
 
 diary_page_5_1 = {
-   title =_ "The green forests",
+   title =_ "The Green Forests",
    posy = 1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "As Saledus and I walked through these wonderful forests in the north, we felt that our future had just begun. This land is so peaceful, good and beautiful, I could stay here until the end of my life.<br> But until that day, may many years pass! For now, we must concentrate on the present, and build a few lumberjack's houses and a sawmill to produce some basic building materials.<br> But we shouldn't forget to preserve this natural bounty. These forests should last forever, so we really should build a forester's house too."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build three lumberjack's houses, a forester's house and a sawmill." ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[As Saledus and I walked through these wonderful forests in the north, we felt that our future had just begun. ]] ..
+[[This land is so peaceful, good and beautiful, I could stay here until the end of my life.]]) .. "<br><br>" ..
+_([[But until that day, may many years pass! For now, we must concentrate on the present, ]] ..
+[[and build a few lumberjack’s houses and a sawmill to produce some basic building materials.]]) .. "<br><br>" ..
+_([[But we shouldn’t forget to preserve this natural bounty. ]] ..
+[[These forests should last forever, so we really should build a forester’s house too.]]))
+.. new_objectives(obj_build_woodeconomy),
 }
 
 diary_page_5_2 = {
-   title =_ "The rocks",
+   title =_ "The Rocks",
    posy = 1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Later, I walked down to the rocks in the south and looked for a place where we can build a quarry to get some hard stone for our larger buildings.<br> Again, I felt like I'm in paradise when I noticed that some marble-like stones were among the rocks. It seems that we will soon be able to build strong, luxurious buildings, like those we were accustomed to in Fremil."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a quarry to the south of your headquarters." ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[Later, I walked down to the rocks in the south and looked for a place where we could build a quarry ]] ..
+[[to get some hard stone for our larger buildings.]]) .. "<br><br>" ..
+_([[Again, I felt like I was in paradise when I noticed that some marble-like stones were among the rocks. ]] ..
+[[It seems that we will soon be able to build strong, luxurious buildings, like those we were accustomed to in Fremil.]]))
+.. new_objectives(obj_build_quarry),
 }
 
 diary_page_6 = {
-   title =_ "Wood for the colony",
+   title =_ "Wood for the Colony",
    posy=1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Good news! Today our wood economy was completed. Now we can be sure to have enough wood for our future building projects." ]] ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[Good news! Today our wood economy was completed. ]] ..
+[[Now we can be sure that we will have enough wood for our future building projects.]])),
 }
 
 diary_page_7 = {
-   title =_ "Stone for the colony",
+   title =_ "Stone for the Colony",
    posy=1,
-   body="<rt><p font-size=24 text-align=left font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Great! Today the building of the quarry was completed. Now we get enough stone to construct larger buildings." ]] ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_[[Great! Today the building of the quarry was completed. Now we will get enough stone to construct larger buildings.]]),
 }
 
 saledus_1 = {
-   title =_ "Dangerous shipparts",
+   title =_ "Dangerous Ship Parts",
    posy = 1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-_"Saledus looks unhappy" ..
-"</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Greetings Lutius, I don't want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern shore I found the remains of another ship. I don't know whether these parts are all that is left of that ship. In any case, these parts do not seem to be old.<br> Perhaps the people aboard that ship were caught in the same storm which brought us to Malac' Mor - and were brought to this island.<br> I beg you to be cautious and to build some barracks or sentries around our colony."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build some barracks and sentries around the colony." ..
-"</p></rt>",
+   body= saledus(_"Saledus looks unhappy",
+_([[Greetings Lutius, I don’t want to start a panic, ]] ..
+[[but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. ]] ..
+[[As I walked down to the southern shore, I found the remains of another ship. ]] ..
+[[I don’t know whether these parts are all that is left of that ship. ]] ..
+[[In any case, these parts do not seem to be old.]]) .. "<br><br>" ..
+_([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor]] ..
+[[ – and were brought to this island.]]) .. "<br><br>" ..
+_([[I beg you to be cautious and to build some barracks or sentries around our colony.]]))
+.. new_objectives(obj_build_military_buildings),
 }
 
 saledus_2 = {
-   title =_ "Marble on the mountain",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-_"Saledus smiles" ..
-"</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Lutius, I've got good news for you:<br> As I walked to the east, I found a larger mountain.<br> I am not absolutely sure - a geologist should check if I am right - but I believe we could mine marble from some places on the mountain.<br> It would be a good source to bolster our supply of quality marble, beyond the meagre quantities available from the quarry. Perhaps you were right when you said that this island is like paradise.<br> Let us expand to that mountain and start mining marble."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Expand to the east, to start mining marble from the mountain." ..
-"</p></rt>",
+   title =_ "Marble on the Mountain",
+   body= saledus(_"Saledus smiles",
+_([[Lutius, I’ve got good news for you:]] ..
+[[As I walked to the east, I found a larger mountain.]] ..
+[[I am not absolutely sure – a geologist should check if I am right]] ..
+[[ – but I believe we could mine marble from some places on the mountain.]]) .. "<br><br>" ..
+_([[It would be a good source for bolstering our supply of quality marble, ]] ..
+[[beyond the meager quantities available from the quarry. ]] ..
+[[Perhaps you were right when you said that this island was like paradise.]]) .. "<br><br>" ..
+_([[Let us expand to that mountain and start mining marble.]]))
+.. new_objectives(obj_build_marblemine),
 }
 
 saledus_3 = {
-   title =_ "Further mountains",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8F9131>" ..
-_"Saledus is amazed" ..
-"</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "By the Gods, this is an unbelievable strike of fortune! There are two more mountains and it seems that one has a large quantity of coal and the other of iron ore. We should immediately start to build iron ore and coal mines (or at least charcoal burners), smelting works, toolsmith's shops, armour and weapon smithies.<br> However: for all these bigger buildings, we need better and more elegant building materials. So, let's build<br> a stonemason, who cuts columns from marble.<br> After all, now we can begin living as we did in Fremil."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a stonemason and then a complete mining and production infrastructure (coal mine and / or charcoal burner, iron ore mine, toolsmith's shop, weapon smithy, armour smithy and smelting works)." ..
-"</p></rt>",
+   title =_ "Further Mountains",
+   body= saledus(_"Saledus is amazed",
+_([[By the Gods, this is an unbelievable stroke of fortune! ]] ..
+[[There are two more mountains, and it seems that one has a large quantity of coal and the other of iron ore. ]] ..
+[[We should immediately start to build iron ore and coal mines (or at least charcoal burners), ]] ..
+[[smelting works, toolsmithies, armor and weapon smithies.]]) .. "<br><br>" ..
+_([[However: for all these bigger buildings, we need better and more elegant building materials. ]] ..
+[[So, let’s build a stonemason, who will cut columns from marble.]]) .. "<br><br>" ..
+_([[After everything, we can now begin to live like we did in Fremil.]]))
+.. new_objectives(obj_build_mining_infrastructure),
 }
 
 amalea_1 = {
-   title =_ "Food for the miners",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=AF7511>" ..
-_"Amalea comes in..." ..
-"</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Hi Lutius, I hope you forgive my criticism, but it seems to me as if you forgot something.<br> It's nice, and of course a good idea, to build up mines, which will give us a more comfortable life,<br> but the people working in the mines are unhappy with the current situation. They have to do hard work and have no time for making their own food.<br> What do you think about helping them out?<br> I can't tell you what exactly we need... but here are my recommendations:"<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.<br> Of course this means we will need more resources for preparing this food - like fish, meat or bread.<br> To provide these foodstuffs, you would have to build a fisher's house, a farm, a mill and a bakery.<br> Maybe you will also need a hunter's house,<br> a piggery, a vineyard and some wells.<br> It's up to you what you want to build.<br> But remember - coal and iron ore mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish." ..
-"</p></rt>",
+   title =_ "Food for the Miners",
+   body= amalea(_"Amalea comes in...",
+_([[Hi Lutius, I hope you forgive my criticism, but it seems to me as if you forgot something.]]) .. "<br><br>" ..
+_([[It’s nice, and of course a good idea, to build up mines, which will give us a more comfortable life, ]] ..
+[[but the people working in the mines are unhappy with the current situation. ]] ..
+[[They have to do hard work and have no time for making their own food.]]) .. "<br><br>" ..
+_([[What do you think about helping them out? ]] ..
+[[I can’t tell you what we need exactly... but here are my recommendations:]]))
+.. new_objectives(obj_build_Food_infrastructure),
 }
 
 diary_page_8 = {
    title =_ "The Barbarians",
    posy=1, 
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "By the Gods! This is absolutely terrible. It seems as if we stand close to a test - and it seems as if Saledus was right with his fear concerning the shipwreck he found.<br> Today, as I walked down to the eastern shore,<br> I got a shock. I caught sight of one of those hated, evil, barbarian tribes with whom we have had so many problems before.<br> At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods that<br> I was able to flee and hide myself, before retreating back to our colony under cover of darkness.<br> Anyway, we must build up stronger military buildings as soon as possible."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier. To watch deep inside the enemy territory, build a tower." ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[By the Gods! This is absolutely terrible. It seems as if we stand close to a test]] ..
+[[ – and it seems as if Saledus was right with his fear concerning the shipwreck he found.]]) .. "<br><br>" ..
+_([[Today, as I walked down to the eastern shore, I got a shock. ]] ..
+[[I caught sight of one of those hated, evil, barbarian tribes with whom we have had so many problems before.]]) .. "<br><br>" ..
+_([[At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me, ]] ..
+[[they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods ]] ..
+[[that I was able to flee and hide myself, before retreating back to our colony under cover of darkness.]]) .. "<br><br>" ..
+_([[Anyway, we must build up stronger military buildings as soon as possible.]]))
+.. new_objectives(obj_build_bigger_military_buildings),
 }
 
 diary_page_9 = {
-   title =_ "Command for Attack",
+   title =_ "Command to Attack",
    posy=1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "That's good. The first large military building is complete and the mining infrastructure is getting better and better. Now we should think of preparing ourselves for battle."<br><br>-- NEW OBJECTIVES --<br> ]] ..
-_"* As soon as you have enough soldiers, attack and completely destroy the barbarian buildings.<br>" ..
-_"* Finally, build up a fortress on the peninsula<br> (near where the barbarian headquarters stood before), to avoid new settlements of other tribes in that region." ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[That’s good. The first large military building is complete and the mining infrastructure is getting better and better. ]] ..
+[[Now we should think about preparing ourselves for battle.]]))
+.. new_objectives(obj_remove_the_barbarians),
 }
 
 diary_page_10 = {
    title =_ "Victory",
    posy=1,
-   body="<rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Today is a proud day. We have fought for our new home and risen victorious.<br> There are still a few barbarians hiding on our island, but I am sure that we will find them soon.<br> Every barbarian who doesn't attack us will be put in a boat with the other peaceful ones, and sent back to their country."<br><br>--------------------- VICTORY! ----------------------]] ..
-"</p></rt>",
+   body= lutius(
+_([[Today is a proud day. We have fought for our new home and risen victorious.]]) .. "<br><br>" ..
+_([[There are still a few barbarians hiding on our island, but I am sure that we will find them soon.]] ..
+[[Every barbarian who doesn’t attack us will be put in a boat with the other peaceful ones, and sent back to their country.]]))
+..  objective_text(_"Victory", 
+   _[[You have established a working economy, trained new soldiers and driven the barbarians from the island.]]
+),
 }
 
 seven_days_later = {
-   title =_ "As time is running by",
+   title =_ "As Time is Running By",
    w=200,
    h=150,
-   body="<rt><p line-spacing=3 font-size=12>" ..
-_"7 days later..." ..
-"</p></rt>",
+   body=rt(p(_"7 days later...")),
 }
 
 diary_page_11 = {
    title =_ "A Message",
    posy=1,
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Diary of Lutius" ..
-"</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Today a pigeon landed on our island.<br> It brought a message which fills me with dark thoughts and brings back my fears.<br> The message was addressed to me, begging me to come back to Fremil.<br> It says that the Empire is at war with the Barbarians. They were attacked from the north by the tribe I was forbidden to attack.<br> For me, it is clear what I must do...<br><br> You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission." ]] ..
-"</p></rt>",
+   body= lutius(_"Diary of Lutius",
+_([[Today a pigeon landed on our island. ]] ..
+[[It brought a message which fills me with dark thoughts and brings back my fears.]]) .. "<br><br>" ..
+_([[The message was addressed to me, begging me to come back to Fremil.]] ..
+[[It says that the Empire is at war with the Barbarians. ]] ..
+[[They were attacked from the north by the tribe that I was forbidden to attack. ]] ..
+[[It is clear to me what I must do...]]) .. "<br><br>" ..
+_([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
 }
 
 amalea_2 = {
-   title =_ "Our new tavern",
-   body="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=AF7511>" ..
-_"Amalea smiles" ..
-"</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Greetings, my friend, I just visited our new tavern<br> 'At the palms'. The beer they serve is really tasty. You really should take a drink there, too.<br> It is good to see that we have now got a warmer and more familiar environment on our island.<br> Thank you, Lutius." ]] ..
-"</p></rt>",
+   title =_ "Our New Tavern",
+   body= amalea(_"Amalea smiles",
+_([[Greetings, my friend, I just visited our new tavern ‘At the palms’. ]] ..
+[[The beer they serve is really tasty. You really should have a drink there, too.]]) .. "<br><br>" ..
+_([[It is good to see that we have now got a warmer and more familiar environment on our island. Thank you, Lutius.]])),
 }
 
 
=== modified file 'campaigns/t01.wmf/elemental'
--- campaigns/t01.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/t01.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -4,7 +4,7 @@
 map_h=64
 nr_players=1
 world=greenland
-name=_"01 - Eyes in the Dark"
+name=_"01 – Eyes in the Dark"
 author=Winterwind
-descr=_"In this tutorial the basic gameplay and control as well as basic production buildings of the Barbarians are introduced."
+descr=_"In this tutorial, the basic gameplay and control as well as basic production buildings of the Barbarians are introduced."
 background="tribes/barbarians/pics/campmap-tut1+2.jpg"
 
=== modified file 'campaigns/t01.wmf/scripting/init.lua'
--- campaigns/t01.wmf/scripting/init.lua	2011-03-19 13:40:16 +0000
+++ campaigns/t01.wmf/scripting/init.lua	2014-03-05 18:47:45 +0000
@@ -56,6 +56,11 @@
    sleep(500)
 end
 
+-- Add an objective
+function add_obj(objective, player)
+   return player:add_objective(objective.name, objective.title, objective.body)
+end
+
 use("aux", "coroutine")
 use("aux", "ui")
 use("aux", "table")
@@ -64,4 +69,3 @@
 
 use("map", "initial_messages")
 use("map", "story_messages")
-
 
=== modified file 'campaigns/t01.wmf/scripting/initial_messages.lua'
--- campaigns/t01.wmf/scripting/initial_messages.lua	2012-12-16 19:08:16 +0000
+++ campaigns/t01.wmf/scripting/initial_messages.lua	2014-03-05 18:47:45 +0000
@@ -2,30 +2,35 @@
 -- Send a bunch of story messages 
 -- ===============================
 
+--use("aux", "formatting")
+use("aux", "format_scenario")
+
+function thron(title, text)
+   return speech("map:chieftain.png", "2F9131", title, text)
+end
+
+
 function briefing_messages() 
 -- Briefing message
-title = _"The story begins"
-msg = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron sighs..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "It's been months and we are still hiding where the forests are old and dark.<br> My warriors hunt at day and lie awake at night - listening to the sounds of the cruel slaughter echoing from afar amongst the ancient trees." ]] .. 
-"</p></rt>"
+title = _"The Story Begins"
+msg = thron(_"Thron sighs...",
+_[[It’s been months, and we are still hiding where the forests are old and dark.]] .. "<br><br>" ..
+_[[My warriors hunt at day and lie awake at night – listening to the sounds of the cruel slaughter echoing from afar amongst the ancient trees.]]) 
 show_story_box(title, msg)
 
 msg = 
-"<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "We can see the raging flames that swallow Al'thunran from here, miles away.<br> The red lights flash in the darkness and dance to the rhythm of the wardrums that haunt me even in my nightmares." ]] .. 
-"</p></rt>"
+thron(
+_[[We can see the raging flames that swallow Al’thunran from here, miles away.]] .. "<br><br>" ..
+_[[The red lights flash in the darkness and dance to the rhythm of the war drums that haunt me even in my nightmares.]])
 show_story_box(title, msg, al_thunran)
 
-msg = "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "My father's bones rest peacefully in the grounds on which he once ended the senseless bloodspilling that has risen among us. It pains me that his peace only endured for one generation.<br> Boldreth, my loyal companion and friend is a source of peace and comfort to me in these dark times. He keeps my spirits high and those of my warriors awake, not to let greed or despair destroy the bonds between us as well." ]] ..
-"</p></rt>"
+msg = thron(
+_[[My father’s bones rest peacefully in the ground on which he once ended the senseless spilling of blood that had arisen amongst us. It pains me that his peace only endured for one generation.]] .. "<br><br>" ..
+_[[Boldreth, my loyal companion and friend is a source of peace and comfort to me in these dark times. He keeps my spirits high and those of my warriors awake, preventing greed or despair from destroying the bonds between us as well.]])
 show_story_box(title, msg, grave)
 
-msg = "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "As father told me, there are times to fight and times to lie and wait, trying not to fall asleep or die before the right time comes. And so I do... wait." ]] .. 
-"</p></rt>"
+msg = thron(
+_[[As father told me, there are times to fight and times to lie and wait, trying not to fall asleep or die before the right time comes. And so I do... wait.]])
 show_story_box(title, msg)
 sleep(2000)
 
 
=== modified file 'campaigns/t01.wmf/scripting/khantrukhs_talking.lua'
--- campaigns/t01.wmf/scripting/khantrukhs_talking.lua	2011-03-19 13:40:16 +0000
+++ campaigns/t01.wmf/scripting/khantrukhs_talking.lua	2014-03-05 18:47:45 +0000
@@ -19,37 +19,39 @@
 end
 
 function tutorial_thread()
-   show_story_box(_"Somebody comes up to you", khantrukh_1)
-   show_story_box(_"The advisor", khantrukh_2, nil, 80, 80)
-   o = start_lumberjack_01(p)
+   p = wl.Game().players[1]
+   show_story_box(_"Somebody Comes up to You", khantrukh_1)
+   show_story_box(_"The Advisor", khantrukh_2, nil, 80, 80)
+   local o = add_obj(start_lumberjack_01, p)
+
    -- Wait till the hut is build.
    while not check_for_buildings(p, {constructionsite = 1},
       wl.Game().map:get_field(15,11):region(2)) do sleep(5000) end
 
-   show_story_box(_"The advisor", khantrukh_3, nil, 80, 80)
+   show_story_box(_"The Advisor", khantrukh_3, nil, 80, 80)
 
    -- Wait till the hut is build.
    while not check_for_buildings(p, {lumberjacks_hut = 1},
       wl.Game().map:get_field(15,11):region(2)) do sleep(5000) end
    o.done = true
 
-   p:message_box(_"The advisor", khantrukh_4, { h = 400 })
-   p:message_box(_"The advisor", khantrukh_5, { h = 400 })
-   o = start_lumberjack_02(p)
+   p:message_box(_"The Advisor", khantrukh_4, { h = 400 })
+   p:message_box(_"The Advisor", khantrukh_5, { h = 400 })
+   local o = add_obj(start_lumberjack_02, p)
 
    -- Wait till the hut is build.
    while not check_for_buildings(p, {lumberjacks_hut = 1},
          wl.Game().map:get_field(12,13):region(2)) do sleep(5000) end
    o.done = true
 
-   p:message_box(_"The advisor", khantrukh_6, { h = 400 })
+   p:message_box(_"The Advisor", khantrukh_6, { h = 400 })
    p:allow_buildings{"rangers_hut", "quarry"}
-   objq = start_quarries(p)
-   objr = start_ranger(p)
+   objq = add_obj(start_quarries, p)
+   objr = add_obj(start_ranger, p)
    run(check_ranger)
    run(check_quarries)
 
-   p:message_box(_"The advisor", khantrukh_7, { h = 400 })
+   p:message_box(_"The Advisor", khantrukh_7, { h = 400 })
    while not (objr.done and objq.done) do
       sleep(5000)
    end
 
=== modified file 'campaigns/t01.wmf/scripting/texts.lua'
--- campaigns/t01.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/t01.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -1,137 +1,173 @@
+use("aux", "formatting")
+use("aux", "format_scenario")
+
+function thron(title, text)
+   return speech("map:chieftain.png", "2F9131", title, text)
+end
+function khantrukh(title, text)
+   return speech("map:khantrukh.png", "8080FF", title, text)
+end
+
 -- =======================================================================
 --                            Mission objectives                            
 -- =======================================================================
 
-function start_lumberjack_01(p) 
-   return p:add_objective("lumberjack01",
-   _ "Build a lumberjack's hut", 
-"<rt><p>" ..
-_"* Press SPACE to see where you can build.<br> The red house symbols show you where a small building - like a lumberjack's hut - may be built.<br>" ..
-_"* Build a lumberjack's hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack's hut.<br>" ..
-_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
-"</p></rt>")
-end
-
-function start_lumberjack_02(p)
-   return p:add_objective("lumberjack02",
-     _ "Build another lumberjack's hut",
-     "<rt><p>" ..
-_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
-_"* Place a lumberjack's hut just south of the flag you just placed on the road. Connect the flag you just raised with the flag of the new lumberjack's hut construction site afterwards.<br> Note that instead of building a road step by step, you may also click directly at its destination to build the entire road at once." ..
-"</p></rt>")
-end
-
-function start_ranger(p)
-   return p:add_objective("ranger", _ "Build a ranger's hut",
-"<rt><p>" ..
-_"* Build a ranger's hut to the east of the first lumberjack's hut." ..
-"</p></rt>")
-end
-
-function start_quarries(p)
-   return p:add_objective("quarries", _ "Build two quarries",
-"<rt><p>" ..
-_"* Build two quarries southwest of your headquarters." ..
-"</p></rt>")
-end
+start_lumberjack_01 = {
+   name = "start_lumberjack_01",
+   title = _ "Build a lumberjack’s hut",
+   number = 2,
+   body = objective_text(_"Build a lumberjack’s hut",
+[[• ]] .. _"Press SPACE to see where you can build. The red house symbols show you where a small building – like a lumberjack’s hut – may be built." .. "<br><br>" ..
+[[• ]] .. _"Build a lumberjack’s hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack’s hut." .. "<br><br>" ..
+[[• ]] .. _"Build a road between your headquarters and the construction site of the lumberjack’s hut." .. "<br><br>" ..
+[[→ ]] .. _"When you place the lumberjack’s hut, a flag is created for it. You need to connect it to another flag by building a road between them. If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it." .. "<br><br>" ..
+[[→ ]] .. _"The colors of these symbols indicate how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly)." .. "<br><br>" ..
+[[→ ]] .. "You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road."
+   ),
+}
+
+start_lumberjack_01_01 = {
+   name = "start_lumberjack_01_01",
+   title = _ "Build a lumberjack’s hut",
+   number = 1,
+   body = objective_text(_"Build a lumberjack’s hut",
+[[• ]] .. _"Press SPACE to see where you can build. The red house symbols show you where a small building – like a lumberjack’s hut – may be built." .. "<br><br>" ..
+[[• ]] .. _"Build a lumberjack’s hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack’s hut."
+   ),
+}
+
+start_lumberjack_01_02 = {
+   name = "start_lumberjack_01_02",
+   title = _ "Build a road to the lumberjack’s hut",
+   number = 1,
+   body = objective_text(_"Road to the lumberjack’ hut", 
+[[• ]] .. _"Build a road between your headquarters and the construction site of the lumberjack’s hut." .. "<br><br>" ..
+[[→ ]] .. _"When you place the lumberjack’s hut, a flag is created for it. You need to connect it to another flag by building a road between them. If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it." .. "<br><br>" ..
+[[→ ]] .. _"The colors of these symbols indicate how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly)." .. "<br><br>" ..
+[[→ ]] .. _"You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road."
+   ),
+}
+
+start_lumberjack_02 = {
+   name = "start_lumberjack_02",
+   title = _ "Build a second lumberjack’s hut",
+   number = 2,
+   body = objective_text(_"Build a second lumberjack’s hut",
+[[• ]] .. _"Place a flag in the middle of the road. There is a flag symbol in the middle of the road you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This will divide the road the wood is transported into two parts with one carrier each." .. "<br><br>" ..
+[[• ]] .. _"Place a lumberjack’s hut just south of the flag you just placed on the road. Connect the flag you just raised with the flag of the new lumberjack’s hut construction site afterwards. Note that instead of building a road step by step, you may also click directly at its destination to build the entire road at once." .. "<br><br>" ..
+[[→ ]] .. _"When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure."
+   ),
+}
+
+start_lumberjack_02_01 = {
+   name = "start_lumberjack_02_01",
+   title = _ "Build a second lumberjack’s hut",
+   number = 1,
+   body = objective_text(_"Build a second lumberjack’s hut",
+[[• ]] .. _"Place a flag in the middle of the road. There is a flag symbol in the middle of the road you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This will divide the road the wood is transported into two parts with one carrier each." .. "<br><br>" ..
+[[→ ]] .. _"When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure."
+   ),
+}
+
+start_lumberjack_02_02 = {
+   name = "start_lumberjack_02_02",
+   title = _ "Build a second lumberjack’s hut",
+   number = 1,
+   body = objective_text(_"Build a second lumberjack’s hut",
+[[• ]] .. _"Place a lumberjack’s hut just south of the flag you just placed on the road. Connect the flag you just raised with the flag of the new lumberjack’s hut construction site afterwards. Note that instead of building a road step by step, you may also click directly at its destination to build the entire road at once."
+   ),
+}
+
+start_ranger = {
+   name = "start_ranger",
+   title = _ "Build a ranger’s hut",
+   number = 1,
+   body = objective_text(_"Build a ranger’s hut",
+[[• ]] .. _"Build a ranger’s hut to the east of the first lumberjack’s hut."
+   ),
+}
+
+start_quarries = {
+   name = "start_quarries",
+   title = _ "Build two quarries",
+   number = 1,
+   body = objective_text(_"Build two quarries",
+[[• ]] .. _"Build two quarries south-west of your headquarters."
+   ),
+}
 
 -- =======================================================================
 --                              Kankruth's texts                             
 -- =======================================================================
 
-khantrukh_1="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"An old man says..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "Hail, chieftain. I am Khantrukh and have seen many winters pass. Please allow me to aid you with my counsel through these darkened days." ]] ..
-"</p></rt>" 
-
-khantrukh_2= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"Khantrukh continues..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "None but the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...<br> We should prepare, in case we have to face the winter in these harsh lands. I believe to the east of our campsite are a few places where we could raise a lumberjack's hut."<br><br>-- NEW OBJECTIVES --<br> ]] .. 
-_"* Press SPACE to see where you can build.<br> The red house symbols show you where a small building - like a lumberjack's hut - may be built.<br>" ..
-_"* Build a lumberjack's hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack's hut.<br>" ..
-"</p></rt>" 
-
-
-khantrukh_3 = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"The elder remarks..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "Obviously, it would be too exhausting for our people to walk all the way to the lumberjack's hut through the wilderness. We will have to build a road between our hall and the lumberjack's hut. It's not a hard guess that the men would appreciate a way as short and plain as possible - the wood will surely be heavy enough, nevertheless."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
-"</p></rt>"
-
-khantrukh_4 = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"Khantrukh remembers..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "There is an old saying:<br> 'A burden divided is easier to endure.'<br> A crossroads on the way between our headquarters and the lumberjack's hut would ease the work of our carriers."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
-"</p></rt>"
-
-khantrukh_5 = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"The old man looks to the sky..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "The northern winds tell us that the coming winter will be a long and cruel one. One lumberjack's hut will not be enough to fit the needs of our people. More trees wait for our axes just south of our new crossroads - let us raise a second lumberjack's hut there!"<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Place a lumberjack's hut just south of the flag you just placed on the road. Connect the flag you just raised with the flag of the new lumberjack's hut construction site afterwards.<br> Note that instead of building a road step by step, you may also click directly at its destination to build the entire road at once." ..
-"</p></rt>"
-
-khantrukh_6 = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"Khantrukh nods..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "Of course, if we intended to build a bigger settlement, many more lumberjack's huts would be advisable, but this should suffice for now.<br> But never forget - these forests are our heritage, entrusted upon us by our ancestors. We must always respect and care for them. What we take, we must give back again.<br> So, in order to replace the trees we chop down, we should build a ranger's hut, preferably close to the lumberjack's hut."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a ranger's hut to the east of the first lumberjack's hut." ..
-"</p></rt>"
-
-
-khantrukh_7 = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"The elder speaks..." ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "I am well aware, chieftain, that neither you nor your warriors have the desire to stay in this forsaken place for long. But even so, our war to reconquer our home might take a long time and it would seem wise to make preparations.<br> I would advise that we obtain stones for the future - who knows what fortifications we might be forced to build very soon. And - like a gift of destiny - there are indeed great rocks just nearby..."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build two quarries southwest of your headquarters." ..
-"</p></rt>"
-
-khantrukh_8 = "<rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "Very well done, chieftain. We now have all we need to face the winter and may prepare ourselves for the battles ahead.<br><br>--------------------- VICTORY! ----------------------<br><br> You may continue to play this map if you wish. Otherwise, move on to the next mission." ]] ..
-"</p></rt>"
+khantrukh_1= khantrukh(_"An old man says...",
+_[[Hail, chieftain. I am Khantrukh and have seen many winters pass. Please allow me to aid you with my counsel through these darkened days.]])
+
+khantrukh_2= khantrukh(_"Khantrukh continues...",
+_[[None but the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...]] .. "<br><br>" ..
+_[[We should prepare, in case we have to face the winter in these harsh lands. I believe to the east of our campsite are a few places where we could raise a lumberjack’s hut.]])
+.. new_objectives(start_lumberjack_01_01)
+
+khantrukh_3 = khantrukh(_"The elder remarks...",
+_[[Obviously, it would be too exhausting for our people to walk all the way to the lumberjack’s hut through the wilderness. We will have to build a road between our hall and the lumberjack’s hut. It’s not a hard guess that the men would appreciate a way as short and plain as possible – the wood will surely be heavy enough, nevertheless.]])
+.. new_objectives(start_lumberjack_01_02)
+
+khantrukh_4 = khantrukh(_"Khantrukh remembers...",
+_[[There is an old saying:]] .. "<br><br>" ..
+_[[‘A burden divided is easier to endure.’]] .. "<br><br>" ..
+_[[A crossroads on the road between our headquarters and the lumberjack’s hut would ease the work of our carriers.]])
+.. new_objectives(start_lumberjack_02_01)
+
+khantrukh_5 = khantrukh(_"The old man looks to the sky...",
+_[[The northern winds tell us that the coming winter will be a long and cruel one. One lumberjack’s hut will not be enough to serve the needs of our people. More trees await our axes just south of our new crossroads – let us raise a second lumberjack’s hut there!]])
+.. new_objectives(start_lumberjack_02_02)
+
+khantrukh_6 = khantrukh(_"Khantrukh nods...",
+_[[Of course, if we intended to build a bigger settlement, many more lumberjack’s huts would be advisable, but this should suffice for now.]] .. "<br><br>" ..
+_[[But never forget – these forests are our heritage, entrusted upon us by our ancestors. We must always respect and care for them. What we take, we must give back again.]] .. "<br><br>" ..
+_[[So, in order to replace the trees we chop down, we should build a ranger’s hut, preferably close to the lumberjack’s hut.]])
+.. new_objectives(start_ranger)
+
+khantrukh_7 = khantrukh(_"The elder speaks...",
+_[[I am well aware, chieftain, that neither you nor your warriors have the desire to stay in this forsaken place for long. But even so, our war to reconquer our home might take a long time and it would seem wise to make preparations.]] .. "<br><br>" ..
+_[[I would advise that we obtain stones for the future – who knows what fortifications we might be forced to build very soon. And – like a gift of destiny – there are indeed great rocks just nearby...]])
+.. new_objectives(start_quarries)
+
+khantrukh_8 = khantrukh(_[[Very well done, chieftain. We now have all we need to face the winter and may prepare ourselves for the battles ahead.]])
+..  objective_text(_"Victory", 
+   _[[You may continue to play this map if you wish. Otherwise, move on to the next mission.]]
+)
 
 -- =======================================================================
 --                  General story texts by the chieftain                  
 -- =======================================================================
 story_msg1 = {
-   title = _"In the night",
-   msg ="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron speaks..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_ [[ "In another sleepless night, I went up to the hill and gazed to the north. The fires are still burning, satisfying their hunger upon my father's legacy.<br> They are a constant reminder why we have to hide here... and why we must return in the end!" ]] ..
-"</p></rt>", 
+   title = _"In the Night",
+   msg = thron(_"Thron says...",
+_[[During another sleepless night, I went up to the hill and gazed towards the north. The fires are still burning, satisfying their hunger upon my father’s legacy.]] .. "<br><br>" ..
+_[[They are a constant reminder of why we have to hide here... and why we must return in the end!]]), 
 field = al_thunran,
 }
 
 story_msg2= {
-   title = _"At the tomb",
-   msg = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" .. 
-_"Thron speaks..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Once again, I went up to my father's tomb, in a sacred grove at the foot of the great spire of Kal'mavrath. I just stood there and felt neither the hours pass nor the cold rain pouring down from a darkened sky...<br> Somehow it felt like a farewell. For the first time, I wondered what the future might hold for me..." ]] ..
-"</p></rt>", 
+   title = _"At the Tomb",
+   msg = thron(_"Thron says...",
+_[[Once again, I went up to my father’s tomb, in a sacred grove at the foot of the great spire of Kal’mavrath. I just stood there and felt neither the hours pass nor the cold rain pouring down from the darkened sky...]] .. "<br><br>" ..
+_[[Somehow, it felt like a farewell. For the first time, I wondered what the future might hold for me...]]), 
 field = grave,
 }
 
 story_msg3 = {
-  title=_ "The other day",
-  msg = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron says thoughtfully..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Some time ago, Boldreth came to me. His advice was to move to a place closer to home - to strike at the first sign of my brothers' forces wavering.<br> But I look over the forests and I can still see black smoke rising to the sky. I know - it is too early yet, and what he hopes for will not happen any time soon. He might still be right, but I fear the bloodshed that returning too fast would cause both on our and the other side..." ]] ..
-"</p></rt>"
+  title=_ "The Other Day",
+  msg = thron(_"Thron says thoughtfully...",
+_[[Some time ago, Boldreth came to me. His advice was to move to a place closer to home – to strike at the first sign of my brothers’ forces wavering.]] .. "<br><br>" ..
+_[[But when I look over the forests I can still see black smoke rising to the sky. I know – it is too early yet, and what he hopes for will not happen any time soon. He might still be right, but I fear the bloodshed that returning too fast would cause both on our and the other side...]])
 }
 
 story_msg4 = {
-title =_ "The oath",
-msg = "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron looks furious..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Today, my warriors picked up an old man, wandering sick and wounded through the dark forest. We listened in horror when he told us of the atrocities taking place in Al'thunran.<br> I hereby renew my oath - I will stop this madness at any cost!" ]] ..
-"</p></rt>"
+title =_ "The Oath",
+msg = thron(_"Thron looks furious...",
+_[[Today, my warriors picked up an old man, wandering sick and wounded through the dark forest. We listened in horror as he told us of the atrocities taking place in Al’thunran.]] .. "<br><br>" ..
+_[[I hereby renew my oath – I will stop this madness at any cost!]])
 }
 
 
=== modified file 'campaigns/t02.wmf/elemental'
--- campaigns/t02.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/t02.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -4,7 +4,7 @@
 map_h=64
 nr_players=1
 world=greenland
-name=_"02 - A Place to call Home"
+name=_"02 – A Place to Call Home"
 author=Winterwind
-descr=_"In this scenario the higher production buildings, including mining and the military expansions will be introduced."
+descr=_"In this scenario, the higher production buildings including mining and military expansions will be introduced."
 background="tribes/barbarians/pics/campmap-tut1+2.jpg"
 
=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2014-03-05 18:47:45 +0000
@@ -1,53 +1,9 @@
 -- =========================
 -- Some formating functions
 -- =========================
--- Rich Text
-function rt(text_or_opts, text)
-   k = "<rt>"
-   if text then
-      k = ("<rt %s>"):format(text_or_opts)
-   else
-      text = text_or_opts
-   end
-
-   return k .. text .. "</rt>"
-end
-
--- Headings
-function h1(s)
-   return "<p font=DejaVuSerif font-size=18 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=8> <br></p>"
-end
-
-function h2(s)
-   return "<p font=DejaVuSerif font-size=12 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=4> <br></p>"
-end
-
--- Simple flowing text. One Paragraph
-function p(s)
-   return "<p line-spacing=3 font-size=12>" .. s .. "<br></p>" ..
-      "<p font-size=8> <br></p>"
-end
-
--- Direct speech by one of the persons that appear in the map
-function speech(img, clr, g_title, g_text)
-   local title, text = g_title, g_text
-   if not text then
-      title = nil
-      text = g_title
-   end
-     
-   local s = ""
-   if title then
-      s = rt("<p font-size=20 font-weight=bold font-face=DejaVuSerif " .. 
-         ("font-color=%s>"):format(clr) .. title ..
-         "</p><p font-size=8> <br></p>"
-      )
-   end
-
-   return s .. rt(("image=%s"):format(img), p(text))
-end
+
+use("aux", "formatting")
+use("aux", "format_scenario")
 
 function thron(title, text)
    return speech("map:chieftain.png", "2F9131", title, text)
@@ -59,146 +15,133 @@
    return speech("map:boldreth.png", "FF0000", title, text)
 end
 
-function obj_text(heading, body)
-   return rt(h2(heading) .. p(body))
-end
-
-function new_objectives(...) 
-   local s = rt(
-   "<p font=DejaVuSerif font-size=18 font-weight=bold font-color=D1D1D1>"
-   .. _"New Objectives" .. "</p>")
-
-   for idx,obj in ipairs{...} do
-      s = s .. obj.body
-   end
-   return s
-end
-
-
 -- =======================================================================
 --                                OBJECTIVES                                
 -- =======================================================================
 obj_claim_northeastern_rocks = {
    name = "mission quarry",
    title =_"Expand north-east and build a quarry",
-   body = obj_text(_"Expand north-east to the stones", _
-[[Build military buildings (like sentries or barriers) to expand your
-territory. Get to the rocks northeast from you and build a quarry there.]]
-   ),
+   number = 1,
+   body = objective_text(_"Expand north-east to the stones", _(
+[[Build military buildings (like sentries or barriers) to expand your territory. ]] .. 
+[[Get to the rocks north-east from you and build a quarry there.]]
+   )),
 }
 
 obj_build_mines = {
-name="mission mines",
-title=_"Start building mines on the mountain",
-body= obj_text(_"Build coal and iron ore mines", _
-[[Build a coal mine and an iron ore mine. To do so, place a flag up on the
-mountain's flank to the east (on mountain terrain though, not mountain meadow).
-When you click at the new flag you can send geologists there. Because the flag
-is on mountains, the geologists will search for ores; otherwise, they will
-search for water. Then build a mine for both kinds of resource he will find,
-choosing the mine to be built appropriately:<br> Black - coal<br> Red - iron
-ore<br> Yellow - gold<br> Grey - granite<br> Mines may only be built on
-mountain terrain. Suitable places for mines are displayed as hammer and pick.]]
+   name="mission mines",
+   title=_"Start building mines on the mountain",
+   number = 2,
+   body= objective_text(_"Build coal and iron ore mines", _(
+[[Build a coal mine and an iron ore mine. To do so, place a flag up on the mountain’s flank to the east ]] .. 
+[[(on mountain terrain though, not mountain meadow). When you click on the new flag, you can send geologists there. ]] .. 
+[[Because the flag is on a mountain, the geologists will search for ores; otherwise, they would search for water. ]] .. 
+[[Then build a mine for both kinds of resources that he will find, choosing the mine to be built appropriately:]]) .. "<br><br>" ..
+_[[Black – coal]] .. "<br>" ..
+_[[Red – iron ore]] .. "<br>" ..
+_[[Yellow – gold]] .. "<br>" ..
+_[[Grey – granite]] .. "<br><br>" ..
+_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as a mining symbol.]]
    )
 }
 
 obj_basic_food = {
    name="basic food began",
    title=_"Provide your miners with food",
-   body= obj_text(_"Build a hunter, a gamekeeper and a tavern", _
-[[In order to work, your miners need food.<br> A hunter can hunt down animals,
-while a gamekeeper prevents them from becoming extinct. The meat is then
-processed in a tavern into lunches for your miners.<br> This is only the
-first example of a ware which has to be refined before being used in a
-secondary building - others will follow.]]
+   number = 3,
+   body= objective_text(_"Build a hunter, a gamekeeper and a tavern", _
+[[In order to work, your miners need food.]] .. "<br><br>" ..
+_([[A hunter can hunt down animals, while a gamekeeper prevents them from becoming extinct. ]] .. 
+[[The meat is then processed in a tavern into lunches for your miners.]]) .. "<br><br>" ..
+_([[This is only the first example of a ware which has to be refined before being used in a secondary building]] .. 
+[[ – others will follow.]])
    )
 }
 
 obj_begin_farming = {
-name="farming began",
-title=_"Bake bread",
-body=obj_text(_ "Build a well, a farm and a bakery", _
-[[Other ways to produce food - different kinds of food - are fishers and
-hunters. The wheat of the farms has to be processed with water in a bakery
-before it becomes edible. You can obtain water by building a well at a spot
-where your geologists find a water source.]]
-   )
+   name="farming began",
+   title=_"Bake bread",
+   number = 3,
+   body=objective_text(_ "Build a well, a farm and a bakery", _(
+[[Other ways to produce food – different kinds of food – are fishers and hunters. ]] .. 
+[[The wheat of the farms has to be processed with water in a bakery before it becomes edible. ]] .. 
+[[You can obtain water by building a well at a spot where your geologists have found a water source.]]
+   ))
 }
 
 obj_refine_ores = {
-name="refining began",
-title=_"Refine your mined resources",
-body= obj_text(_ "Build a smelting works", _
-[[The iron ore your miners bring up is not usable yet - it has to be melted
-into iron first.]]
+   name="refining began",
+   title=_"Refine your mined resources",
+   number = 1,
+   body= objective_text(_ "Build a smelting works", _
+[[The iron ore your miners dig up is not usable yet – it has to be melted into iron first.]]
    )
 }
 
 obj_enhance_buildings = {
-name="enhance buildings",
-title=_"Enhance buildings and build a micro brewery",
-body= obj_text(_
+   name="enhance buildings",
+   title=_"Enhance buildings and build a micro brewery",
+   number = 3,
+   body= objective_text(_
 [[Enhance the coal mine and the tavern to the better versions of their
-buildings respectively. Also build a micro brewery.]], _
-[[A normal mine can only dig up about one third of all resources lying beneath
-it; then it must be enhanced to a deep mine in order to keep it working
-properly. To enhance a building, choose it and then click the appropriate
-button in the appearing window.<br> Workers gain experience by successful work.
-With enough experience they become more advanced workers, who are necessary to
-operate the enhanced buildings. Do not enhance a building before you have
-enough advanced workers to operate the advanced building! Such buildings
-usually have greater demands than the basic kind of that building - for
-instance, deep mines need snacks instead of rations. You will have to enhance
-your tavern to an inn in order to produce snacks out of pitta bread AND a
-second kind of food (meat or fish) AND beer. You may of course enhance all
-mines to deep mines instantly given you have the workers - bigger mines work a
-bit faster, smaller mines need cheaper food. It's up to you which strategy you
-prefer.]]
-   )
+buildings respectively. Also build a micro brewery.]], _(
+[[A normal mine can only dig up about one third of all the resources lying beneath it; ]] .. 
+[[then it must be enhanced to a deep mine in order to keep it working properly. ]] .. 
+[[To enhance a building, choose it and then click the appropriate button in the appearing window.]]) .. "<br><br>" ..
+_([[Workers gain experience by successful work. With enough experience, they become more advanced workers, ]] .. 
+[[who are necessary to operate the enhanced buildings. ]] .. 
+[[Do not enhance a building before you have enough advanced workers to operate the advanced building!]]) .. "<br><br>" ..
+_([[Such buildings usually have greater demands than the basic kind of that building]] .. 
+[[ – for instance, deep mines need snacks instead of rations. ]] .. 
+[[You will have to enhance your tavern to an inn in order to produce snacks out of pitta bread AND a second kind of food]] .. 
+[[ (meat or fish) AND beer. You may of course enhance all mines to deep mines instantly given you have the workers]] .. 
+[[ – bigger mines work a bit faster, smaller mines need cheaper food. It’s up to you which strategy you prefer.]]
+   ))
 }
 
 obj_better_material_1 = {
-name="built hardener",
-title=_"Build a wood hardener",
-body= obj_text(_ "Build a wood hardener", _
-[[Bigger and better buildings - including all military ones - require better
-building materials. They cannot be built of simple trunks - the wood has to be
-refined to blackwood by a wood hardener first. Always remember to build a wood
-hardener before you run out of blackwood, as without it you cannot expand.]]
-   )
+   name="built hardener",
+   title=_"Build a wood hardener",
+   number = 1,
+   body= objective_text(_ "Build a wood hardener", _(
+[[Bigger and better buildings – including all military ones – require better building materials. ]] .. 
+[[They cannot be built out of simple logs – the wood has to be refined to blackwood by a wood hardener first. ]] .. 
+[[Always remember to build a wood hardener before you run out of blackwood, as without it you cannot expand.]]
+   ))
 }
 
 obj_better_material_2 = {
-name="mission grindstone",
-title=_"Build a lime kiln and coal economy",
-body=obj_text(_"Build a lime kiln, a well and a charcoal burner or coal mine", _
-[[Better buildings may also require other improved materials besides blackwood.
-One of those is grout, which is produced out of raw stone, water and coal by a
-lime-burner. You can obtain water by building a well upon a water source, which
-your geologists can discover when you send them to any flag that is not on a
-mountain. Coal can be obtained by building a charcoal burner or a coal mine.]]
-   )
+   name="mission grindstone",
+   title=_"Build a lime kiln and coal economy",
+   number = 3,
+   body=objective_text(_"Build a lime kiln, a well and a charcoal burner or coal mine", _(
+[[Better buildings may also require other improved materials besides blackwood. ]] .. 
+[[One of these is grout, which is produced out of raw stone, water and coal by a lime-burner.]]) .. "<br><br>" ..
+_([[You can obtain water by building a well upon a water source, ]] .. 
+[[which your geologists can discover when you send them to any flag that is not on a mountain. ]] .. 
+[[Coal can be obtained by building a charcoal burner or a coal mine.]]
+   ))
 }
 
 obj_better_material_3 = {
-name="mission fernery",
-title=_"Build a fernery",
-body= obj_text(_"Build a fernery", _
-[[The third material necessary for improved buildings is thatch reed, used to
-cover roofs. Thatch reed is planted by a ferner around his building, the
-fernery.]]
-   )
+   name="mission fernery",
+   title=_"Build a reed yard",
+   number = 1,
+   body= objective_text(_"Build a reed yard", _(
+[[The third material necessary for improved buildings is thatch reed, used to cover roofs. ]] .. 
+[[Thatch reed is planted by a gardener around his building, the reed yard.]]
+   ))
 }
 
 obj_build_cattlefarm = {
    name = "mission cattlefarm", 
    title = _ "Build a cattlefarm",
-   body = obj_text(_"Build a cattlefarm", _
-[[When roads are under heavy load for a long time, one carrier is usually not
-enough to transport goods swiftly. Traffic jams are the consequence. Such roads
-therefore employ a second carrier: An ox that helps to carry the wares. This
-doubles the transport capacity.<br>Oxen are bred in cattle farms
-out of wheat and water.]]
+   number = 1,
+   body = objective_text(_"Build a cattlefarm", _(
+[[When roads are under heavy load for a long time, one carrier is usually not enough to transport goods swiftly. ]] .. 
+[[Traffic jams are the consequence. Such roads therefore employ a second carrier: ]] .. 
+[[An ox that helps to carry the wares. This doubles the transport capacity.]]) .. "<br><br>" ..
+_[[Oxen are bred in cattle farms out of wheat and water.]]
    )
 }
 
@@ -207,237 +150,273 @@
 --                     Texts for the Main Mission Thread                    
 -- =======================================================================
 briefing_msg_1 = {
-   title =_ "The story continues",
-   body = thron(_"Thron shakes his head...",
-_[[ "The war goes on. More and more of our brothers and sisters flee the brutal war raging in the capital beneath the trees.<br> The stories they tell about the deeds of our kin are sad to hear. I've spent nights lying awake, restless, more tired I ever believed one could be. Yet whenever I close my eyes, I see the fortress my father built consumed by flames. The Throne Among the Trees, the symbol of unity and peace among our kin, became the wedge that drives us apart." ]]
+   title =_ "The Story Continues",
+   body = thron(_"Thron is shaking his head...",
+_([[The war goes on. More and more of our brothers and sisters flee the brutal war raging ]] .. 
+[[in the capital beneath the trees.]]) .. "<br><br>" ..
+_([[The stories they tell about the deeds of our kin are sad to hear. ]] .. 
+[[I’ve spent nights lying awake, restless, more tired than I ever believed one could be. ]] .. 
+[[Yet whenever I close my eyes, I see the fortress my father built consumed by flames. ]] .. 
+[[The Throne Among the Trees, the symbol of unity and peace among our kin, became the wedge that drives us apart.]])
    )
 }
 
 briefing_msg_2 = {
-   title =_ "The story continues",
+   title =_ "The Story Continues",
    body = thron(
-_ [[ "Today my hunters brought men, women and little children who had hidden out in the forests, trying to escape the war, hate and revenge that rage among the tribes fighting each other like in old times, when we were no more but wild beasts driven and controlled by instincts. None of my brothers will ever gain and hold control over the wooden throne, none of the tribes will be strong enough to subdue the other. There will be no end to this slaughtering, unless... is this it? As father told me?<br> Rise against whoever threatens our very existence, may it even be one of your blood or mind?" ]]
+_([[Today my hunters brought men, women and little children before me who had hidden out in the forests, ]] .. 
+[[trying to escape the war, hate and revenge that rage among the tribes fighting each other like in olden times, ]] .. 
+[[when we were no more but wild beasts driven and controlled by instincts. ]] .. 
+[[None of my brothers will ever gain and hold control over the wooden throne, ]] .. 
+[[none of the tribes will be strong enough to subdue the other. T]] .. 
+[[here will be no end to this slaughter, unless... is this it? As father told me?]]) .. "<br><br>" ..
+_([[To rise against whoever threatens our very existence, even tough it may be one of your own blood or mind?]])
    )
 }
 
 
 briefing_msg_3 = {
-   title =_ "The story continues",
+   title =_ "The Story Continues",
    body = thron(
-_[[ "Boldreth seems more and more torn as the days go by. The spirits of my fellows sink as the cold season approaches, and we are still living in no more than huts and barracks. I never intended to stay out here in the wilderness for so long - but I never thought my brothers would engage in this senseless battle for so long either.<br> Perhaps it's time to make ourselves feel a little more at ease here. Perhaps it's time to give those who still live and think united a new home, replacing what is now lost to us? Until we can return to the place we once called our home..." ]]
+_([[Boldreth seems more and more torn as the days go by. ]] .. 
+[[The spirits of my fellows sink as the cold season approaches, and we are still living in no more than huts and barracks. ]] .. 
+[[I never intended to stay out here in the wilderness for so long]] .. 
+[[ – but I never thought my brothers would engage in this senseless battle for so long either.]]) .. "<br><br>" ..
+_([[Perhaps it’s time to make ourselves feel a little more at ease here. ]] .. 
+[[Perhaps it’s time to give those who still live and think united a new home, ]] .. 
+[[replacing what is now lost to us? Until we can return to the place we once called our home...]])
    )
 }
 
 
 order_msg_1 = {
-   title=_"Your loyal companion",
-   body = boldreth(_"Brave Boldreth steps aside you...",
-_[[ "So you want to prepare us for a longer stay in these forests, Thron? Well, I see the wisdom in doing so, yet my heart is yearning for a glorious return to Al'thunran. Too long have we waited while our brethren have fought on the battlefield, and our axes and swords have turned rusty over time." ]]
+   title=_"Your Loyal Companion",
+   body = boldreth(_"Brave Boldreth steps to your side...",
+_([[So you want to prepare us for a longer stay in these forests, Thron? ]] .. 
+[[Well, I see the wisdom in doing so, yet my heart is yearning for a glorious return to Al’thunran. ]] .. 
+[[Too long have we waited while our brethren have fought on the battlefield, ]] .. 
+[[and our axes and swords have turned rusty over time.]])
    )
 }
 
 
 order_msg_2 = {
-   title =_ "The advisor",
+   title =_ "The Advisor",
    body = khantrukh(_"Khantrukh joins in ...",
-_[[ "I beg your forgiveness, chieftain, but I have a grave concern to discuss with you. The rocks close to our camp are shrinking fast under our workers' tools, and it is a matter of little time only before they are all gone." ]]
+_([[I beg your forgiveness, chieftain, but I have a grave concern to discuss with you. ]] .. 
+[[The rocks close to our camp are shrinking fast under our workers’ tools, ]] .. 
+[[and it is a matter of little time only before they are all gone.]])
    )
 }
 
 order_msg_3 = {
-   title=_"Your loyal companion", 
+   title=_"Your Loyal Companion", 
    posx = 0,
    body = boldreth( _"Boldreth jumps up...", 
-_[["While it is certainly no worthy task for a warrior, at least it is
-something to be done! Thron, what do you say about me taking a few of our most
-restless warriors and venturing somewhat closer to the great mountain of
-Kal'mavrath - maybe we will find some more big stones to please the old man?"]]
+_([[While it is certainly no worthy task for a warrior, at least it is something to do! ]] .. 
+[[Thron, what would you say about my taking a few of our most restless warriors ]] .. 
+[[and venturing somewhat closer to the great mountain of Kal’mavrath]] .. 
+[[ – maybe we will find some more big stones to please the old man?]])
       ) .. new_objectives(obj_claim_northeastern_rocks),
 }
 
 order_msg_4 = {
-   title =_ "The advisor",
+   title =_ "The Advisor",
    posx = 0,
    body = khantrukh( _"Khantrukh grumbles...", _
-   [[ "Old man? Disrespectful youth!" ]]
+   [[Old man? Disrespectful youth!]]
    )
 }
 
 order_msg_5_quarry = {
-   title=_"The advisor",
+   title=_"The Advisor",
    body= khantrukh( _"Khantrukh nods satisfied...", _
-[[ "At last! These rocks should last for a while." ]]
+[[At last! These rocks should last for a while.]]
    )
 }
 
 order_msg_6_geologist = {
-   title=_"Your loyal companion",
-   body=boldreth(_"Boldreth exclaims...", _
-[["Just look at that! In the east is the great mountain of Kal'mavrath! I
-wonder what treasures nature might have hidden beneath its majestic flanks!<br>
-Let's expand to the east. There's a chance for the elderly to become useful
-once in a while! Let us send out some of those who understand the stone's
-tongue to unravel the mountain's secrets!"]]) .. new_objectives(obj_build_mines)
+   title=_"Your Loyal Companion",
+   body=boldreth(_"Boldreth exclaims...",
+_([[Just look at that! In the east is the great mountain of Kal’mavrath! ]] .. 
+[[I wonder what treasures nature might have hidden beneath its majestic flanks!]]) .. "<br><br>" ..
+_([[Let’s expand to the east. There’s a chance for the elderly to become useful once in a while! ]] .. 
+[[Let us send out some of those who understand the stone’s tongue to unravel the mountain’s secrets!]])
+   ) .. new_objectives(obj_build_mines)
 }
 
 order_msg_7_mines_up = {
-   title=_"Your loyal companion",
-   body=boldreth(_"Boldreth laughs...", _
-[[ "By Chat'Karuth's beard, this is awesome! Just imagine what we can use this coal and iron ore for!<br> It might even be enough to..." ]]
+   title=_"Your Loyal Companion",
+   body=boldreth(_"Boldreth laughs...", 
+_([[By Chat’Karuth’s beard, this is amazing! Just imagine what we can use this coal and iron ore for!]]) .. "<br><br>" ..
+_([[It might even be enough to...]])
    )
 }
 
 order_msg_8_mines_up = {
-   title=_"The advisor",
-   body =khantrukh(_"Khantrukh interrupts...", _
-[[ "While this is true, we should consider it later, for now other obstacles are at hand. The miners will definitely demand greater rations for working high up on the mountain in this bitter cold, and providing these supplies may not be easy." ]]
+   title=_"The Advisor",
+   body =khantrukh(_"Khantrukh interrupts...", 
+_([[While this is true, we should consider it later, for now other obstacles are at hand. ]] .. 
+[[The miners will definitely demand greater rations for working high up on the mountain in this bitter cold, ]] .. 
+[[and providing these supplies may not be easy.]])
    )
 }
 
 
 order_msg_9_hunter = {
-   title=_"Your loyal companion",
-   body=boldreth(_"Boldreth nods...", _
-[["I have to hand it to you: you are right here, old man.<br> There seem to be
-quite many animals in the forests here - we might just hunt down more of them.
-And, of course, the people would cheer to a new tavern - hey, we might call it
-'Thron's Pride' or so if you want!"]]) .. new_objectives(obj_basic_food)
+   title=_"Your Loyal Companion",
+   body=boldreth(_"Boldreth nods...", 
+_([[I have to hand it to you: you are right here, old man.]]) .. "<br><br>" ..
+_([[There seem to be quite a lot of animals in the forests here – we might just hunt down more of them. ]] .. 
+[[And, of course, the people would cheer a new tavern – hey, we might call it ‘Thron’s Pride’ or so if you want!]])
+   ) .. new_objectives(obj_basic_food)
 }
 
 order_msg_10_bread = {
-   title=_"The advisor",
-   body=khantrukh(_"The elder jumps into the air...", _
-[["Wisdom commands to seek variety.<br> North of the great mountain is a large
-plain - why don't we use the space Mother Nature gave us and build a farm? I
-sure would enjoy a freshly baked pitta bread for a change..."]]) ..
-   new_objectives(obj_begin_farming)
+   title=_"The Advisor",
+   body=khantrukh(_"The elder jumps into the air...", 
+_([[Wisdom commands to seek variety.
+
+North of the great mountain is a large plain – why don’t we use the space Mother Nature gave us and build a farm? ]] .. 
+[[I sure would enjoy a freshly baked pitta bread for a change...]])
+   ) .. new_objectives(obj_begin_farming)
 }
 
 order_msg_11_basic_food_began = {
-   title=_"Your loyal companion",
-   body=boldreth(_"Boldreth cheers up...", _
-[[ "Our hunters are out in the forests, Thron.<br> I promise you, before the sun sets today you will have a magnificent meal fit for the chieftain of all clans!" ]]
+   title=_"Your Loyal Companion",
+   body=boldreth(_"Boldreth cheers up...", 
+_([[Our hunters are out in the forests, Thron.]]) .. "<br><br>" ..
+_([[I promise you, before the sun sets today you will have a magnificent meal fit for the chieftain of all clans!]])
    )
 }
 
 order_msg_12_farming_began = {
-   title=_"The advisor",
+   title=_"The Advisor",
    body=khantrukh(_ "Khantrukh gazes over the plains...", 
-_[[ "Isn't it lovely, the view of golden fields, growing peacefully, dancing to the wind? And I believe the baker is just on his way here, with his most delicious bread reserved for our chieftain alone!" ]]
+_([[Isn’t it lovely, the view of golden fields, growing peacefully, dancing to the wind? ]] .. 
+[[And I believe the baker is just on his way here, with his most delicious bread reserved for our chieftain alone!]])
    )
 }
 
 order_msg_13_tavern = {
-   title=_"A beautiful morning",
-   body=thron(_"Thron recognizes...", _
-[[ "A tavern opened for our people yesterday. While I am hardly in the mood for celebration, I noticed how much this tiny bit of home meant to my people. Their songs filled the air until the deep night, and they were in higher spirit still the day after.<br> Maybe we actually are slowly creating a place here which we can... call home." ]]
+   title=_"A Beautiful Morning",
+   body=thron(_"Thron recognizes...", 
+_([[A tavern opened for our people yesterday. While I am hardly in the mood for celebration, ]] .. 
+[[I noticed how much this tiny bit of home means to my people. ]] .. 
+[[Their songs filled the air until deep in the night, and they were in higher spirits still the day after.]]) .. "<br><br>" ..
+_([[Maybe we actually are slowly creating a place here which we can... call home.]])
    )
 }
 
 order_msg_14_refine_ore = {
-   title=_ "Your loyal companion",
-   body= boldreth(_"Boldreth remarks...", _
-[["So now that we have both the mines and the food to sustain them, we should
-bring what our brave miners gain for us into a more useful state. The iron ore
-has to be melted into iron so that it is ready to be forged into whatever we
-want. And we need the coal to keep the smelter's ovens burning."]]) ..
-   new_objectives(obj_refine_ores)
+   title=_ "Your Loyal Companion",
+   body= boldreth(_"Boldreth remarks...", 
+_([[So now that we have both the mines and the food to sustain them, ]] .. 
+[[we should bring what our brave miners gain for us into a more useful state. ]] .. 
+[[The iron ore has to be melted into iron so that it is ready to be forged into whatever we want. ]] .. 
+[[And we need the coal to keep the smelter’s ovens burning.]])
+   ) .. new_objectives(obj_refine_ores)
 }
 
 order_msg_15_mines_exhausted = {
-   title=_ "The advisor", 
-   body = khantrukh(_"Khantrukh speaks...", _ 
-[["Our miners are digging up less and less by day! We have to go deeper,
-closer to the mountain's core, if we want more of its treasures!<br> Of course,
-it is dark and cold in such depths and only few venture voluntarily into these
-places. We should reward this bravery with greater rations for them. And a pint
-of beer or two will keep their spirits high."]]) .. 
-   new_objectives(obj_enhance_buildings)
+   title=_ "The Advisor", 
+   body = khantrukh(_"Khantrukh speaks...", 
+_([[Our miners are digging up less and less by the day! We have to go deeper, closer to the mountain’s core, ]] .. 
+[[if we want more of its treasures!]]) .. "<br><br>" ..
+_([[Of course, it is dark and cold in such depths and only a few venture voluntarily into these places. ]] .. 
+[[We should reward this bravery with greater rations for them. And a pint of beer or two will keep their spirits high.]])
+   ) .. new_objectives(obj_enhance_buildings)
 }
 
 order_msg_16_blackwood = {
-   title=_"Your loyal companion",
-   body= boldreth(_"Boldreth seems concerned...", _
-[["As I just discovered, we are running short on blackwood! We cannot put our
-warriors into some crumbling huts, and even less so in times as dangerous as
-ours!<br> We need a wood hardener, and we need one now!"]]) .. 
-   new_objectives(obj_better_material_1)
+   title=_"Your Loyal Companion",
+   body= boldreth(_"Boldreth seems concerned...", 
+_([[As I just discovered, we are running short on blackwood! We cannot put our warriors into some crumbling huts, ]] .. 
+[[and even less so in times as dangerous as ours!]]) .. "<br><br>" ..
+_([[We need a wood hardener, and we need one now!]])
+   ) .. new_objectives(obj_better_material_1)
 }
 
 order_msg_17_grindstone = {
-   title=_"Your loyal companion",
-   body= boldreth(_"Boldreth smiles...", _
-[["Well, old friend, this should ensure that our fortifications do not break
-down with our foes' first battle cry! Now we can expand safely!<br> Still, it
-would not hurt to assemble some grout for our further campaign; thus we could,
-in times of need, build a fortress as the world has not seen before!"]]) .. 
-   new_objectives(obj_better_material_2)
+   title=_"Your Loyal Companion",
+   body= boldreth(_"Boldreth smiles...", 
+_([[Well, old friend, this should ensure that our fortifications do not break down with our foes’ first battle cry! ]] .. 
+[[Now we can expand safely!]]) .. "<br><br>" ..
+_([[Still, it would not hurt to accumulate some grout for our further campaign; ]] .. 
+[[thus we could, in times of need, build a fortress such as the world has never seen before!]])
+   ) .. new_objectives(obj_better_material_2)
 }
 
 order_msg_18_fernery = {
-   title=_"The advisor", 
-   body= khantrukh(_"Khantrukh steps in...", _
-[["Chieftain, this is a disgrace! It is well that we can produce grout for
-mighty fortifications and great buildings now - only this does not prevent our
-roofs from becoming leaky! Maybe the young ones like spending their nights in
-the rain, but I just can't find any sleep with these raindrops dripping on my
-face!<br> Now this is a problem we should do something about!"]]) .. 
-   new_objectives(obj_better_material_3)
+   title=_"The Advisor", 
+   body= khantrukh(_"Khantrukh steps in...", 
+_([[Chieftain, this is a disgrace! ]] .. 
+[[It is well that we can produce grout for mighty fortifications and great buildings now]] .. 
+[[ – only this does not prevent our roofs from becoming leaky! ]] .. 
+[[Maybe the young ones like spending their nights in the rain, ]] .. 
+[[but I just can’t find any sleep with these raindrops dripping on my face!]]) .. "<br><br>" ..
+_([[Now this is a problem we should do something about!]])
+   ) .. new_objectives(obj_better_material_3)
 }
 
 order_msg_19_all_material = {
-   title=_"The advisor",
-   body=khantrukh(_"Khantrukh seems relieved...", _
-[[ "Wonderful! Our roofs are not dripping anymore, and we have all the material we need for, well, whichever monumental building we see fit!" ]]
+   title=_"The Advisor",
+   body=khantrukh(_"Khantrukh seems relieved...", 
+_([[Wonderful! Our roofs are not dripping anymore, and we have all the material we need for, ]] .. 
+[[well, whichever monumental building we see fit!]])
    )
 }
 
 msg_mission_complete = {
    title=_"Mission Complete",
-   body= thron( _
-[["The other day Boldreth asked me to accompany him to the new inn. It would
-cheer me up, he said.<br> When I looked around, I saw faithful faces, trusting
-that I could guide them through these dark days. Yet before I could speak any
-words of gratitude or encouragement, one of my warriors ran into the inn. He
-had been far out in the forest for the past days and I could see how weary he
-was.<br> The news he brought changed everything..."]]) .. rt(
-      h1(_"Victory") .. p(_
-[[You have completed this mission. You may continue playing if you wish,
-otherwise move on to the next mission.]]
-      )
+   body= thron( 
+_([[The other day Boldreth asked me to accompany him to the new inn. It would cheer me up, he said.]]) .. "<br><br>" ..
+_([[When I looked around, I saw faithful faces, trusting that I could guide them through these dark days. ]] .. 
+[[Yet before I could speak any words of gratitude or encouragement, one of my warriors ran into the inn. ]] .. 
+[[He had been far out in the forest for the past days and I could see how weary he was.]]) .. "<br><br>" ..
+_([[The news he brought changed everything...]])
+   )..  objective_text(_"Victory", 
+   _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]
    )
 }
 
 msg_cattlefarm_00 = {
-   title = _ "We need oxen!",
-   body = khantrukh(_ "Khantrukh speaks", _
-[["As our realm gets bigger and bigger, the traffic on the roads gets
-overwhelming. Our poor carriers are no longer able to transport the goods as
-fast as we need them to. I suggest we give them some support by breeding
-oxen.<br> They are amazing animals: The ox is as swift as a human being while
-being much stronger and very frugal: all we need is wheat and water to breed
-them and they will do their work on the roads loyally and reliably."]]) .. 
-   new_objectives(obj_build_cattlefarm)
+   title = _ "We Need Oxen!",
+   body = khantrukh(_ "Khantrukh speaks...", 
+_([[As our realm is getting bigger and bigger, the traffic on the roads is overwhelming. ]] .. 
+[[Our poor carriers are no longer able to transport the goods as fast as we need them to. ]] .. 
+[[I suggest we give them some support by breeding oxen.]]) .. "<br><br>" ..
+_([[They are amazing animals: The ox is as swift as a human being while being much stronger and very frugal: ]] .. 
+[[all we need is wheat and water to breed them and they will do their work on the roads loyally and reliably.]])
+   ) .. new_objectives(obj_build_cattlefarm)
 }
 
 msg_story_1 = {
-   title=_"One fullmoon night",
-   body=thron(_"Thron speaks...", _
-[[ "One night, when the moon shone brightly, I climbed to the peak of Kal'mavrath.<br> When I gazed at the horizon, I still saw crimson lights flicker in the distance. It is incredible how much passion my brethren fight this war with. I fear the moment I see Al'thunran again - will there be anything but ashes and wasted ruins left of our once beautiful capital when we get there?" ]]
+   title=_"One Full Moon Night",
+   body=thron(_"Thron speaks...", 
+_([[One night, when the moon shone brightly, I climbed to the peak of Kal’mavrath.]]) .. "<br><br>" ..
+_([[When I gazed at the horizon, I still saw crimson lights flicker in the distance. ]] .. 
+[[It is incredible with how much passion my brethren fight this war. ]] .. 
+[[I fear the moment I will see Al’thunran again]] .. 
+[[ – will there be anything but ashes and wasted ruins left of our once beautiful capital when we get there?]])
    )
 }
 
 msg_story_2 = {
-    title= _"Another cold day",
-    body=thron(_"Thron looks worried...", _
-[[ "The winter is upon us. Many of us are suffering from the cold, yet we must endure. The day we may return cannot be far anymore - it must not be far anymore.<br> I prayed it might get warmer again, as I prayed the war would finally come to an end.<br> So far, it seems that neither prayer was fulfilled." ]]
+    title= _"Another Cold Day",
+    body=thron(_"Thron looks worried...", 
+_([[The winter is upon us. Many of us are suffering from the cold, yet we must endure. ]] .. 
+[[The day we may return cannot be far anymore – it must not be far anymore.]]) .. "<br><br>" ..
+_([[I prayed that it might get warmer again, as I prayed that the war would finally come to an end.]]) .. "<br><br>" ..
+_([[So far, it seems that neither prayer was fulfilled.]])
    )
 }
 
 msg_village = {
-   title=_"A friendly village joined us!",
-   body= thron(_"Thron speaks...",_
-[[ "We have found a village with friendly and productive people, impressed by our wealth, technology and strength.<br> They have decided to join us!" ]]
+   title=_"A friendly village has joined us!",
+   body= thron(_"Thron speaks...",
+_([[We have found a village with friendly and productive people, impressed by our wealth, technology and strength.]]) .. "<br><br>" ..
+_([[They have decided to join us!]])
    )
 }
 
 
=== modified file 'campaigns/t03.wmf/elemental'
--- campaigns/t03.wmf/elemental	2010-11-18 10:39:43 +0000
+++ campaigns/t03.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -4,7 +4,7 @@
 map_h="112"
 nr_players="4"
 world="winterland"
-name=_"03 - This Land is our Land"
+name=_"03 – This Land is Our Land"
 author="Wolfpac & Nasenbaer"
 descr=_"This tutorial explains the handling of military and training site buildings and will introduce fighting."
 background="tribes/barbarians/pics/campmap-tut3.jpg"
 
=== modified file 'campaigns/t03.wmf/scripting/texts.lua'
--- campaigns/t03.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/t03.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -1,141 +1,153 @@
--- =========================
--- Some formating functions
--- =========================
--- Rich Text
-function rt(text_or_opts, text)
-   k = "<rt>"
-   if text then
-      k = ("<rt %s>"):format(text_or_opts)
-   else
-      text = text_or_opts
-   end
-
-   return k .. text .. "</rt>"
-end
-
--- Headings
-function h1(s)
-   return "<p font=DejaVuSerif font-size=18 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=8> <br></p>"
-end
-   
-function direct_speech(heading, text)
-   return "<p font-size=24 font-face=DejaVuSerif font-weight=bold " ..
-      "font-color=2F9131>" .. heading .. "</p><p font-size=8> <br></p>" .. text
-end
-
--- Simple flowing text. One Paragraph
-function p(s)
-   return "<p line-spacing=3 font-size=12>" .. s .. "<br></p>" ..
-      "<p font-size=8> <br></p>"
-end
-
--- No logic below
+use("aux", "formatting")
+use("aux", "format_scenario")
+
+function thron(title, text)
+   return speech("map:chieftain.png", "2F9131", title, text)
+end
+function khantrukh(title, text)
+   return speech("map:khantrukh.png", "8080FF", title, text)
+end
+function boldreth(title, text)
+   return speech("map:boldreth.png", "FF0000", title, text)
+end
 
 -- =======================================================================
 --                            Objective messages
 -- =======================================================================
+
+
 obj_build_small_food_economy = {
    name = "build_small_food_economy",
    title=_"Build up a small food economy",
-   body = "<rt><p line-spacing=3 font-size=12>" ..
-_[[* Build up a basic food economy - a fisher's hut, a hunter's hut, a well, a farm and a bakery, to provide your people with food.]] ..
-"</p></rt>",
+   number = 5,
+   body = objective_text(_"Build up a small food economy", 
+[[• ]] .. _([[Build up a basic food economy to provide your people with food]] ..
+[[ – a fisher’s hut, a hunter’s hut, a well, a farm and a bakery.]])),
 }
 
 obj_build_cattlefarm = {
    name = "obj_build_cattlefarm",
-   title = _ "Remember to build a cattle farm",
-   body = rt(p(_
-[[As your roads grow longer and your economy bigger you should make good use
- of your oxen to help transport wares quicker. Remember to build a cattle
- farm!]]))
+   title = _ "Build a cattle farm",
+   number = 1,
+   body = objective_text(_"Remember to build a cattle farm", 
+_([[As your roads grow longer and your economy bigger, you should make good use of your oxen ]] ..
+[[to help transport wares more quickly. Remember to build a cattle farm!]])),
 }
 
 obj_build_a_donjon = {
    name = "build_a_donjon",
    title=_"Build a donjon",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build a donjon at the northeast of your territory to get a farther visual range and to protect your people from sudden attacks of enemies." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Build a donjon",
+[[• ]] .. _([[Build a donjon at the north-east of your territory to get greater visual range ]] ..
+[[and to protect your people from sudden attacks of enemies.]])),
 }
 
 obj_explore_further = {
    name = "explore_further",
    title=_"Explore further",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build more military buildings to explore the area around the headquarters and to ensure the safety of your people." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Explore further",
+[[• ]] .. _([[Build more military buildings to explore the area around the headquarters ]] ..
+[[and to ensure the safety of your people.]])),
 }
 
 obj_build_mining_economy = {
    name = "build_mining_economy",
-   title=_"Build mines",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metalworks." ..
-"</p></rt>",
+   title=_"Build a mining infrastructure",
+   number = 6,
+   body = objective_text(_"Build a mining infrastructure",
+[[• ]] .. _([[Expand your territory to the mountains, send geologists to search for ore and coal ]] ..
+[[and build a mining economy with mines, taverns, smelting works and metalworks.]])),
 }
 
 obj_build_a_fortress = {
    name = "build_a_fortress",
    title=_"Build a fortress",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build a fortress to the east of the mountains." ..
-"</p></rt>",
-}
+   number = 1,
+   body = objective_text(_"Build a fortress",
+[[• ]] .. _"Build a fortress to the east of the mountains."),
+}
+
+obj_build_training_infrastructure = {
+   name = "build_training_infrastructure",
+   title=_"Build a training infrastructure",
+   number = 4,
+   body = objective_text(_"Build a training infrastructure",
+[[• ]] .. _"Build a battle arena and a training camp to the west of the mountains." ..
+"<br>" ..
+[[• ]] .. _([[Enhance your metal workshop to an axfactory in order to produce weapons, ]] ..
+[[and build up a second metal workshop to ensure the production of tools. ]] ..
+[[When the blacksmith reaches his next level (master blacksmith), ]] ..
+[[you can even enhance the axfactory to a war mill, which will produce additional weapons.]]) ..
+"<br>" ..
+[[• ]] .. _"Build a helmsmithy to the west of the mountains to provide your soldiers with better armor."),
+}
+
 
 obj_build_a_warehouse = {
    name = "build_a_warehouse",
    title=_"Build a warehouse",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build a warehouse to the west of the mountains." ..
-"<br>" ..
-_"-> Warehouses are similar to your headquarters, with the only difference that it is not defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Build a warehouse",
+[[• ]] .. _"Build a warehouse to the west of the mountains." ..
+"<br><br>" ..
+[[→ ]] .. _([[Warehouses are similar to your headquarters, ]] ..
+[[with the only difference that they aren’t defended by soldiers. ]] ..
+[[It is often wise to build a warehouse when your territory is growing ]] ..
+[[and the paths to your headquarters get longer and longer.]])),
 }
 
 obj_build_trainingssites = {
    name = "build_trainingssites",
-   title=_"Build trainingssites",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build a battle arena and a trainings camp to the west of the mountains." ..
+   title=_"Build training sites",
+   number = 2,
+   body = objective_text(_"Build training sites",
+[[• ]] .. _"Build a battle arena and a training camp to the west of the mountains." ..
 "<br>" ..
-_"-> Trainingssites like a training camp or a battle arena are used for training soldiers in their different attributes. Those attributes are important in fights and the better a soldier is, the higher is the chance to win a fight.<br>Attributes are: health points, attack, defense and evade." ..
-"</p></rt>",
+[[→ ]] .. _([[Training sites like a training camp or a battle arena are used ]] ..
+[[for training soldiers in their different attributes. ]] ..
+[[These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight.]]) .. "<br>" ..
+_"The attributes are: health points, attack, defense and evade."),
 }
 
 obj_build_weapon_productions = {
    name = "build_weapon_productions",
-   title=_"Build weapon productions",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Enhance your metalworks to an axefactory to start producing weapons, and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance your axefactory to a war mill." ..
-"</p></rt>",
+   title=_"Build weapons production",
+   number = 3,
+   body = objective_text(_"Build weapons production",
+[[• ]] .. _([[Enhance your metal workshop to an axfactory in order to produce weapons, ]] ..
+[[and build up a second metal workshop to ensure the production of tools. ]] ..
+[[When the blacksmith reaches his next level (master blacksmith), ]] ..
+[[you can even enhance the axfactory to a war mill, which will produce additional weapons.]])),
 }
 
 obj_build_a_helmsmithy = {
    name = "build_a_helmsmithy",
    title=_"Build a helmsmithy",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Build a helmsmithy to the west of the mountains to provide your soldiers with better armor." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Build a helmsmithy",
+[[• ]] .. _"Build a helmsmithy to the west of the mountains to provide your soldiers with better armor."),
 }
 
 obj_destroy_kalitaths_army = {
    name = "destroy_kalitaths_army",
-   title=_"Destroy Kalitaths army",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Destroy Kalitaths army and expand your territory to the east." ..
-"<br>" ..
-_"-> To attack an enemy you must click on the door of an adversary's military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
-"</p></rt>",
+   title=_"Destroy Kalitath’s army",
+   number = 2,
+   body = objective_text(_"Destroy Kalitath’s army",
+[[• ]] .. _"Destroy Kalitath’s army and expand your territory to the east." ..
+"<br><br>" ..
+[[→ ]] .. _([[To attack an enemy, you must click on the door of an adversary’s military building. ]] ..
+[[A menu will pop up allowing you to select the number of soldiers that should attack. ]] ..
+[[When you are ready with setting the number, click on the cross (‘Start Attack’).]])),
 }
 
 obj_military_assault_on_althunran = {
    name = "military_assault_on_althunran",
    title=_"Military assault on Al’thunran",
-   body= "<rt><p line-spacing=3 font-size=12>" ..
-_"* Destroy all enforcements of Thron’s two brothers to liberate the throne-circle." ..
-"</p></rt>",
+   number = 1,
+   body = objective_text(_"Military assault on Al’thunran",
+[[• ]] .. _"Destroy all forces of Thron’s two brothers to liberate the throne-circle."),
 }
 
 -- =======================================================================
@@ -143,237 +155,252 @@
 -- =======================================================================
 story_msg_1 = {
    posy=1,
-   title=_"Close to home",
-   body ="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron looks worried..." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-
-_[[ "These last days we came closer to our capital. Many people have already joined us on our march and set their hopes on me. However, I fear that we are not strong enough to take up the battle with my brothers.<br>For now we rest at the borders of the old forest and prepare for the coming days." ]] ..
-"</p></rt>",
+   title=_"Close to Home",
+   body =thron(_"Thron looks worried...",
+_([[These last days, we came closer to our capital. ]] ..
+[[Many people have already joined us on our march and set their hopes on me. ]] ..
+[[However, I fear that we are not strong enough to take up the battle against my brothers.]]) ..
+"<br><br>" ..
+_([[For now, we are resting at the borders of the old forest and preparing for the coming days.]])),
 }
 
 story_msg_2 = {
    posy=1,
-   title=_"Another cold day",
-   body ="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron looks worried." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The news that a patrol brought is not good to hear. Our spies tell us, that the wartribes still rage in battle but some of the elder soldiers and tribe leaders seem to grow tired of this senseless war. Kalitath, son of Kun is the first warleader to leave Al’thunran, thus leaving his side weak and vulnerable. As my scouts report, he has set foot on the lower grounds around the capitol, securing the outer fortification rings." ]] ..
-"</p></rt>",
+   title=_"Another Cold Day",
+   body =thron(_"Thron looks worried...",
+_([[The news that a patrol brought is not good to hear. ]] ..
+[[Our spies tell us that the war tribes still rage in battle, ]] ..
+[[but some of the elder soldiers and tribe leaders seem to grow tired of this senseless war. ]] ..
+[[Kalitath, son of Kun is the first war leader to leave Al’thunran, thus leaving his side weak and vulnerable. ]] ..
+[[As my scouts report, he has set foot on the lower grounds around the capital, ]] ..
+[[securing the outer fortification rings.]])),
 }
 
 story_msg_3 = {
    title=_"Doubts",
    posy=1,
-   body ="<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Boldreth shakes his head." ..
-"</p></rt><rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "Thron seeks to believe that Kalitath is tired of fighting and will be willing to join us, once we march to re-establish law and order in Al’thunran. But I don’t think so. Kalitath is son to one of the mightiest generals of our forces and his family never quite liked the thought to bow before the banner of Chat’Karuth. Why should he march with his son to reclaim his heritage and the throne?" ]] ..
-"</p></rt>",
+   body = boldreth(_"Boldreth is shaking his head...",
+_([[Thron seeks to believe that Kalitath is tired of fighting and would be willing to join us ]] ..
+[[once we march to re-establish law and order in Al’thunran. But I don’t think so. ]] ..
+[[Kalitath is son to one of the mightiest generals of our forces ]] ..
+[[and his family never quite liked the thought of bowing before the banner of Chat’Karuth. ]] ..
+[[Why should he march with Chat’Karuth’s son to reclaim his heritage and the throne?]])),
 }
 
 story_msg_4 = {
    posy=1,
-   title=_"The story continues",
-   body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "However, Thron is not willing to listen to my doubts. He seeks to expand our fortifications to the borders of Kalitath’s territory and reunite with his forces. I have to keep an eye on everything that happens here." ]] ..
-"</p></rt>",
+   title=_"The Story Continues",
+   body= boldreth(
+_([[However, Thron is not willing to listen to my doubts. ]] ..
+[[He seeks to expand our fortifications to the borders of Kalitath’s territory and to reunite with his forces. ]] ..
+[[I have to keep an eye on everything that happens here.]])),
 }
 
 story_msg_5 = {
    posy=1,
-   title=_"Another cold day",
-   body= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron speaks confidently." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The frontier line of my forces has expanded to the edge of the forests. We have a long and cold winter and so many miles behind us. The fortification that we erected around Ondun will guarantee us a fast supply of men and goods and once Al’thunran is in my hands, the two cities will be linked by a good and defendable infrastructure. Still I hope I will not walk alone on this mission, I hope Kalitath son of Kun will follow my call." ]] ..
-"</p></rt>",
+   title=_"Another Cold Day",
+   body= thron(_"Thron is speaking confidently.",
+_([[The frontier line of my forces has expanded to the edge of the forests. ]] ..
+[[We have a long and cold winter and so many miles behind us. ]] ..
+[[The fortification that we erected around Ondun will guarantee us a fast supply of men and goods, ]] ..
+[[and once Al’thunran is in my hands, the two cities will be linked by a good and defensible infrastructure. ]] ..
+[[Still, I hope I will not walk alone on this mission, I hope Kalitath son of Kun will follow my call.]])),
 }
 
 story_msg_6 = {
    posy=1,
-   title=_"The story continues",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I wait won't be lost. I will further upgrade my soldiers and prepare for battle." ]] ..
-"</p></rt>",
+   title=_"The Story Continues",
+   body= thron(
+_([[I have sent men to meet with Kalitath in his fortress. ]] ..
+[[He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. ]] ..
+[[He will not let anyone enter or leave the city while the ring is intact. ]] ..
+[[Until now, he has not answered any of my messages. But the time I spend waiting won’t be lost. ]] ..
+[[I will further upgrade my soldiers and prepare for battle.]])),
 }
 
 order_msg_7_destroy_kalitaths_army = {
-   title=_"Your loyal companion",
-   body= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=FF0000>" ..
-_"Boldreth shouts out!" ..
-"</p></rt><rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "This BASTARD! Only one man of our frontier patrol came back alive. He carried a message from Kalitath telling us that he will punish every move of our troops with their own blood! We cannot accept this behaviour. From now on there is war between Kalitath and us!" ]] ..
-"<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Destroy Kalitath's army and expand your territory to the east." ..
-"<br>" ..
-_"-> To attack an enemy you must click on the door of an adversary's military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
-"</p></rt>",
+   title=_"Your Loyal Companion",
+   body= boldreth(_"Boldreth shouts out!",
+_([[The BASTARD! Only one man of our frontier patrol came back alive. ]] ..
+[[He carried a message from Kalitath, telling us that he will punish every move of our troops with their own blood! ]] ..
+[[We cannot accept this behavior. From now on, there is war between Kalitath and us!]]))
+.. new_objectives(obj_destroy_kalitaths_army),
 }
 
+
+
 order_msg_7_renegade_fortification = {
    posy = 1,
-   title=_"Renegade fortification",
-   body= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron speaks:" ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The traitor has left his armies dying where they lay as he saw that he would not keep my forces back. Kalitath disappeared in the mess of the war, but I don’t care now. Shall he flee and be forgotten for all times as a tribeleader that would not bow before the wooden throne, that is mine to take now. Even more his flight brought us a big benefit: All year Kalitath was so busy fighting that he did not even care to store enough food for all his men. Now that he has fled, their hunger has brought some of his younger followers to desert. This group holds a strong fortification on the main ring. But there is more news: My scouts reported, that the two raging tribes of my brothers are in chaos and have barely noticed the new danger that is about to strike them. However they would not care if they noticed I guess, blinded by rage and hate, there is no sense left in them at all I believe." ]] ..
-"</p></rt>",
+   title=_"Renegade Fortification",
+   body= thron(_"Thron says:",
+_([[The traitor left his armies dying where they lay when he saw that he would not keep my forces back. ]] ..
+[[Kalitath disappeared in the confusion of the war, but I don’t care now. ]] ..
+[[Shall he flee and be forgotten for all times as a tribal leader that would not bow before the wooden throne, ]] ..
+[[that is mine to take now.]]) .. "<br><br>" ..
+_([[Furthermore, his flight brought us a great benefit: ]] ..
+[[all year, Kalitath was so busy fighting that he did not even care to store enough food for all his men. ]] ..
+[[Now that he has fled, their hunger has caused some of his younger followers to desert. ]] ..
+[[This group holds a strong fortification on the main ring.]]) ..
+_([[But there is more news: ]] ..
+[[My scouts have reported that the two raging tribes of my brothers are in chaos ]] ..
+[[and have barely noticed the new danger that is about to strike them. ]] ..
+[[However, they would not care if they noticed I guess, blinded by rage and hate, ]] ..
+[[there is no sense left in them at all I believe.]])),
 }
 
 briefing_msg_1 = {
    posy=1,
-   title=_"Winter ahead",
-   body= "<rt><p font-size=24 font-weight=bold font-face=DejaVuSerif font-color=2F9131>" ..
-_"Boldreth speaks:" ..
-"</p></rt><rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "This morning I found Thron trouble-minded. He returned from his patrol late last night and sat back against a tree watching over the encampment. The number of quarrels and disputes keeps growing and the winter has us firmly in its grip. We should put food in our storage to survive the long, cold winter!" ]] ..
-"</p></rt>",
+   title=_"Winter Ahead",
+   body= boldreth(_"Boldreth says:",
+_([[This morning, I found Thron’s mind troubled. He returned from his patrol late last night ]] ..
+[[and sat back against a tree, watching over the encampment. ]] ..
+[[The number of quarrels and disputes keeps growing, and the winter has us firmly in its grip. ]] ..
+[[We should put food in our storage to survive the long, cold winter!]])),
 }
 
 order_msg_1_small_food_economy = {
    posy=1,
-   title=_"The advisor",
-   body= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=8080FF>" ..
-_"Khantrukh nods" ..
-"</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "Boldreth is right! We don't have enough food to survive a long, cold winter. We should start to build a well, a fisher's and a hunter's hut. And if we find enough space, we should as well build up a farm and a bakery! One of our farmers seems to be very clever he already got some crops to grow in this cold soil." ]] ..
-"<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Build up a basic food economy - a fisher's hut, a hunter's hut, a well, a farm and a bakery, to provide your people with food." ..
-"</p></rt>",
+   title=_"The Advisor",
+   body= khantrukh(_"Khantrukh nods.",
+_([[Boldreth is right! We don’t have enough food to survive a long, cold winter. ]] ..
+[[We should start to build a well, a fisher’s and a hunter’s hut. ]] ..
+[[And if we find enough space, we should as well build up a farm and a bakery! ]] ..
+[[One of our farmers seems to be very clever – he already got some crops to grow in this cold soil.]]))
+.. new_objectives(obj_build_small_food_economy),
 }
 
 story_note_1 = {
    posy=1,
-   title=_"Food economy completed",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Khantrukh just informed me, that our basic food economy was built up successfully. Finally none of us has to fear starvation anymore.]] ..
-"</p></rt>",
+   title=_"Food Economy Completed",
+   body= thron(
+_([[Khantrukh has just informed me that our basic food economy was built up successfully. ]] ..
+[[Finally, none of us has to fear starvation anymore.]])),
 }
 
 order_msg_2_build_a_donjon = {
    posy=1,
    title=_"Tracks",
-   body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-   _[[ "Thron told me that he discovered tracks in the snow to the northeast of our settlement. He instructed us to build a Donjon, to have a greater visual range on the area around our hall to protect our people from sudden attacks." ]] ..
-   "<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Build a donjon at the northeast of your territory." ..
-"</p></rt>",
+   body= boldreth(
+   _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. ]] ..
+[[He has instructed us to build a Donjon, to have a greater visual range over the area around our hall ]] ..
+[[to protect our people from sudden attacks.]]))
+.. new_objectives(obj_build_a_donjon),
 }
 
 order_msg_3_explore_further = {
    posy=1,
-   title=_"Further explorations",
-   body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "The first fortification Thron ordered has just been completed. At the moment he seeks to bring trust and belief to those who live inside the walls of our new habitat, that we named 'Ondun', which means 'those who wait' in the old tongue. But Thron is not yet satisfied - and I fully understand his fears: The forests are deep and the frontier to Al’thunran is near. I am sure that there are a thousand greater dangers out there than the unknown tracks.<br>To overlook more of the area around our hall we should explore further and set up more guards and scouts to observe the frontier and keep an eye on the raging wars on our doorsteps. THEN we will be prepared once trouble seeks to capture our woods." ]] ..
+   title=_"Further Exploration",
+   body= boldreth(
+_([[The first fortification Thron ordered has just been completed. ]] ..
+[[At the moment, he seeks to bring trust and belief to those who live inside the walls of our new habitat, ]] ..
+[[that we named ‘Ondun’, which means ‘those who wait’ in the old tongue. ]] ..
+[[But Thron is not yet satisfied – and I fully understand his fears: ]] ..
+[[the forests are deep, and the frontier to Al’thunran is near. ]] ..
+[[I am sure that there are a thousand greater dangers out there than the unknown tracks.]]) ..
 "<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Build more military buildings to explore the area around the headquarters and to ensure the safety of your people." ..
-"</p></rt>",
+_([[To overlook more of the area around our hall, we should explore further ]] ..
+[[and set up more guards and scouts to observe the frontier ]] ..
+[[and keep an eye on the raging wars on our doorstep. ]] ..
+[[THEN we will be prepared once trouble seeks to capture our woods.]]))
+.. new_objectives(obj_explore_further),
 }
 
 order_msg_4_build_mining_economy = {
    posy=1,
-   title=_"Mountains found",
-   body= "<rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "I just talked to the leader of our patrol. He told me, that they found some mountains to the north east and the east of our territory. With a bit of luck this opens us a new chance for rearming our men, because as far as I remember, most of the mountains west to Al'thunran hold coal and some metal ores." ]] ..
-"<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metalworks." ..
-"</p></rt>",
+   title=_"Mountains Found",
+   body= khantrukh(
+_([[I have just spoken to the leader of our patrol. ]] ..
+[[He told me that they found some mountains to the north-east and east of our territory. ]] ..
+[[With a bit of luck this will open up a new chance for rearming our men, ]] ..
+[[because as far as I remember, most of the mountains west to Al’thunran hold coal and some metal ores.]]))
+.. new_objectives(obj_build_mining_economy),
 }
 
 story_note_2 = {
    posy=1,
-   title=_"Mining economy completed",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "I just got informed, that our mining economy started its work. This news brought a smile to my face - even if the hardest part is still waiting to be done, now our smiths will give their best to further ease our lives." ]] ..
-"</p></rt>",
+   title=_"Mining Economy Completed",
+   body= thron(
+_([[I just got informed that our mining economy has started its work. ]] ..
+[[This news brought a smile to my face – even if the hardest part is still waiting to be done, ]] ..
+[[now that our smiths will give their best to further ease our lives.]])),
 }
 
 order_msg_5_build_a_fortress = {
    posy=1,
-   title=_"Fortress needed",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Boldreth and I just explored the area around the three mountains. One major strategic problem of that area seems to be, that there are two bigger passages - one north and one south to the middle mountain. Those passages are quite hard to control and so it seems to me, like we have only one chance to secure the mountains from enemy hands: We must build a fortress to the east of the mountains!" ]] ..
-"<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Build a fortress to the east of the mountains." ..
-"</p></rt>",
+   title=_"Fortress Needed",
+   body= thron(
+_([[Boldreth and I just explored the area around the three mountains. ]] ..
+[[One major strategic problem of that area seems to be that there are two bigger passages]] ..
+[[ – one north and one south of the central mountain. Those passages are quite hard to control, ]] ..
+[[and so it seems to me like we have only one chance to secure the mountains from enemy hands: ]] ..
+[[We must build a fortress to the east of the mountains!]]))
+.. new_objectives(obj_build_a_fortress),
 }
 
 story_note_3 = {
    posy=1,
-   title=_"Fortress completed",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "Finally!<br>The fortress was just completed, so the entrance to our settlement should be safe for now. For the future we might think on building some more fortifications like barriers and donjons at the passages, but for now we can take a deep breath." ]] ..
-"</p></rt>",
+   title=_"Fortress Completed",
+   body=thron(
+_([[Finally! The fortress has just been completed, so the entrance to our settlement should be safe for now. ]] ..
+[[For the future, we might think on building some more fortifications like barriers and donjons at the passages, ]] ..
+[[but for now we can take a deep breath.]])),
 }
 
 order_msg_6_build_enhanced_economy_and_training = {
    posy=1,
-   title=_"Enhanced economy and training",
-   body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "Our mining economy seems to work fine, that is already good news! Anyway there are still a lot of men and women waiting in our hall to get a task, so they can help our soldiers to prepare for the future fights.]] ..
-"<br>" ..
-_[[Our geologists found a lot more deposits of iron ore, coal and even gold. We should enhance our current mines as soon as our miners are more experienced. We should build up some more mines, a bigger food infrastructure to always supply our men with sufficient food and a further processing economy. But that's still not everything - most of our soldiers are quite young and neither have a good weapon nor are they well trained. We should build up trainingssites to prepare them for their future tasks." ]] ..
+   title=_"Enhanced Economy and Training",
+   body= boldreth(
+_([[Our mining economy seems to work fine, that is already good news! ]] ..
+[[Anyway, there are still a lot of men and women waiting in our hall to get a task, ]] ..
+[[so they can help our soldiers to prepare for the future fights.]]) ..
 "<br><br>" ..
-_"-- NEW OBJECTIVES --" ..
-"<br>" ..
-_"* Build a warehouse to the west of the mountains." ..
-"<br>" ..
-_"* Build a battle arena and a trainings camp to the west of the mountains." ..
-"<br>" ..
-_"* Enhance your metalworks to an axefactory in order to produce weapons and build up another metalworks to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance it to a war mill which produces additional weapons." ..
-"<br>" ..
-_"* Build a helmsmithy to the west of the mountains to provide your soldiers with better armor." ..
-"</p></rt>",
+_([[Our geologists found a lot more deposits of iron ore, coal and even gold. ]] ..
+[[We should enhance our current mines as soon as our miners are more experienced. ]] ..
+[[We should build up some more mines, a bigger food infrastructure ]] ..
+[[to always supply our men with sufficient food and a further processing economy. ]] ..
+[[But that’s still not everything – most of our soldiers are quite young ]] ..
+[[and neither have a good weapon nor are they well trained. ]] ..
+[[We should build up training sites to prepare them for their future tasks.]]))
+.. new_objectives(obj_build_training_infrastructure),
 }
 
 story_msg_7 = {
    posy=1,
-   title=_"Another cold day",
-   body= "<rt><p font-size=24 font-face=DejaVuSerif font-weight=bold font-color=2F9131>" ..
-_"Thron looks worried." ..
-"</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "My brothers and their soldiers are dead and left fire and destruction behind. In none of all the ruins could I find any man or woman of the normal folk and so I just may hope that they fled from this cruel battleground and started a better life somewhere else. Nothing is left from that beauty I remember, only ruins remain from the old capital. I am sorrowful but also relieved. I never hoped to ever see Al'thunran's old beauty again - it was only a few months ago that I wondered whether I would ever be able to set my feet in Al'thunran again. Now the old town is back in my hands and I will not hesitate to rebuild it with all the strength my people have. I can't wait to see it again in it's old beauty." ]] ..
-"<br><br>" ..
-_"--------------------- VICTORY! ----------------------" ..
-"<br><br>" ..
-_"You have completed the last mission of the barbarian tutorial campaign. You may continue playing if you wish, otherwise move on to the next campaign." ..
-"</p></rt>",
+   title=_"Another Cold Day",
+   body= thron(_"Thron looks worried...",
+_([[My brothers and their soldiers are dead and left fire and destruction behind. ]] ..
+[[In none of all the ruins could I find any man or woman of the normal folk, ]] ..
+[[and so I just may hope that they fled from this cruel battleground and started a better life somewhere else.]]) .. "<br><br>" ..
+_([[Nothing is left of that beauty I remember, only ruins remain of the old capital. ]] ..
+[[I am sorrowful but also relieved. I never hoped to ever see Al’thunran’s old beauty again]] ..
+[[ – it was only a few months ago that I wondered whether I would ever be able to set my feet in Al’thunran again. ]] ..
+[[Now the old town is back in my hands, and I will not hesitate to rebuild it with all the strength my people have. ]] ..
+[[I can’t wait to see it again in its old beauty.]]))
+..  objective_text(_"Victory", 
+   _([[You have completed the last mission of the barbarian tutorial campaign. ]] ..
+[[You may continue playing if you wish, otherwise move on to the next campaign.]]))
 }
 
 order_msg_7_free_althunran = {
    posy = 1,
-   title=_"Military assault",
-   body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "So be it, the generals are out to set up my troops and Boldreth himself will lead the first strike. I will ride by his side, to free Al’thunran of this war and bring peace back to our capital. When the young sun rises above the trees tomorrow morning, I will order the assault. By dusk, I will celebrate my victory in the wooden halls of the warlord and sacrifice a newborn lamb in the honour of my father whose eyes are set upon me today.<br>So be it!" ]] ..
+   title=_"Military Assault",
+   body= thron(
+_([[So be it, the generals are out and about arranging my troops, and Boldreth himself will lead the first strike. ]] ..
+[[I will ride by his side, to free Al’thunran of this war and return peace to our capital.]]) .. "<br><br>" ..
+_([[When the young sun rises above the trees tomorrow morning, I will order the assault. ]] ..
+[[By dusk, I will celebrate my victory in the wooden halls of the warlord ]] ..
+[[and sacrifice a newborn lamb in the honor of my father, whose eyes are set upon me today.]]) ..
 "<br><br>" ..
-_"-- NEW OBJECTIVE --" ..
-"<br>" ..
-_"* Destroy all enforcements of Thron’s two brothers to liberate the throne-circle." ..
-"</p></rt>",
+_([[So be it!]]))
+.. new_objectives(obj_military_assault_on_althunran),
 }
 
 cattlefarm_01 = {
-   title = _ "Khantrukh speaks",
-   body = rt("image=map:khantrukh.png", direct_speech(
-_"Khantrukh approaches", p(_
-[[ "Chieftain, remember the poor carriers: Our roads get longer and longer and
- the burden on their shoulders never gets lighter. We should breed more oxen to
- make their work lighter and our transportation more efficient." ]]
-
-       ))) .. rt(p(_"-- NEW OBJECTIVE --")) ..  obj_build_cattlefarm.body 
+   title = _"Khantrukh says:",
+   body= khantrukh(
+_([[Chieftain, remember the poor carriers: Our roads get longer and longer ]] ..
+[[and the burden on their shoulders never gets lighter. ]] ..
+[[We should breed more oxen to make their work lighter and our transportation more efficient.]]))
+.. new_objectives(obj_build_cattlefarm),
 }
-       
 
 
=== modified file 'campaigns/tutorial01.wmf/elemental'
--- campaigns/tutorial01.wmf/elemental	2010-04-29 15:48:50 +0000
+++ campaigns/tutorial01.wmf/elemental	2014-03-05 18:47:45 +0000
@@ -4,7 +4,7 @@
 map_h=64
 nr_players=2
 world=greenland
-name=_"Tutorial01"
+name=_"Tutorial 1"
 author="Winterwind, SirVer, Nasenbaer"
-descr=_"Basic tutorial - map based on Winterwind's tutorial 1 for Barbarians"
+descr=_"Basic Tutorial – a map based on Winterwind’s tutorial 1 for the Barbarians"
 background="tribes/barbarians/pics/campmap-tut1+2.jpg"
 
=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua'
--- campaigns/tutorial01.wmf/scripting/texts.lua	2012-12-16 19:08:16 +0000
+++ campaigns/tutorial01.wmf/scripting/texts.lua	2014-03-05 18:47:45 +0000
@@ -5,228 +5,202 @@
 -- =========================
 -- Some formating functions
 -- =========================
--- Rich Text
-function rt(text_or_opts, text)
-   k = "<rt>"
-   if text then
-      k = ("<rt %s>"):format(text_or_opts)
-   else
-      text = text_or_opts
-   end
-
-   return k .. text .. "</rt>"
-end
-
--- Headings
-function h1(s)
-   return "<p font=DejaVuSerif font-size=18 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=8> <br></p>"
-end
-
-function h2(s)
-   return "<p font=DejaVuSerif font-size=12 font-weight=bold font-color=D1D1D1>"
-      ..  s .. "<br></p><p font-size=4> <br></p>"
-end
-
--- Simple flowing text. One Paragraph
-function p(s)
-   return "<p line-spacing=3 font-size=12>" .. s .. "<br></p>" ..
-      "<p font-size=8> <br></p>"
-end
+
+use("aux", "formatting")
 
 -- =============
 -- Texts below
 -- =============
 scould_player = {
-   title = _ "Nice and easy does it all the time",
+   title = _ "Nice And Easy Does It All the Time",
    body = rt(p(_
-[[I am sorry, but I have to rip this again. We might need the space here later
-on. If I am too slow for you, you might want to play a real game and just find
-everything out for yourself. Otherwise, please bear with me, I am not the
-youngest and quickest anymore.]]
+[[I am sorry, but will I have to tear this down again. ]] ..
+[[We might need the space here later on. ]] ..
+[[If I am too slow for you, you might want to play a real game and just find everything out for yourself. ]] ..
+[[Otherwise, please bear with me, I am not the youngest and quickest anymore.]]
       )
    )
 }
 
 initial_message_01 = {
-   title = _ "Welcome to the Widelands tutorial!",
+   title = _ "Welcome to the Widelands Tutorial!",
    body = rt(
       h1(_"Welcome to Widelands!") ..
-      p(_
-[[Widelands is a slow-paced build-up strategy with an emphasis on construction,
-not destruction. This tutorial will get you through the basics of the game.]]
-      ) .. p(_
-[[You can dismiss this box by left-clicking on the button below.]]
+      p(_(
+[[Widelands is a slow-paced build-up strategy game with an emphasis on construction, not destruction. ]] ..
+[[This tutorial will guide you through the basics of the game.]])
+      ) .. p([[• ]] .. _[[Dismiss this box by left-clicking on the button below.]]
       )
    ),
 }
 initial_message_02 = {
-   title = _ "Diving in",
+   title = _ "Diving In",
    pos = "topright",
    field = wl.Game().map.player_slots[1].starting_field,
    body = rt(
-      h1(_"Let's dive right in!") ..
-      p(_
-[[There are three different tribes in Widelands: the barbarians, the empire and
-the atlanteans. All tribes have a different economy, strength and weaknesses,
-but the general gameplay is the same for all. We play the barbarians for now.]]
-      ) .. p(_
-[[You usually start the game with one headquarters. This is the big building
-with the blue flag in front of it. The headquarters is a warehouse that stores
-wares, workers and soldiers. Some wares are needed for building houses, others
-for making other wares. Obviously, the wares in the headquarters will not last
-forever, so you must make sure to reproduce them. The most important wares in
-the early game are the basic build wares: trunks and raw stone. Let's make sure
-that we do not run out of trunks. For this, we need a lumberjack and a hut for
-him to stay in.]]
-      ) .. p(_
-[[We need to find a nice place for the lumberjack's hut. To make this easier,
-we can activate the build help. There are two ways you can do this, either by
-clicking on the build help button at the bottom of the screen which is the
-fourth one from the left. Or you can use the SPACE key to toggle it.]]
-      ) .. p(_
-[[Left-click the "OK" button to close this box and then try it.]]
+      h1(_"Let’s dive right in!") ..
+      p(_(
+[[There are three different tribes in Widelands: the Barbarians, the Empire and the Atlanteans. ]] ..
+[[All tribes have a different economy, strength and weaknesses, ]] ..
+[[but the general gameplay is the same for all. We will play the barbarians for now.]])
+      ) .. p(_(
+[[You will usually start the game with one headquarters. ]] ..
+[[This is the big building with the blue flag in front of it. ]] ..
+[[The headquarters is a warehouse that stores wares, workers and soldiers. ]] ..
+[[Some wares are needed for building houses, others for making other wares. ]] ..
+[[Obviously, the wares in the headquarters will not last forever, so you must make sure to replace them. ]] ..
+[[The most important wares in the early game are the basic construction wares: logs and raw stone. ]] ..
+[[Let’s make sure that we do not run out of logs. ]] ..
+[[For this, we need a lumberjack and a hut for him to stay in.]])
+      ) .. p(_(
+[[We need to find a nice place for the lumberjack’s hut. ]] ..
+[[To make this easier, we can activate ‘Show Building Spaces’. ]] ..
+[[There are two ways you can do this, either by clicking on the ‘Show Building Spaces’ button at the bottom of the screen, ]] ..
+[[which is the fourth one from the left. Or you can use the SPACE key to toggle it.]])
+      ) .. p([[• ]] .. _[[Left-click the ‘OK’ button to close this box and then try it.]]
       )
    ),
    obj_name = "enable_buildhelp",
-   obj_title = _ "Enable the build help",
-   obj_body = rt(h1(_"Enable the build help") ..
-      p(_
-[[It is easier to understand what is allowed to be built on which field when
-the build help symbols are enabled. Do so now either by pressing SPACE or by
-clicking the fourth button from the left at the very bottom of the screen.
-Click the "OK" button and then give it a try.]]
+   obj_title = _ "Enable the showing of building spaces",
+   obj_body = rt(h1(_"Show Building Spaces") ..
+      p(_(
+[[It is easier to understand what type of buildings can be built on which field ]] ..
+[[when the symbols for the building spaces are enabled.]]) )..
+      p([[• ]] .. 
+_([[Do so now either by pressing SPACE or by clicking the fourth button from the left at the very bottom of the screen. ]] ..
+[[Right-click on this window and then give it a try.]])
       )
    )
 }
 
 lumberjack_message_01 = {
-   title = _ "Lumberjack's spot",
+   title = _ "Lumberjack’s Spot",
    pos = "topright",
    field = first_lumberjack_field,
-   body = rt(p(_
-[[There you go. I will explain about all those symbols in a minute. First, let
-me show you how to make a lumberjack's hut and how to connect it with a road.
-There is a sweet spot for a lumberjack right next to those trees.  I'll describe
-the steps I will take and then ask you to click on the "OK" button for me to
-demonstrate.]]
+   body = rt(p(_(
+[[There you go. I will explain about all those symbols in a minute. ]] ..
+[[First, let me show you how to make a lumberjack’s hut and how to connect it with a road. ]] ..
+[[There is a sweet spot for a lumberjack right next to those trees. ]] ..
+[[I’ll describe the steps I will take and then ask you to click on the ‘OK’ button for me to demonstrate.]])
       )
    )
 }
 
 lumberjack_message_02 = {
-   title = _ "Building the lumberjack",
+   title = _ "Building the Lumberjack",
    pos = "topright",
-   body = rt(p(_
-[[First, I'll left-click on the symbol where I want the lumberjack's hut to be
-built. A window will appear where I can choose between buildings. Because I'll
-click a yellow house symbol - which means that its field can house medium and small
-buildings - I am presented with all the medium buildings that I can build. The
-lumberjack's hut is a small building so I will go on to select the small buildings
-tab. Then I'll choose the lumberjack's hut.
-Click the "OK" button to watch me. I'll go really slow: I will click - then select
-the tab - and finally I'll choose the building.]]
+   body = rt(p(_(
+[[First, I’ll left-click on the symbol where I want the lumberjack’s hut to be built. ]] ..
+[[A window will appear where I can choose between buildings. ]] ..
+[[Because I’ll click a yellow house symbol – which means that its field can house medium and small buildings]] ..
+[[ – I am presented with all the medium buildings that I can build. ]] ..
+[[The lumberjack’s hut is a small building, so I will go on to select the small buildings tab. ]] ..
+[[Then I’ll choose the lumberjack’s hut.]])) ..
+      p([[• ]] .. 
+_([[Click the ‘OK’ button to watch me. ]] ..
+[[I’ll go really slowly: I will click – then select the tab – and finally I’ll choose the building.]])
     )
    )
 }
 
 lumberjack_message_03 = {
-   title = _ "Building a connecting road",
+   title = _ "Building a Connecting Road",
    pos = "topright",
-   body = rt(p(_
-[[That won't do yet. I still need to connect the lumberjack's hut to the
-rest of my road network. After I ordered a construction site, I was
-automatically put in road building mode, so all I have to do is click on the
-blue flag in front of my headquarters.]]
+   body = rt(p(_(
+[[That won’t do yet. I still need to connect the lumberjack’s hut to the rest of my road network. ]] ..
+[[After ordering the construction site, I was automatically put into road building mode, ]] ..
+[[so all I have to do is click on the blue flag in front of my headquarters.]])
        )
    )
 }
 
 lumberjack_message_04 = {
-   title = _ "Waiting for the lumberjack to go up",
+   title = _ "Waiting for the Lumberjack to Go Up",
    pos = "topright",
-   body = rt(p(_
-[[Now watch closely as a builder leaves the headquarters and goes to the
-construction site. Also a carrier will take position in between the two blue
-flags and carry wares from one blue flag to the other.]]
+   body = rt(p(_(
+[[Now watch closely while a builder leaves the headquarters and goes to the construction site. ]] ..
+[[Also, a carrier will take position in between the two blue flags and carry wares from one blue flag to the other.]])
       )
    )
 }
 
 lumberjack_message_05 = {
-   title = _ "Placing another flag",
+   title = _ "Placing Another Flag",
    pos = "topright",
-   body = rt(p(_
-[[Nice how they work, isn't it? But the poor carrier has a very long way to go.
-We can make it easier for him (and more efficient for us) when we place another
-blue flag on the road. You try it this time: click on the yellow flag symbol
-in between the two blue flags we just placed and then click on the]]
+   body = rt(p(_(
+[[Nice how they are working, isn’t it? But the poor carrier has a very long way to go. ]] ..
+[[We can make it easier for him (and more efficient for us) when we place another blue flag on the road.]])
+   ) .. p([[• ]] .. 
+_([[You try it this time: click on the yellow flag symbol in between the two blue flags we just placed and then click on the]])
       )) .. rt("image=pics/menu_build_flag.png", p(_ "build flag symbol.")
    ),
    obj_name = "build_flag_on_road_to_lumberjack",
    obj_title = _ "Build a flag to divide the road to the lumberjack",
-   obj_body = rt(h1(_"Build a flag on the road") .. p(_
-[[The shorter your road segments are, the faster your wares will be transported.
-You should therefore make sure that your roads have as many flags as possible.
-Build a blue flag now in the middle of the road that connects your headquarters
-to your lumberjack's hut.]])
+   obj_body = rt(h1(_"Build a Flag on the Road") .. p(_(
+[[The shorter your road segments are, the faster your wares will be transported. ]] ..
+[[You should therefore make sure that your roads have as many flags as possible.]])) ..
+      p([[• ]] .. 
+_[[Build a blue flag now in the middle of the road that connects your headquarters to your lumberjack’s hut.]])
    )
 }
 
 lumberjack_message_06 = {
-   title = _ "Waiting for the hut to be finished",
+   title = _ "Waiting For the Hut to be Finished",
    pos = "topright",
    body = rt(p(_
-[[Well done! Let's wait till the hut is finished. If you want things to
-go faster, simply use the PAGE UP key on your keyboard to increase the game
-speed. You can use PAGE DOWN to make the game slower again.]]
+[[Well done! Let’s wait till the hut is finished.]]) ..
+      p(_(
+[[If you want things to go faster, simply use the PAGE UP key on your keyboard to increase the game speed. ]] ..
+[[You can use PAGE DOWN to make the game slower again.]])
       )
    )
 }
 
 lumberjack_message_07 = {
-   title = _ "Lumberjack is done",
+   title = _ "Lumberjack is Done",
    pos = "topright",
-   body = rt(p(_
-[[Excellent. The lumberjack's hut is done. A lumberjack will now move in and
-start chopping down trees, so our trunks income is secured for now. Now on to
-the raw stone.]]
+   body = rt(p(_(
+[[Excellent. The lumberjack’s hut is done. ]] ..
+[[A lumberjack will now move in and start chopping down trees, so our logs income is secured for now. ]] ..
+[[Now on to the raw stone.]])
       )
    )
 }
 
 inform_about_stones = {
-   title = _ "Some stones were found",
-   body = rt(h1(_ "Getting a quarry up.")) ..
-   rt(p(_
-[[Stones can be mined in granite mines, but the easier way is to build a quarry
-next to some stones laying around. As it happens, there is a pile of them
-laying just to the west (left) of your headquarters. I will teach you now how to
-move your view over there.]]
-      ) .. p(_
-[[There are two ways to move your view. The first one is using the cursor keys
-on your keyboard. Go ahead and try this out.  Click the "OK" button and then move
-the view using the cursor keys]]
+   title = _ "Some Stones Were Found",
+   body = rt(h1(_"Getting a Quarry Up.")) ..
+   rt(p(_(
+[[Stones can be mined in granite mines, but the easier way is to build a quarry next to some stones lying around. ]] ..
+[[As it happens, there is a pile of them just to the west (left) of your headquarters. ]] ..
+[[I will teach you now how to move your view over there.]])
+      ) .. p([[→ ]] .. 
+_([[There are two ways to move your view. The first one is using the cursor keys on your keyboard. ]] ..
+[[Go ahead and try this out.]])) ..
+      p([[• ]] .. 
+_[[Click the ‘OK’ button and then move the view using the cursor keys]]
       )
    ),
    obj_name = "move_view_with_cursor_keys",
    obj_title = _ "Move your view with the cursor keys",
-   obj_body = rt(h1(_"Moving your view") .. p(_
-[[Moving your view is essential to get a complete overview of your whole
-economy. There are two ways to move your view in Widelands. The first one is
-to use the cursor keys on your keyboard. The second one is the more common and
-faster one: press-and-hold the right mouse button anywhere on the map, then move
-your mouse around and you'll see the view scroll.]]
+   obj_body = rt(h1(_"Moving Your View") .. p(_(
+[[Moving your view is essential to get a complete overview of your whole economy. ]] ..
+[[There are two ways to move your view in Widelands.]])) .. p(
+[[→ ]] .. _[[The first one is to use the cursor keys on your keyboard.]])
+ .. p(
+[[→ ]] .. _([[The second one is the more common and faster one: press-and-hold the right mouse button anywhere on the map, ]] ..
+[[then move your mouse around and you’ll see the view scroll.]])
       )
    )
 }
 
 tell_about_right_drag_move = {
-   title = _ "Other ways to move the view",
+   title = _ "Other Ways to Move the View",
    body = rt(p(_
-[[Excellent. Now there is a faster way to move, using the mouse instead: Simply
-right-click-and-hold anywhere on the map, then drag the mouse and instead
-of the cursor, the view will be moved. Try it.]]
+[[Excellent. Now there is a faster way to move, using the mouse instead:]]
+   ) .. p([[• ]] .. 
+_([[Simply right-click-and-hold anywhere on the map, ]] ..
+[[then drag the mouse and instead of the cursor, the view will be moved. Try it.]])
       )
    ),
    obj_name = "move_view_with_mouse",
@@ -235,7 +209,7 @@
 }
 
 congratulate_and_on_to_quarry = {
-   title = _ "Onward to the quarry",
+   title = _ "Onward to the Quarry",
    body = rt(p(_
 [[Great. Now about that quarry...]]
       )
@@ -245,17 +219,16 @@
 order_quarry_recap_how_to_build = {
    field = first_quarry_field,
    pos = "topright",
-   title = _ "How to build a quarry",
+   title = _ "How to Build a Quarry",
    body = rt(p(_
-[[Build a quarry next to those stones here. Remember how I did it earlier?
-Make sure that build help is on, then just click the place were you want the
-building to be, choose it from the window that appears and it is placed. Maybe
-it is a good time to explain about all those build help symbols we activated
-earlier.]]
-   ) .. p(_
-[[You can build four things on fields in Widelands: Flags, small houses, medium
-houses and big houses. But not every field can hold anything. The build help
-eases recognition:]]
+[[Build a quarry next to those stones here. Remember how I did it earlier?]]
+) .. p(_(
+[[Make sure that you are showing the building spaces, then just click on the space were you want the building to be, ]] ..
+[[choose it from the window that appears and it is placed. ]] ..
+[[Maybe this is a good time to explain about all those building space symbols we activated earlier.]])
+   ) .. p(_(
+[[You can build four things on fields in Widelands: Flags, small houses, medium houses and big houses. ]] ..
+[[But not every field can hold everything. The build space symbols ease recognition:]])
    )) .. rt("image=pics/big.png", p(_
 [[Everything can be built on the green house symbol.]]
    )) .. rt("image=pics/medium.png", p(_
@@ -264,24 +237,25 @@
 [[Red building symbols can only hold small buildings and flags.]]
    )) .. rt("image=pics/set_flag.png", p(_
 [[And finally the yellow flag symbol only allows for flags.]]
-   )) .. rt(p(_
-[[If you place something on a field, the surrounding fields might have less
- space for holding buildings, so choose your fields wisely.]]
-   )) .. rt(p(_
-[[Now go ahead, try it. The quarry is a small building, so if you click on a
-medium or big building symbol, you will have to select the small buildings
-tab first to find it. Go on, check it out!]]
+   )) .. rt(p(_(
+[[If you place something on a field, the surrounding fields might have less space for holding buildings, ]] ..
+[[so choose your fields wisely.]])
+   )) .. rt(p([[• ]] .. 
+_([[Now go ahead, try it. ]] ..
+[[The quarry is a small building, so if you click on a medium or big building symbol, ]] ..
+[[you will have to select the small buildings tab first to find it. Go on, check it out!]])
       )
    ),
    obj_name = "build_a_quarry",
    obj_title = _ "Build a quarry next to the stones",
-   obj_body = rt(h1(_ "Build a quarry") .. p(_
-[[There are some stones to the west of your headquarters. Build a quarry right
-next to them. The quarry is a small building like the lumberjack's hut. You
-can therefore build it on any field that shows a red, yellow or green house
-when the build help is enabled (Press SPACE for that).]]) .. p(_
-[[Just click on any house symbol next to the stones, select the small buildings
-tab in the window that opens up, then click on the quarry symbol.]]
+   obj_body = rt(h1(_ "Build a Quarry") .. p([[• ]] .. 
+_[[There are some stones to the west of your headquarters. Build a quarry right next to them.]]) .. p( 
+[[→ ]] .. _([[The quarry is a small building like the lumberjack’s hut. ]] ..
+[[You can therefore build it on any field that shows a red, ]] ..
+[[yellow or green house when the building spaces symbols are enabled (Press SPACE for that).]]
+   )) .. p([[→ ]] .. 
+_([[Just click on any house symbol next to the stones, select the small buildings tab in the window ]] .. 
+[[that opens up, then click on the quarry symbol.]])
       )
    )
 }
@@ -289,134 +263,131 @@
 talk_about_roadbuilding_00 = {
    pos = "topright",
    field = wl.Game().map:get_field(9,12),
-   title = _ "Road building",
-   body = rt(p(_
-[[Excellent! Directly after you placed a building, you are in road building
-mode. The new road will start at the flag in front of your newly placed
-construction site. You can enter road building mode for any flag by
-left-clicking on a flag and selecting]]
+   title = _ "Road Building",
+   body = rt(p(_(
+[[Excellent! Directly after placing the building, you have been switched into road building mode. ]] ..
+[[The new road will start at the flag in front of your newly placed construction site. ]] ..
+[[You can enter road building mode for any flag by left-clicking on a flag and selecting]])
       )) .. rt("image=pics/menu_build_way.png", p(_
 [[the road building symbol.]]
-      )) .. rt(p(_
-[[If you decide you do not want to build a road at this time, you can cancel
-road building by clicking on the starting flag of the road and selecting]]
+      )) .. rt(p(_(
+[[If you decide you do not want to build a road at this time, you can cancel road building ]] ..
+[[by clicking on the starting flag of the road and selecting]])
       )) .. rt("image=pics/menu_abort.png", p(_
 [[the abort symbol.]]
-      )) .. rt(p(_
-[[Now, about this road. Remember: we are already in road building mode since you
-just ordered the quarry. You can either make it longer by one field at a time
-by left-clicking multiple times on neighbouring fields for perfect control over
-the route the road takes like so:]]
+      )) .. rt(p(_(
+[[Now, about this road. Remember: we are already in road building mode since you just ordered the quarry. ]] ..
+[[You can either make it longer by one field at a time by left-clicking multiple times on neighboring fields ]] ..
+[[for perfect control over the route the road takes like so:]])
       ))
 }
 
 talk_about_roadbuilding_01 = {
    pos = "topright",
    field = wl.Game().map:get_field(9,12),
-   title = _ "Road building",
+   title = _ "Road Building",
    body = rt(p(_
-[[Alternatively, you can directly click the flag where
-the road should end like so.]]
+[[Or, you can directly click the flag where the road should end like so:]]
    ))
 }
 
 talk_about_roadbuilding_02 = {
    pos = "topright",
-   title = _ "Road building",
-   body = rt(p(_
-[[One more thing: around the field where your road would end you can see
-different markers. They have the following meaning:]]
+   title = _ "Road Building",
+   body = rt(p(_(
+[[One more thing: around the field where your road would end, you can see different markers. ]] ..
+[[They have the following meaning:]])
       )) .. rt("image=pics/roadb_green.png", p(_
 [[The terrain is flat here. Your carriers will be very swift on this terrain.]]
-   )) .. rt("image=pics/roadb_yellow.png", p(_
-[[There is a small slope to climb to reach this field. This means your
-workers are faster walking downwards than they are walking upwards.]]
-   )) .. rt("image=pics/roadb_red.png", p(_
-[[The connection between the fields is extremely steep. The speed increase in
-one direction is huge while the slowdown in the other is also substantial.]]
-   )) .. rt(p(_
-[[Keep the slopes in mind while placing roads and use them to your advantage.
-Also try to keep roads as short as possible and always remember to place as
-many flags as you can on road segments to share the load better.]]
-   )) .. rt(p(_
-[[Now please rebuild the road between your quarry and your headquarters.
-We'll wait until the quarry is completed.]]
+   )) .. rt("image=pics/roadb_yellow.png", p(_(
+[[There is a small slope to climb to reach this field. ]] ..
+[[This means that your workers will be faster walking downhill than they will be walking uphill.]])
+   )) .. rt("image=pics/roadb_red.png", p(_(
+[[The connection between the fields is extremely steep. ]] ..
+[[The speed increase in one direction is huge while the slowdown in the other is also substantial.]])
+   )) .. rt(p(_(
+[[Keep the slopes in mind while placing roads and use them to your advantage. ]] ..
+[[Also, try to keep roads as short as possible and always remember to place ]] ..
+[[as many flags as you can on road segments to share the load better.]])
+   )) .. rt(p([[• ]] .. 
+_([[Now please rebuild the road between your quarry and your headquarters. ]] ..
+[[We’ll wait until the quarry is completed.]])
    )),
    obj_name = "build_road_to_quarry",
    obj_title = _ "Connect the quarry to the headquarters",
-   obj_body = rt(h1(_"Connect your construction site") .. p(_
-[[Connect your quarry construction site to your headquarters with a road. You
-are directly in road building mode when you ordered a new site. But now, you
-aren't. To build a completely new road just click on the flag in front of your
-construction site, click on the build road icon then click on the flag in front
-of your headquarters. Wait for the completion of the stonemason's hut.]]
+   obj_body = rt(h1(_"Connect Your Construction Site") .. p(_(
+[[Connect your quarry construction site to your headquarters with a road. ]] ..
+[[You would have been put directly into road building mode after ordering a new site. But now, you aren’t.]])) ..
+      p([[→ ]] .. 
+_([[To build a completely new road, just click on the flag in front of your construction site, ]] ..
+[[click on the build road icon and then click on the flag in front of your headquarters. ]] ..
+[[Wait for the completion of the quarry.]])
       )
    )
 }
 
 census_and_statistics_00 = {
-   title = _ "Census and statistics",
-   body = rt(p(_
-[[While we wait, I'll quickly show you another useful feature. All construction
-sites look the same and some buildings look alike. It is sometimes hard to tell
-them apart. Widelands offers a feature to show label texts over the buildings.
-They are called the census and you can toggle them via the 'c' key or via
-the button on the watch tab of any field.]]
-    ) .. p(_
-[[Similar to this are building statistics which are also toggled via a
-button on the watch tab of any field. The hotkey for it is 's'. This will
-display an information string about the productivity of buildings or the
-progress of construction sites.]]
-   ) .. p(_
-[[Let me quickly enable those two for you. Remember: 'c' and 's' are the keys.
-Alternatively you can click on any field without a building on it, select the
-watch tab and then click on the corresponding buttons.]]
+   title = _ "Census and Statistics",
+   body = rt(p(_(
+[[While we wait, I’ll quickly show you another useful feature. ]] ..
+[[All construction sites look the same, and some buildings look alike. It is sometimes hard to tell them apart. ]] ..
+[[Widelands offers a feature to show label texts over the buildings. ]] ..
+[[They are called the ‘census’ and you can toggle them via the ‘c’ key or via the button on the ‘Watch’ tab of any field.]])
+    ) .. p(_(
+[[Similar to this are the building statistics, which are also toggled via a button on the ‘Watch’ tab of any field. ]] ..
+[[The hotkey for it is ‘s’. This will display information about the productivity of buildings ]] ..
+[[or the progress of construction sites.]])
+   ) .. p(_(
+[[Let me quickly enable these two for you. Remember: ‘c’ and ‘s’ are the keys. ]] ..
+[[Alternatively, you can click on any field without a building on it, ]] ..
+[[select the watch tab and then click on the corresponding buttons.]])
    )
 )
 }
 
 census_and_statistics_01 = {
-   title = _ "Census and statistics",
+   title = _ "Census and Statistics",
    body = rt(p(_
-[[Now we know what's going on. Let's wait for this quarry to finish.]]
+[[Now we know what’s going on. Let’s wait for this quarry to finish.]]
    )
 )
 }
 
 teaching_about_messages = {
    popup = true,
-   title = _ "Introducing messages",
+   title = _ "Introducing Messages",
    body = rt(h1(_"Messages") ..
-      p(_
-[[Hi, it's me again! This time, I sent you a message. Messages are sent to you
-by Widelands to inform you about important events: empty mines, attacks on your
-tribe, won or lost military buildings, resources found...]]
-      ) .. p(_
-[[The message window can be toggled by the button on the very right at the
-bottom of the screen. This button also changes appearance if new messages are
-available, but there is also a bell sound played whenever you receive a new
-message.]]
-      ) .. p(_
-[[Currently, you have two messages. This one which you are currently reading and
-the one that informed you that a new headquarters was added to your economy.
-Let's learn how to archive messages: You can check them off in your inbox so
-that they get a tick-symbol in front of them. Then, you can click the]]
-      )) .. rt("image=pics/message_archive.png", p(_
+      p(_(
+[[Hi, it’s me again! This time, I have sent you a message. ]] ..
+[[Messages are sent to you by Widelands to inform you about important events: empty mines, attacks on your tribe, ]] ..
+[[won or lost military buildings, resources found...]]
+      )) .. p(_(
+[[The message window can be toggled by the button on the very right at the bottom of the screen. ]] ..
+[[This button will also change appearance whenever new messages are available, ]] ..
+[[but there is also a bell sound played whenever you receive a new message.]]
+      )) .. p(_(
+[[You have two messages at the moment. ]] ..
+[[This one, which you are currently reading, and the one that informed you that a new headquarters ]] ..
+[[was added to your economy. Let’s learn how to archive messages: ]] ..
+[[You can check them off in your inbox so that they get a tick-symbol in front of them. ]] ..
+[[Then, you can click the]]
+      ))) .. rt("image=pics/message_archive.png", p(_
 [[archive message button to move them into your archive.]]
-      )) .. rt(p(_
-[[Archive all messages, including this one, that you currently have in your
- inbox.]]
+      )) .. rt(p([[• ]] .. 
+_[[Archive all messages that you currently have in your inbox, including this one.]]
       )
    ),
    obj_name = "archive_all_messages",
    obj_title = _"Archive all messages in your inbox",
-   obj_body = rt(h1(_"Archive our inbox messages") .. p(_
-[[The message window is central to fully controlling your tribe's fortune. But
-you get a lot of messages in a real game. To keep your head straight, you should
-try to keep the inbox empty. Archive all your messages in the inbox now. To do
-so, open the messages window by pressing 'n' or clicking the right most button
-at the very bottom of the screen. Then mark all messages by checking the check
-box in front of them. Then, click the archive all button]]
+   obj_body = rt(h1(_"Archive Your Inbox Messages") .. p(_(
+[[The message window is central to fully controlling your tribe’s fortune. ]] ..
+[[However, you will get a lot of messages in a real game. ]] ..
+[[To keep your head straight, you should try to keep the inbox empty. ]])
+      ) .. p([[• ]] .. 
+_[[Archive all your messages in your inbox now.]]
+      ) .. p([[→ ]] .. 
+_([[To do so, open the message window by pressing ‘n’ or clicking the rightmost button at the very bottom of the screen. ]] ..
+[[Then mark all messages by checking the check box in front of them. Then, click the ‘Archive All’ button.]])
       )
    )
 }
@@ -424,20 +395,21 @@
 closing_msg_window_00 = {
    pos = "topright",
    field = first_quarry_field,
-   title = _"Closing windows",
-   body = rt(p(_
-[[Excellent. By the way: closing windows in Widelands is as easy as
-right-clicking on them. This works with all windows except for story message
-windows like this one. Go ahead and try it. First, close this window by pressing
-the button below, then right click into the messages window to close it.]]
+   title = _"Closing Windows",
+   body = rt(p(_(
+[[Excellent. By the way: closing windows in Widelands is as easy as right-clicking on them. ]] ..
+[[This will work with all windows except for story message windows like this one. Go ahead and try it.]])
+      ) .. p([[• ]] .. 
+_[[First, close this window by pressing the button below, then right-click into the messages window to close it.]]
       )
    ),
    obj_name = "close_message_window",
    obj_title = _ "Close the messages window",
-   obj_body = rt(h1(_"Close the messages window") .. p(_
-[[All windows in Widelands can be closed by right clicking into them. Some
-windows can also be toggled with the buttons at the very bottom of the screen.
-Close the messages window now by right clicking into it.]]
+   obj_body = rt(h1(_"Close the Messages Window") .. p(_(
+[[All windows in Widelands can be closed by right-clicking into them. ]] ..
+[[Some windows can also be toggled with the buttons at the very bottom of the screen.]])
+      ) .. p([[• ]] .. 
+_[[Close the messages window now by right-clicking into it.]]
       )
    )
 }
@@ -445,92 +417,87 @@
 closing_msg_window_01 = {
    pos = "topright",
    field = first_quarry_field,
-   title = _ "Closing windows",
-   body = rt(p(_
-[[Well done! Let's see how messages work in the real game, shall we? For this,
-I'll take all stones away from the poor stonemason in the quarry. He will then
-send a message that he can't find any in his working area the next time he
-tries to do some work.]]
+   title = _ "Closing Windows",
+   body = rt(p(_(
+[[Well done! Let’s see how messages work in a real game, shall we? ]] ..
+[[For this, I’ll take all stones away from the poor stonemason in the quarry. ]] ..
+[[He will then send a message that he can’t find any in his working area the next time he tries to do some work.]])
       )
    )
 }
 
 conclude_messages = {
    pos = "topright",
-   title = _ "Message arrived!",
-   body = rt(p(_
-[[A message has been sent to you. See how the button at the bottom of the
-screen has changed appearance? You might now burn this quarry down as it is
-no longer of any use and is just blocking space. To do that, click on the
-quarry and select the destroy button.]]
+   title = _ "Message Arrived!",
+   body = rt(p(_(
+[[A message has been sent to you. See how the button at the bottom of the screen has changed appearance? ]] ..
+[[You can burn this quarry down now as it is no longer of any use and just blocking space.]])
+      ) .. p([[• ]] .. 
+_[[To do that, click on the quarry and select the destroy button.]]
    ))
 }
 
 introduce_expansion = {
-   title = _ "Expanding your territory!",
-   body = rt(p(_
-[[There is one more thing I'd like to teach you now: Expanding your territory.
-The place that we start with around our headquarters is barely enough for a
-basic build infrastructure and we do not have access to mountains which we
-need to mine minerals and coal. So we have to expand our territory.]]
-      ) .. p(_
-[[Expanding is as simple as building a military building at the corner of
-your territory. The barbarians have a few different military buildings:
-sentries, barriers, donjons, fortresses and citadels. The bigger
-the building, the more expensive it is to build, the more land it conquers
-around itself and the more soldiers can be stationed there. The buildings also
-vary in their vision range: buildings with a tower see farther than others.]]
-      ) .. p(_
-[[As soon as a military building is manned, it extends your land. You can then
-burn it down again if you need the place. But note that your land is then
-vulnerable: any military site from another player can conquer the land. You
-therefore need military sites to keep military influence over your land.]]
-      ) .. p(_
-[[Let's try it out now: Build a few military buildings on your south western
-border.  We want to capture some of this mountain, so we can search for
-resources there. Bigger buildings will conquer more land which can be beneficial
-close to mountains because you can't build houses in mountains.]]
+   title = _ "Expanding Your Territory!",
+   body = rt(p(_(
+[[There is one more thing I’d like to teach you now: Expanding your territory. ]] ..
+[[The place that we started with around our headquarters is barely enough for a basic building infrastructure, ]] ..
+[[and we do not have access to mountains, which we need to mine minerals and coal. So, we have to expand our territory.]])
+      ) .. p(_(
+[[Expanding is as simple as building a military building at the edge of your territory. ]] ..
+[[The barbarians have a selection of different military buildings: ]] ..
+[[sentries, barriers, donjons, fortresses and citadels. ]] ..
+[[The bigger the building, the more expensive it is to build, but the more land it will conquer around itself ]] ..
+[[and the more soldiers can be stationed there. ]] ..
+[[The buildings also vary in their vision range: buildings with a tower see farther than others.]])
+      ) .. p(_(
+[[As soon as a military building is manned, it will extend your land. ]] ..
+[[You can then burn it down again if you need the space. ]] ..
+[[But note that your land is then vulnerable: any military site from another player could conquer the land. ]] ..
+[[You therefore need military sites to keep military influence over your land.]])
+      ) .. p([[• ]] .. 
+_[[Let’s try it out now: build a few military buildings on your south-western border.]]
+      ) .. p([[→ ]] .. 
+_([[We want to capture some of this mountain so we can search for resources there. ]] ..
+[[Bigger buildings will conquer more land, which can be beneficial close to mountains, ]] ..
+[[because you can’t build houses on mountains.]])
       )
    ),
    obj_name = "conquer_mountain",
    obj_title = _ "Conquer an area were we can build mines",
-   obj_body = rt(h1(_"Conquer the mountain to the south west") .. p(_
-[[For a full-fledged economy, we need coal, iron and gold. These can be found
-in mountains. Conquer some area on the mountains to the south-west of your
-headquarters by building some military buildings close to your border.]]
-   ) .. p(_
-[[You can choose from the following military buildings: sentry, 
-donjon, barrier and fortress. The bigger the building, the more expensive it is
-to be built. But it will also conquer a bigger region. Sometimes, it is useful
-to build a big military building next to a mountain so that you can reach
-fields farther up.]]
+   obj_body = rt(h1(_"Conquer the Mountain to the South-West") .. p(_(
+[[For a full-fledged economy, we need coal, iron and gold. These can be found in mountains. ]] ..
+[[Conquer some area on the mountains to the south-west of your headquarters ]] ..
+[[by building some military buildings close to your border.]])
+      ) .. p([[→ ]] .. 
+_([[You can choose from the following military buildings: sentry, donjon, barrier and fortress. ]] ..
+[[The bigger the building, the more expensive it is to build it, but it will also conquer a bigger region. ]] ..
+[[Sometimes, it is useful to build a big military building next to a mountain ]] ..
+[[so that you can reach building sites farther up.]])
       )
    )
 }
 
 mining_00 = {
    pos = "topright",
-   title = _ "Searching for resources",
-   body = rt(p(_
-[[Okay, now we own some of the area on this mountain. Mountains are very
-important, because they contain resources: coal, iron ore, gold ore and
-granite.  Each tribe uses the resources differently, but all need mines to get
-the resources out of the ground.]]
-   ) .. p(_
-[[Let's search for resources in this mountain.  First, we'll build a road into
-the mountains and place a flag. Then, we click on the flag and call a geologist
-to it. I'll show you how it's done.]]
+   title = _ "Searching for Resources",
+   body = rt(p(_(
+[[Okay, now we own some of the area on this mountain. ]] ..
+[[Mountains are very important, because they contain resources: coal, iron ore, gold ore and granite. ]] ..
+[[Each tribe uses the resources differently, but all need mines to extract the resources from the ground.]])
+      ) .. p(_(
+[[Let’s search for resources in this mountain. First, we’ll build a road onto the mountain and place a flag. ]] ..
+[[Then, we will click on the flag and call a geologist to it. I’ll show you how it’s done.]])
    )
 )
 }
 
 mining_01 = {
    pos = "topright",
-   title = _"Waiting for the geologist",
-   body = rt(p(_
-[[The geologist will arrive shortly to the flag and start investigating the
-area in his surroundings. He will place the following markers for the various
-resources:]]
+   title = _"Waiting for the Geologist",
+   body = rt(p(_(
+[[The geologist will arrive at the flag shortly and start investigating the area in his surroundings. ]] ..
+[[He will place the following markers for the various resources:]])
    )) ..
    rt("image=tribes/barbarians/resi_coal1/resi_00.png", p(_ "a bit of coal")) ..
    rt("image=tribes/barbarians/resi_coal2/resi_00.png", p(_ "a lot of coal")) ..
@@ -546,52 +513,54 @@
    rt("image=tribes/barbarians/resi_none/resi_00.png",
       p(_ "nothing was found here"))
    .. rt(p(_
-[[Let's wait and see what the geologist finds on the mountain.]]
+[[Let’s wait and see what the geologist finds on the mountain.]]
    )
 )
 }
 
 mining_02 = {
    pos = "topright",
-   title = _ "Mining conclusion",
-   body = rt(p(_
-[[So our geologist found a lot of coal on this mountain. You should therefore
-build a coal mine here. Building a mine is like building a house. The build help
-symbol for where a mine can be built is]]
+   title = _ "Mining Conclusion",
+   body = rt(p(_(
+[[So our geologist found a lot of coal on this mountain. ]] ..
+[[You should therefore build a coal mine here. Building a mine is like building a house. ]] ..
+[[The building space symbol for where a mine can be built is]])
    )) .. rt("image=pics/mine.png", p(_"this one.")) ..
-   rt(p(_
-[[Note that a mine needs rations to work. Rations are
-produced in taverns and taverns need meat, pitta bread, and fish to produce
-them. You will need a lot more infrastructure to get your mines working
-well. This infrastructure also varies from tribe to tribe. You'll get them
-explained in the introduction campaigns for the three tribes.]]
+   rt(p(_(
+[[Note that a mine needs rations to work. ]] ..
+[[Rations are produced in taverns, and taverns need meat, pitta bread, and fish to produce them. ]] ..
+[[You will need a lot more infrastructure to get your mines working well. ]] ..
+[[This infrastructure also varies from tribe to tribe. ]] ..
+[[We will explain them to you in the introduction campaigns for the three tribes.]])
    )
 )
 }
 
 warfare_and_training_00 = {
    title = _ "Warfare and Training",
-   body = rt(h1(_ "Soldiers and Warfare") .. p(_
-[[On to the last topic now. We are going to talk about soldiers, their training
-and their profession: warfare. As mentioned, Widelands is about building up,
-not burning down: therefore warfare is also more focused on the economics than
-the military strategies. Nevertheless, warfare offers one way to challenge
-other players and it has some game mechanics that deserve explanation. The
-economies of the tribes are explained in their individual tutorial campaigns.
-Ok, I am going to create us a little training ground with a training camp and a
-warehouse to the north east of here.]]) .. p(_
-[[If you want to come back to this south-western part of your realm, just scroll here
-via right-button scrolling or open the minimap by clicking on the]]
-         )) .. rt("image=pics/menu_toggle_minimap.png", p(_
-[[minimap button at the bottom of the screen. Alternatively you could also press
-'m' on your keyboard]]
-         )) .. (rt(p(_
-[[The minimap shows you the complete map in miniature. You can directly jump to
-any field by left-clicking on it. You can also toggle buildings, roads, flags
-and player indicators on and off inside the minimap.]]
-         ) .. p(_
-[[But I digress. Back to soldiers. What was I about to do? Oh yes, I wanted to
-build a small training scenario for you. Let's do that now.]]
+   body = rt(h1(_ "Soldiers and Warfare") .. p(_(
+[[On to the last topic now. We are going to talk about soldiers, their training and their profession: warfare. ]] ..
+[[As I mentioned, Widelands is about building up, not burning down: ]] ..
+[[therefore, warfare is also more focused on economics than on military strategies.]]
+      )) .. p(_(
+[[Nevertheless, warfare offers one way of challenging other players, ]] ..
+[[and it has some game mechanics that deserve explanation. ]] ..
+[[The economies of the tribes are explained in their individual tutorial campaigns. ]]
+      )) .. p(_(
+[[Ok, I am going to create a little training ground for us with a training camp and a warehouse to the north east of here.]]))
+ .. p(_(
+[[If you want to come back to this south-western part of your realm, ]] ..
+[[just scroll here via right-button scrolling or open the minimap by clicking on the]])
+         )) .. rt("image=pics/menu_toggle_minimap.png", p(_(
+[[minimap button at the bottom of the screen.]]
+      )) .. p(_(
+[[Alternatively, you could also press ‘m’ on your keyboard.]])
+         )) .. (rt(p(_(
+[[The minimap shows the complete map in miniature. You can directly jump to any field by left-clicking on it. ]] ..
+[[You can also toggle buildings, roads, flags and player indicators on and off inside the minimap.]])
+         ) .. p(_(
+[[But I digress. Back to soldiers. What was I about to do? ]] ..
+[[Oh yes, I wanted to build a small training scenario for you. Let’s do that now.]])
          )
       )
    )
@@ -599,71 +568,73 @@
 
 warfare_and_training_01 = {
    pos = "topright",
-   title = _ "Trainings camp and soldier stats",
-   body = rt(p(_
-[[There we go. Take a look at the soldiers that are on their way into our
-trainings camp. They look different than normal workers: they have a health bar
-over their head that displays their remaining hitpoints and they have four
-symbols which symbolize the individual soldier's current levels in the four
-different categories hitpoints, attack, defense and evade.]]
-      ) .. p(_
-[[A soldier is created as any normal worker: a carrier grabs a tool in a
-warehouse as soon as a request for a certain profession is not fulfilled. The
-tool to create a barbarian soldier is an axe. The newly created soldier is of
-level 0. To make the soldier better in any of the four categories, training is
-needed. Training happens in training sites like the trainings camp or the
-battle arena: soldiers go there (as our little fellows are currently doing),
-consume some wares and advance a level in one category. If a barbarian soldier
-is fully trained, he has level 3 hitpoints, level 5 attack, level 0 defense and
-level 2 evade. This is one fearsome warrior then! The individual statistics
-have the following meaning:]]
-      ) .. h2(_"Hitpoints:") .. p(_
-[[The total life of a soldier. A barbarian soldier starts with ~130 hitpoints,
-with each hitpoint level he gains 28 hitpoints.]]
-      ) .. h2(_"Attack:") .. p(_
-[[The amount of damage a soldier inflicts upon a successful attack on the
-enemy. A barbarian soldier with attack level 0 inflicts ~14 hitpoints damage
-when he succeeds to hit an enemy. For each attack level, he gains 7 damage.]]
-      ) .. h2(_"Defense:") .. p(_
-[[Defense is the value that is subtracted from the attack value. The barbarians
-can not train in this skill and therefore have always defense level 0 which
-means that they always get 3 hitpoints subtracted from the damage inflicted. If
-an attacker with an attack value of 15 hitpoints hits a barbarian soldier, the
-barbarian would lose 15 - 3 = 12 hitpoints. The 3 hitpoints that are subtracted
-are because of the defense ability.]]
-      ) .. h2(_"Evade:") .. p(_
-[[Evade is the chance that the soldier is able to dodge an attack. It is 25% for
-a level 0 evade barbarian and increases in steps of 15% for each level.]]
+   title = _ "Trainings Camp and Soldier Stats",
+   body = rt(p(_(
+[[Here we go. Take a look at the soldiers that are on their way into our training camp. ]] ..
+[[They look different from normal workers: they have a health bar over their head ]] ..
+[[that displays their remaining health, and they have four symbols, ]] ..
+[[which symbolize the individual soldier’s current levels in the four different categories ]] ..
+[[health, attack, defense and evade.]])
+      ) .. p(_(
+[[A soldier is created like any normal worker: ]] ..
+[[a carrier grabs a tool in a warehouse as soon as a request for a certain profession is not fulfilled. ]] ..
+[[The tool to create a barbarian soldier is an ax. Newly created soldiers are of level 0. ]] ..
+[[To make soldiers better in any of the four categories, training is needed.]])
+      ) .. p(_(
+[[Training happens in training sites like the training camp or the battle arena: ]] ..
+[[soldiers go there (as our little fellows are currently doing), ]] ..
+[[consume some wares and advance a level in one category. If a barbarian soldier is fully trained, ]] ..
+[[he has level 3 health, level 5 attack, level 0 defense and level 2 evade. This is one fearsome warrior then!]] ..
+[[The individual statistics have the following meaning:]])
+      ) .. h2(_"Health:") .. p(_(
+[[The total life of a soldier. A barbarian soldier starts with ~130 health points, ]] ..
+[[and with each health level he gains 28 health points.]])
+      ) .. h2(_"Attack:") .. p(_(
+[[The amount of damage a soldier will inflict on the enemy when an attack is successful. ]] ..
+[[A barbarian soldier with attack level 0 inflicts ~14 points of health damage when he succeeds in hitting an enemy. ]] ..
+[[For each attack level, he gains 7 damage points.]])
+      ) .. h2(_"Defense:") .. p(_(
+[[Defense is the value that is subtracted from the attack value. ]] ..
+[[The barbarians cannot train in this skill and therefore have always defense level 0, ]] ..
+[[which means that they always get 3 points subtracted from the damage inflicted. ]] ..
+[[If an attacker with an attack value of 15 points hits a barbarian soldier, the barbarian will lose 15 - 3 = 12 health. ]] ..
+[[The 3 points are subtracted because of the defense ability.]])
+      ) .. h2(_"Evade:") .. p(_(
+[[Evade is the chance that the soldier is able to dodge an attack. ]] ..
+[[It is 25% for a level 0 evade barbarian and increases in steps of 15% for each level.]])
       )
    )
 }
 
 enhance_fortress = {
    pos = "topright",
-   title = _ "Enhance this fortress",
-   body = rt(h1(_ "Enhancing buildings") .. p(_
-[[I will create an enemy for you soon, but let's make sure you are prepared.
-This fortress is already quite strong and conquers a lot of space. But there is
-an even bigger building: the citadel.]]
-      ) .. p(_
-[[Citadels can not be built directly. Instead, you have to construct a fortress
-first and then enhance it to a citadel. To do so, click on the fortress, then
-choose the enhance to citadel button. Your soldiers will leave the citadel
-while the construction is going on. This means that your fortress has no
-military influence any more. If an enemy builds a military building nearby,
-your construction site could burn down. No sweat, that won't happen here.]]
-      ) .. p(_
-[[Enhance your fortress to a citadel now. Remember that you can speed time up
-by using PAGE_UP, building a citadel takes a while.]]
+   title = _ "Enhance This Fortress",
+   body = rt(h1(_ "Enhancing Buildings") .. p(_(
+[[I will create an enemy for you soon, but first let’s make sure you are prepared. ]] ..
+[[This fortress is already quite strong and conquers a lot of space. ]] ..
+[[But there is an even bigger building: the citadel.]])
+      ) .. p(_(
+[[Citadels cannot be built directly. ]] ..
+[[Instead, you will have to construct a fortress first and then enhance it to a citadel. ]] ..
+[[To do so, click on the fortress, then choose the ‘Enhance to Citadel’ button. ]] ..
+[[Your soldiers will leave the fortress while the construction is going on. ]] ..
+[[This means that your fortress will lose its military influence. If an enemy occupies a military building nearby, ]] ..
+[[your construction site will burn down. No sweat, that won’t happen here.]])
+      ) .. p([[• ]] .. 
+_[[Enhance your fortress to a citadel now.]]
+      ) .. p([[→ ]] .. 
+_([[Remember that you can speed time up by using PAGE_UP. ]] ..
+[[Building a citadel takes a while.]])
       )
    ),
    obj_name = "enhance_fortress",
    obj_title = _"Enhance your fortress to a citadel",
-   obj_body = rt(h1(_ "Enhance your fortress") .. p(_
-[[Enhance your fortress to a mighty citadel. The citadel can house 12 soldiers
-and is the biggest military building the barbarians can build. It also costs a
-lot and takes a long time to build. It is most suited to guard strategically
-important points like constricted points or mountains.]]
+   obj_body = rt(h1(_ "Enhance Your Fortress") .. p([[• ]] ..
+_[[Enhance your fortress to a mighty citadel.]]
+      ) .. p([[→ ]] .. 
+_([[The citadel can house 12 soldiers and is the biggest military building the barbarians can build. ]] ..
+[[It also costs a lot of resources and takes a long time to build. ]] ..
+[[It is most suited to guard strategically important points like constricted points or mountains.]])
       )
    )
 }
@@ -671,23 +642,23 @@
 attack_enemey = {
    pos = "topright",
    title = _ "Defeat your enemy",
-   body = rt(h1(_ "Defeat the enemy") .. p(_
-[[I created a sparring partner for you: It is an empire tribe close to your
-citadel. To attack its buildings, click on the door of your target building,
-choose the number of soldiers that you wish to send and click on the attack
-button. Your soldiers will come from all nearby military buildings. Likewise,
-the defenders will come from all nearby military buildings of the enemy and
-intercept your forces.]]
-      ) .. p(_
-[[Attack and conquer all military buildings of the enemy and destroy its
-headquarters.]]
+   body = rt(h1(_ "Defeat the Enemy") .. p(_(
+[[I have created a sparring partner for you: It is an empire tribe close to your citadel. ]] ..
+[[To attack its buildings, click on the door of a target building, ]] ..
+[[choose the number of soldiers that you wish to send and click on the attack button. ]] ..
+[[Your soldiers will come from all nearby military buildings. ]] ..
+[[Likewise, the defenders will come from all nearby military buildings of the enemy and intercept your forces.]])
+      ) .. p([[• ]] .. 
+_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]]
       )
    ),
    obj_name = "defeated_the_empire",
    obj_title = _ "Defeat the enemy tribe",
-   obj_body = rt(h1(_"Defeat your enemy") ..  p(_
-[[Defeat the nearby enemy. To attack a building, click on its doors, choose the
-number of attacking soldiers, then send them via the attack button.]]
+   obj_body = rt(h1(_"Defeat Your Enemy") .. p([[• ]] .. 
+_[[Defeat the nearby enemy.]]
+      ) .. p([[→ ]] .. 
+_([[To attack a building, click on its doors, choose the number of attacking soldiers, ]] ..
+[[then send them via the ‘Attack’ button.]])
       )
    )
 }
@@ -695,29 +666,26 @@
 conclude_tutorial = {
    title = _ "Conclusion",
    body = rt(h1(_"Conclusion") ..
-      p(_
-[[This concludes the tutorial. There is some stuff we have not covered here --
-we have not even built a single producing building even though producing wares
-is the most important thing in Widelands -- but you've learned the ropes. You
-can learn about the remaining stuff while you go through the individual tribe's
-introduction campaigns. Each consists of some scenarios explaining the tribes
-and their economy while introducing the background story of Widelands. Have fun
-playing!]]
-      ) .. p(_
-[[You can continue playing this map or you can end this game whenever you like.
-To leave this game and return to the main menu click on the]]
-      )) .. rt("image=pics/menu_options_menu.png", p(_
-[[options menu button on the very left at the bottom of the screen.
-Then click the]]
+      p(_(
+[[This concludes the tutorial. ]] ..
+[[There is some stuff we have not covered here – we have not even built a single production building ]] ..
+[[even though producing wares is the most important thing in Widelands – but you’ve learned the ropes.]])
+      ) .. p(_(
+[[You can learn about the remaining stuff while you go through the individual tribes’ introduction campaigns. ]] ..
+[[Each consists of some scenarios explaining the tribe and its economy while introducing the background story of Widelands. ]] ..
+[[Have fun playing!]])
+      ) .. p(_(
+[[You can continue playing this map or you can end this game whenever you like. ]] ..
+[[To leave this game and return to the main menu, click on the]])
+      )) .. rt("image=pics/menu_options_menu.png", p(_(
+[[‘Options’ menu button on the very left at the bottom of the screen. ]] ..
+[[Then click the]])
       )) .. rt("image=pics/menu_exit_game.png", p(_
-[[exit game button.]]
+[[‘Exit Game’ button.]]
       )) .. rt(p(_
-[[Thanks for playing this tutorial. Enjoy Widelands and remember
-to visit us at]]
+[[Thanks for playing this tutorial. Enjoy Widelands and remember to visit us at]]
       )) .. rt("text-align=center",
    "<p font-size=24 font-decoration=underline>http://www.widelands.org</p>"
    )
 }
 
-
-
 
=== modified file 'global/militarysites/barracks.empire/conf'
--- global/militarysites/barracks.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/barracks.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 max_soldiers=1
 buildable=no
 prefer_heroes=false
+occupied_string=
+aggressor_string=_Your Barracks discovered an aggressor.
+attack_string=_Your Barracks is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Barracks
+defeated_you_string=_Your soldiers defeated the enemy at the Barracks
+
 
 [idle]
 pics=../../../tribes/empire/barracks/barracks_i_??.png
 
=== modified file 'global/militarysites/barrier.barbarians/conf'
--- global/militarysites/barrier.barbarians/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/barrier.barbarians/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=8
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Barrier discovered an aggressor.
+attack_string=_Your Barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
+defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+
 
 [idle]
 pics=../../../tribes/barbarians/barrier/barrier_i_??.png
 
=== modified file 'global/militarysites/barrier.empire/conf'
--- global/militarysites/barrier.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/barrier.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=8
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Barrier discovered an aggressor.
+attack_string=_Your Barrier is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Barrier
+defeated_you_string=_Your soldiers defeated the enemy at the Barrier
+
 
 [idle]
 pics=../../../tribes/empire/barrier/barrier_i_??.png
 
=== modified file 'global/militarysites/castle.atlanteans/conf'
--- global/militarysites/castle.atlanteans/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/castle.atlanteans/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=12
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Castle discovered an aggressor.
+attack_string=_Your Castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Castle
+defeated_you_string=_Your soldiers defeated the enemy at the Castle
+
 
 [idle]
 pics=../../../tribes/atlanteans/castle/castle_i_??.png
 
=== modified file 'global/militarysites/castle.empire/conf'
--- global/militarysites/castle.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/castle.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=12
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Castle discovered an aggressor.
+attack_string=_Your Castle is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Castle
+defeated_you_string=_Your soldiers defeated the enemy at the Castle
+
 
 [idle]
 pics=../../../tribes/empire/castle/castle_i_??.png
 
=== modified file 'global/militarysites/citadel.barbarians/conf'
--- global/militarysites/citadel.barbarians/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/citadel.barbarians/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=12
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Citadel discovered an aggressor.
+attack_string=_Your Citadel is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Citadel
+defeated_you_string=_Your soldiers defeated the enemy at the Citadel
+
 
 [idle]
 pics=../../../tribes/barbarians/citadel/citadel_i_??.png
 
=== modified file 'global/militarysites/donjon.barbarians/conf'
--- global/militarysites/donjon.barbarians/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/donjon.barbarians/conf	2014-03-05 18:47:45 +0000
@@ -5,6 +5,12 @@
 vision_range=17
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Donjon discovered an aggressor.
+attack_string=_Your Donjon is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Donjon
+defeated_you_string=_Your soldiers defeated the enemy at the Donjon
+
 
 [idle]
 pics=../../../tribes/barbarians/donjon/donjon_i_??.png
 
=== modified file 'global/militarysites/fortress.barbarians/conf'
--- global/militarysites/fortress.barbarians/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/fortress.barbarians/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=11
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Fortress discovered an aggressor.
+attack_string=_Your Fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
+defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+
 
 [idle]
 pics=../../../tribes/barbarians/fortress/fortress_i_??.png
 
=== modified file 'global/militarysites/fortress.empire/conf'
--- global/militarysites/fortress.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/fortress.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=11
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Fortress discovered an aggressor.
+attack_string=_Your Fortress is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Fortress
+defeated_you_string=_Your soldiers defeated the enemy at the Fortress
+
 
 [idle]
 pics=../../../tribes/empire/fortress/fortress_i_??.png
 
=== modified file 'global/militarysites/guardhall.atlanteans/conf'
--- global/militarysites/guardhall.atlanteans/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/guardhall.atlanteans/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=7
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your Guardhall discovered an aggressor.
+attack_string=_Your Guardhall is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Guardhall
+defeated_you_string=_Your soldiers defeated the enemy at the Guardhall
+
 
 [idle]
 pics=../../../tribes/atlanteans/guardhall/guardhall_i_??.png
 
=== modified file 'global/militarysites/guardhouse.atlanteans/conf'
--- global/militarysites/guardhouse.atlanteans/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/guardhouse.atlanteans/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 max_soldiers=2
 buildable=no
 prefer_heroes=false
+occupied_string=
+aggressor_string=_Your Guardhouse discovered an aggressor.
+attack_string=_Your Guardhouse is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Guardhouse
+defeated_you_string=_Your soldiers defeated the enemy at the Guardhouse
+
 
 [idle]
 pics=../../../tribes/atlanteans/guardhouse/guardhouse_i_??.png
 
=== modified file 'global/militarysites/high_tower.atlanteans/conf'
--- global/militarysites/high_tower.atlanteans/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/high_tower.atlanteans/conf	2014-03-05 18:47:45 +0000
@@ -5,6 +5,12 @@
 vision_range=21
 buildable=no
 prefer_heroes=true
+occupied_string=
+aggressor_string=_Your High Tower discovered an aggressor.
+attack_string=_Your High Tower is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the High Tower
+defeated_you_string=_Your soldiers defeated the enemy at the High Tower
+
 
 [idle]
 pics=../../../tribes/atlanteans/high_tower/high_tower_i_??.png
 
=== modified file 'global/militarysites/outpost.empire/conf'
--- global/militarysites/outpost.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/outpost.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 conquers=7
 buildable=no
 prefer_heroes=false
+occupied_string=
+aggressor_string=_Your Outpost discovered an aggressor.
+attack_string=_Your Outpost is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Outpost
+defeated_you_string=_Your soldiers defeated the enemy at the Outpost
+
 
 [idle]
 pics=../../../tribes/empire/outpost/outpost_i_??.png
 
=== modified file 'global/militarysites/sentry.barbarians/conf'
--- global/militarysites/sentry.barbarians/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/sentry.barbarians/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 max_soldiers=2
 buildable=no
 prefer_heroes=false
+occupied_string=
+aggressor_string=_Your Sentry discovered an aggressor.
+attack_string=_Your Sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
+defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+
 
 [idle]
 pics=../../../tribes/barbarians/sentry/sentry_i_??.png
 
=== modified file 'global/militarysites/sentry.empire/conf'
--- global/militarysites/sentry.empire/conf	2013-06-11 16:37:44 +0000
+++ global/militarysites/sentry.empire/conf	2014-03-05 18:47:45 +0000
@@ -4,6 +4,12 @@
 max_soldiers=2
 buildable=no
 prefer_heroes=false
+occupied_string=
+aggressor_string=_Your Sentry discovered an aggressor.
+attack_string=_Your Sentry is under attack.
+defeated_enemy_string=_The enemy defeated your soldiers at the Sentry
+defeated_you_string=_Your soldiers defeated the enemy at the Sentry
+
 
 [idle]
 pics=../../../tribes/empire/sentry/sentry_i_??.png