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

[GunChleoc]

Tada-ching!

Related forum post: https://wl.widelands.org/forum/topic/1827/

Once this branch has been tested, reviewed etc, I will need to merge it personally, because there is some fixing up to do for the translations, which will be semi-automated only. I have left some NOCOM comments in utils for that.

[GunChleoc (gunchleoc)]

Some comments to the code review - posting them here rather than in the code in order not change the branch, in case you're still working on it:

Regarding http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7452#tribes/init.lua

We do need the number glob for parsing the animations for efficiency reasons. Using regular expressions for collecting the image files is sloooooooow - increases loading time for the tribes by about factor 10. I tried both Lua list directory and C++ boost:regex. We could think about writing an auxiliary Lua script to do what NumberGlob does though. Since this won't affect savegame compatibility, I'd classify that as a TODO for a future branch.

Regarding the renaming in
http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7453#world/init.lua

This has consequences for the resource indicators, the legacy tables and the C++ code as well - I don't want to spend a day digging around and undoing this. Since we're renaming a lot of entities, to me it made sense to rename them all at once.

Love the new Lua cleanup script :)

[SirVer (sirver)]

Still working on the review. Have another long train ride today and hope to get it done then. I'll get back to this thread then.

In general I find very little to complain about in the code - really great job :)

> Am 01.11.2015 um 11:01 schrieb GunChleoc <email address hidden>:
>
> Some comments to the code review - posting them here rather than in the code in order not change the branch, in case you're still working on it:
>
> Regarding http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7452#tribes/init.lua
>
> We do need the number glob for parsing the animations for efficiency reasons. Using regular expressions for collecting the image files is sloooooooow - increases loading time for the tribes by about factor 10. I tried both Lua list directory and C++ boost:regex. We could think about writing an auxiliary Lua script to do what NumberGlob does though. Since this won't affect savegame compatibility, I'd classify that as a TODO for a future branch.
>
> Regarding the renaming in
> http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7453#world/init.lua
>
> This has consequences for the resource indicators, the legacy tables and the C++ code as well - I don't want to spend a day digging around and undoing this. Since we're renaming a lot of entities, to me it made sense to rename them all at once.
>
> Love the new Lua cleanup script :)
>
>
> --
> https://code.launchpad.net/~widelands-dev/widelands/one_tribe/+merge/274832
> Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/one_tribe into lp:widelands.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~widelands-dev
> Post to : <email address hidden>
> Unsubscribe : https://launchpad.net/~widelands-dev
> More help : https://help.launchpad.net/ListHelp

[GunChleoc (gunchleoc)]

Regarding http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7452#tribes/buildings/militarysites/atlanteans/guardhouse/init.lua

Renaming "outputs" to "occupants" won't work, because this is a feature of production sites in general and not just militarysites.

[SirVer (sirver)]

Not yet done. I reviewed everything but src/logic/, I cannot concentrate anymore now though. I'll finish the rest tomorrow.

[SirVer (sirver)]

[Num Glob vs list_directory]

I doubt that the regex matching is the slow part, but I can understand that listing all files in the directories and then filtering the ones we are not interested in is slow. The numglob is only checking if files exist, which will be faster.

But I just grepped the source code and realized that we never use the regular expression ability of list_directory anywhere except tests. How about changing it to do the work of NumGlob? I mean renaming it to path.list_files(pattern) (or something better). All "?" in pattern is replaced through numbers and we return a lua table with the filenames. We then guarantee that those files exist and we can already in the Lua dictionaries check that we have indeed pictures, i.e. that the config is sane. Right now, we only do it at load time

[SirVer (sirver)]

> Renaming "outputs" to "occupants" won't work, because this is a feature of production sites in general and not just militarysites.

Add a TODO that militarysite should not be a productionsite? Outputs is really weird for militarysites.

Okay, done with the review. I added a bunch of comments, but found the code very clean and overall a huge improvements. Please have a look over my comments, but I think most should just be converted to bugs and/or todos and this should be merged rather quickly.

Congratulations on this branch - that was a ton on work and a daunting task. Thanks for doing this!

review: Approve

[GunChleoc (gunchleoc)]

Thanks for the review!

Regarding the lookup tables
http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7464

We do need the compatibility, because map loading has a building packet etc. I only included those entities in it that can't be avoided for map loading. I decided to rename world entities as well, because now all names correspond to their descnames - I expect that this will make the code easier to read for modders and for new programmers coming in.

Regarding lua_map
http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7465

I need the building directory info to find the helptexts() file. I can't keep the helptexts in C++ because this would make the localization markup too inflexible - it would block the use of ngettext and splitting up of long strings. Alternatively, I could store the whole helptexts script path in C++ instead.

Regarding animations
http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7466#src/logic/instances.cc

MapObjectDescr::add_directional_animation is still needed. The Lua stuff just creates a Lua table that then fits this function.

Regarding sets
http://bazaar.launchpad.net/~widelands-dev/widelands/one_tribe/revision/7466#src/logic/tribes/tribe_descr.h
I am using a set in TribeDescr because a vector would have holes in it, and it would then be expensive to iterate over only the items that aren't nullptr and to calculate the size - the indices are used as WareIndex, so access is better with a set.

[Num Glob vs list_directory]
Sounds like a plan - I will add this to my "todo" bug. I would like to get this branch in this weekend, because I will need time to fix up the translations. So, I don't want to change the code in this branch too much now.

I will look into the rest of the NOCOMS and see what I can fix up until then.

[GunChleoc (gunchleoc)]

I have a question regarding this comment:

// NOCOM(#codereview): no need to be static?
std::vector<TribeBasicInfo> Tribes::get_all_tribeinfos()

This function is used in the GameSettingsProvider classes before an egbase is created. Is there a better design than using static for this?

[SirVer (sirver)]

> This function is used in the GameSettingsProvider classes before an egbase is created. Is there a better design than using static for this?

IMHO, yes. Pull the method out into a stand alone function. It is more modular, and less coupled (static methods can access private static members and private methods, which is not needed here). This decision is less clear cut though. I just had a discussion today with colleagues and they preferred to have 'related' methods in the class as static, even if they did not need the additionally access rights.

'Effective c++' agrees with me about the less coupling though.

It is a minor thing in any way.

[GunChleoc (gunchleoc)]

I like learning good coe design though, so I'll put it on the todo-list :)

[SirVer (sirver)]

as said, other devs that are as experienced as I am disagree with this last point. So it is more bike shedding and should not be overrated. Other points are more clear cut.

I suggest reading effective c++ and effective c++11 if you want to learn more about good code design - both are really excellent books.

=== modified file '.tx/config'
--- .tx/config	2015-07-25 10:28:16 +0000
+++ .tx/config	2015-11-03 18:26:36 +0000
@@ -79,21 +79,9 @@
 source_lang = en
 type = PO
 
-[widelands.tribe_atlanteans]
-file_filter = po/tribe_atlanteans/<lang>.po
-source_file = po/tribe_atlanteans/tribe_atlanteans.pot
-source_lang = en
-type = PO
-
-[widelands.tribe_barbarians]
-file_filter = po/tribe_barbarians/<lang>.po
-source_file = po/tribe_barbarians/tribe_barbarians.pot
-source_lang = en
-type = PO
-
-[widelands.tribe_empire]
-file_filter = po/tribe_empire/<lang>.po
-source_file = po/tribe_empire/tribe_empire.pot
+[widelands.tribes_encyclopedia]
+file_filter = po/tribes_encyclopedia/<lang>.po
+source_file = po/tribes_encyclopedia/tribes_encyclopedia.pot
 source_lang = en
 type = PO
 

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-10-20 19:56:34 +0000
+++ CMakeLists.txt	2015-11-03 18:26:36 +0000
@@ -239,7 +239,6 @@
   DIRECTORY
     campaigns
     i18n
-    global
     tribes
     txts
     world

=== removed file 'campaigns/atl01.wmf/allowed_worker_types'
--- campaigns/atl01.wmf/allowed_worker_types	2014-08-26 17:25:00 +0000
+++ campaigns/atl01.wmf/allowed_worker_types	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-# Automatically created by Widelands bzr5319[campaigns] (Debug)
-
-[global]
-packet_version="1"
-
-[player_1]
-carrier="true"
-soldier="true"
-baker="true"
-blacksmith="true"
-brewer="true"
-builder="true"
-charcoal_burner="true"
-farmer="true"
-gardener="true"
-fisher="true"
-gamekeeper="true"
-geologist="true"
-helmsmith="true"
-hunter="true"
-innkeeper="true"
-lime-burner="true"
-lumberjack="true"
-miner="true"
-ranger="true"
-smelter="true"
-stonemason="true"
-trainer="true"
-weaver="true"
-scout="true"
-cattlebreeder="true"

=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
--- campaigns/atl01.wmf/scripting/init.lua	2014-10-03 08:58:44 +0000
+++ campaigns/atl01.wmf/scripting/init.lua	2015-11-03 18:26:36 +0000
@@ -57,8 +57,8 @@
 -- ware.
 function count_in_warehouses(ware)
    local whs = array_combine(
-      p1:get_buildings("headquarters"),
-      p1:get_buildings("warehouse")
+      p1:get_buildings("atlanteans_headquarters"),
+      p1:get_buildings("atlanteans_warehouse")
    )
    local rv = 0
    for idx,wh in ipairs(whs) do

=== modified file 'campaigns/atl01.wmf/scripting/mission_thread.lua'
--- campaigns/atl01.wmf/scripting/mission_thread.lua	2014-10-31 11:36:29 +0000
+++ campaigns/atl01.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -46,7 +46,8 @@
 
    local o = add_campaign_objective(obj_horsefarm_and_warehouse)
    while not check_for_buildings(p1, {
-      horsefarm = 1, warehouse = 1,
+      atlanteans_horsefarm = 1,
+      atlanteans_warehouse = 1,
    }) do sleep(2384) end
    o.done = true
 end
@@ -56,7 +57,8 @@
 
    local o = add_campaign_objective(obj_make_training_buildings)
    while not check_for_buildings(p1, {
-      dungeon = 1, labyrinth = 1
+      atlanteans_dungeon = 1,
+      atlanteans_labyrinth = 1
    }) do sleep(3874) end
    o.done = true
 
@@ -68,9 +70,14 @@
 
    local o = add_campaign_objective(obj_make_heavy_industry_and_mining)
    while not check_for_buildings(p1, {
-      coalmine = 1, ironmine = 1, goldmine = 1, crystalmine = 1,
-      smelting_works = 1, weaponsmithy = 1, armorsmithy = 1,
-      toolsmithy = 1,
+      atlanteans_coalmine = 1,
+      atlanteans_ironmine = 1,
+      atlanteans_goldmine = 1,
+      atlanteans_crystalmine = 1,
+      atlanteans_smelting_works = 1,
+      atlanteans_weaponsmithy = 1,
+      atlanteans_armorsmithy = 1,
+      atlanteans_toolsmithy = 1,
    }) do sleep(3478) end
    o.done = true
 
@@ -88,10 +95,15 @@
 
    local o = add_campaign_objective(obj_make_food_infrastructure)
    while not check_for_buildings(p1, {
-      farm = 1, blackroot_farm = 1,
-      sawmill = 1, well = 1, bakery = 1,
-      hunters_house = 1, fishers_house = 1,
-      fish_breeders_house = 1, smokery = 2,
+      atlanteans_farm = 1,
+      atlanteans_blackroot_farm = 1,
+      atlanteans_sawmill = 1,
+      atlanteans_well = 1,
+      atlanteans_bakery = 1,
+      atlanteans_hunters_house = 1,
+      atlanteans_fishers_house = 1,
+      atlanteans_fishbreeders_house = 1,
+      atlanteans_smokery = 2,
    }) do sleep(2789) end
    o.done = true
 
@@ -106,7 +118,9 @@
    local o = add_campaign_objective(obj_spidercloth_production)
 
    while not check_for_buildings(p1, {
-      spiderfarm = 1, ["gold-spinning-mill"] = 1, ["weaving-mill"] = 1
+      atlanteans_spiderfarm = 1,
+      atlanteans_gold_spinning_mill = 1,
+      atlanteans_weaving_mill = 1
    }) do sleep(6273) end
    o.done = true
 
@@ -121,10 +135,10 @@
    expand_objective = add_campaign_objective(obj_expand)
 
    while not check_for_buildings(p1, {
-      woodcutters_house = 2,
-      foresters_house = 2,
-      quarry = 1,
-      sawmill = 1,
+      atlanteans_woodcutters_house = 2,
+      atlanteans_foresters_house = 2,
+      atlanteans_quarry = 1,
+      atlanteans_sawmill = 1,
    }) do sleep(3731) end
    o.done = true
 
@@ -183,7 +197,7 @@
          local bobs = f.bobs
          if #bobs then
             for idx, b in ipairs(bobs) do
-               if b.descr.type_name == "ship" then
+               if b.descr.type_name == "atlanteans_ship" then
                   nships = nships + 1
                end
             end
@@ -215,7 +229,7 @@
             wait_for_roadbuilding_and_scroll(f)
             msg_boxes(field_flooded_msg)
             add_campaign_objective(obj_build_ships)
-            p1:allow_buildings{"shipyard"}
+            p1:allow_buildings{"atlanteans_shipyard"}
             run(check_for_ships)
          end)
       end

=== modified file 'campaigns/atl01.wmf/scripting/starting_conditions.lua'
--- campaigns/atl01.wmf/scripting/starting_conditions.lua	2014-10-03 08:58:44 +0000
+++ campaigns/atl01.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -7,21 +7,21 @@
 -- ===============
 
 p1:allow_buildings("all")
-p1:forbid_buildings{"shipyard"}
+p1:forbid_buildings{"atlanteans_shipyard"}
 
 -- A default headquarters
-include "tribes/atlanteans/scripting/sc00_headquarters.lua"
-init.func(p1) -- defined in sc00_headquarters
+include "tribes/scripting/starting_conditions/atlanteans/headquarters.lua"
+init.func(p1) -- defined in headquarters
 
 local hq = wl.Game().map.player_slots[1].starting_field.immovable
-hq:set_workers{shipwright=1}
+hq:set_workers{atlanteans_shipwright=1}
 
 -- Place some buildings
 prefilled_buildings(p1,
-	{"high_tower", first_tower_field.x, first_tower_field.y,
-		soldiers = { [{0,0,0,0}] = 1 }
-	},
-	{"high_tower", second_tower_field.x, second_tower_field.y,
-		soldiers = { [{0,0,0,0}] = 1 }
-	}
+   {"atlanteans_tower_high", first_tower_field.x, first_tower_field.y,
+      soldiers = { [{0,0,0,0}] = 1 }
+   },
+   {"atlanteans_tower_high", second_tower_field.x, second_tower_field.y,
+      soldiers = { [{0,0,0,0}] = 1 }
+   }
 )

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2015-09-11 17:38:01 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -45,7 +45,7 @@
    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.]]) .. paragraphdivider() ..
+      _([[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.]]) .. paragraphdivider() ..
       listitem_bullet(_[[Build military sites to expand your territory]])
    ),
 }
@@ -55,12 +55,12 @@
    title = _"Establish a solid food production",
    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.]] .. paragraphdivider() ..
+      _[[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.]] .. paragraphdivider() ..
       _[[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.]] .. paragraphdivider() ..
       listitem_bullet(_[[Build a farm and a blackroot farm]]) ..
-      listitem_bullet(_[[Build a mill to make cornflour and blackroot flour]]) ..
+      listitem_bullet(_[[Build a mill to make cornmeal and blackroot flour]]) ..
       listitem_bullet(_[[Build a well]]) ..
-      listitem_bullet(_[[Build a bakery to bake bread from cornflour, blackroot flour and water]]) ..
+      listitem_bullet(_[[Build a bakery to bake bread from cornmeal, blackroot flour and water]]) ..
       listitem_bullet(_[[Build a hunter’s house to get raw meat]]) ..
       listitem_bullet(_[[Build a fisher’s house close to water to get raw fish]]) ..
       listitem_bullet(_[[Build a fish breeder’s house close to the fisher to make sure the fish do not die out]]) ..
@@ -73,7 +73,7 @@
    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 spinning mill out of gold.]] .. paragraphdivider() ..
+      _[[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 thread and spider silk as raw material. Spider silk is produced by the spider farm, while gold thread is produced by the gold spinning mill out of gold.]] .. paragraphdivider() ..
       listitem_bullet(_[[Build a weaving mill]]) ..
       listitem_bullet(_[[Build a spider farm]]) ..
       listitem_bullet(_[[Build a gold spinning mill]])
@@ -85,7 +85,7 @@
    title = _"Build industry and mines",
    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 quartz and diamonds – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] .. paragraphdivider() ..
+      _[[Iron ore, gold ore and coal are mined in the respective mines. The crystal mine will dig for quartz and diamonds – all of them are precious materials and very rarely found. It will produce a lot of stone while searching for them.]] .. paragraphdivider() ..
       listitem_bullet(_[[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.]]) .. paragraphdivider() ..
       listitem_bullet(_[[Build a mine of each type. Make sure to send geologists to the mountain first.]]) ..
       listitem_bullet(_[[Build a smelting works]]) ..
@@ -99,7 +99,7 @@
    title = _"Build training sites for soldiers",
    number = 2,
    body = objective_text(_"Soldier Training Sites",
-		_[[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 sites.]] .. paragraphdivider() ..
+      _[[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 sites.]] .. paragraphdivider() ..
       listitem_bullet(_[[Build a dungeon and a labyrinth]])
  )
 }
@@ -109,7 +109,7 @@
    title = _"Build a warehouse and a horse farm",
    number = 2,
    body = objective_text(_"Warehouse and Horse Farm",
-		_[[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.]] .. paragraphdivider() ..
+      _[[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.]] .. paragraphdivider() ..
       listitem_bullet(_[[Build a warehouse]]) ..
       listitem_bullet(_[[Build a horse farm]])
   )
@@ -120,7 +120,7 @@
    title = _"Build 3 ships to escape from the island",
    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.]]  .. paragraphdivider() ..
+      _[[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.]]  .. paragraphdivider() ..
       listitem_bullet(_[[Build a shipyard close to the lake to start building ships]])
    )
 }
@@ -131,157 +131,157 @@
 
 -- This is an array or message descriptions
 initial_messages = {
-	{
-		title = _"Proud to the Death",
-		body = rt(
-			h1(_"Favored by the God") ..
-			-- TRANSLATORS: Foreword
-			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.]])) ..
-			-- TRANSLATORS: Foreword
-			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 = _"Disgraced Before the God",
-		body = rt(
-			h1(_"The God’s Punishment") ..
-			-- TRANSLATORS: Foreword
-			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.]])) ..
-			-- TRANSLATORS: Foreword
-			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",
-		body = rt(
-			h1(_"Emerging Chaos...") ..
-			-- TRANSLATORS: Foreword
-			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...]])) ..
-			-- TRANSLATORS: Foreword
-			 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.]])) ..
-			 -- TRANSLATORS: Foreword
-			 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.]])) ..
-			 -- TRANSLATORS: Foreword
-			 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.]]))
-		)
-	},
+   {
+      title = _"Proud to the Death",
+      body = rt(
+         h1(_"Favored by the God") ..
+         -- TRANSLATORS: Foreword
+         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.]])) ..
+         -- TRANSLATORS: Foreword
+         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 = _"Disgraced Before the God",
+      body = rt(
+         h1(_"The God’s Punishment") ..
+         -- TRANSLATORS: Foreword
+         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.]])) ..
+         -- TRANSLATORS: Foreword
+         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",
+      body = rt(
+         h1(_"Emerging Chaos...") ..
+         -- TRANSLATORS: Foreword
+         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...]])) ..
+         -- TRANSLATORS: Foreword
+          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.]])) ..
+          -- TRANSLATORS: Foreword
+          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.]])) ..
+          -- TRANSLATORS: Foreword
+          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",
-			-- TRANSLATORS: Jundlina - Diary
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina - Diary
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina - Diary
-			_([[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",
-			-- TRANSLATORS: 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(
-			-- TRANSLATORS: 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(
-			-- TRANSLATORS: 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 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)
-	}
+   {
+      title = _"The Princess’ Memoir",
+      body = jundlina(_"Jundlina Writes Down Her Memories",
+         -- TRANSLATORS: Jundlina - Diary
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina - Diary
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina - Diary
+         _([[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",
+         -- TRANSLATORS: 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(
+         -- TRANSLATORS: 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(
+         -- TRANSLATORS: 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 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",
-			-- TRANSLATORS: Jundlina
-			_([[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(
-			-- TRANSLATORS: Colionder
-			_[[May Satul warm you, Jundlina. Can I be of any service to you or the god?]])
-	},
-	{
-		title = _"Jundlina Replies",
-		body = jundlina(_"Jundlina",
-			-- TRANSLATORS: 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(
-			-- TRANSLATORS: 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 a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Colionder
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Colionder
-			_([[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 where 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(_"Jundlina Agrees",
-			-- TRANSLATORS: Jundlina
-			_([[Your words sound wise to me, Colionder. So be it then.]]))
-			.. new_objectives(obj_make_food_infrastructure)
-	},
+   {
+      title = _"Jundlina is Satisfied",
+      body = jundlina(_"Jundlina’s Memoirs",
+         -- TRANSLATORS: Jundlina
+         _([[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(
+         -- TRANSLATORS: Colionder
+         _[[May Satul warm you, Jundlina. Can I be of any service to you or the god?]])
+   },
+   {
+      title = _"Jundlina Replies",
+      body = jundlina(_"Jundlina",
+         -- TRANSLATORS: 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(
+         -- TRANSLATORS: 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 a ceremony that we just need for our well-being. So I guess we cannot take this away from the individuals completely.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Colionder
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Colionder
+         _([[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 where 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(_"Jundlina Agrees",
+         -- TRANSLATORS: Jundlina
+         _([[Your words sound wise to me, Colionder. So be it then.]]))
+         .. new_objectives(obj_make_food_infrastructure)
+   },
 }
 
 food_story_ended_messages = {
    {
       title = _"Jundlina is Satisfied",
       body = jundlina(_"Jundlina is Reviewing the Reports",
-			-- TRANSLATORS: Jundlina
-			_([[Seems like our food production is finished and everybody is working together nicely. It is really starting to feel like home here.]]))
+         -- TRANSLATORS: Jundlina
+         _([[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(
-			-- TRANSLATORS: 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 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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Opol
-			_([[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",
-			-- TRANSLATORS: Jundlina
-			_([[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 gold spinning mill so that the golden tabards you make will not be golden by name alone.]]))
-			..  new_objectives(obj_spidercloth_production)
-	}
+      title = _"A Man Comes to Jundlina",
+      body = opol(
+         -- TRANSLATORS: 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 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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Opol
+         _([[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",
+         -- TRANSLATORS: Jundlina
+         _([[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 gold spinning mill 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(
-			-- TRANSLATORS: Opol
-			_([[May Satul warm you, Jundlina! The weaving mill, gold spinning mill 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.]]))
+         -- TRANSLATORS: Opol
+         _([[May Satul warm you, Jundlina! The weaving mill, gold spinning mill 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(_"Jundlina",
-			-- TRANSLATORS: 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!]]))
+         -- TRANSLATORS: 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!]]))
    }
 }
 
@@ -290,15 +290,15 @@
    {
       title = _"Sidolus Seeks Out Jundlina",
       body = sidolus(
-			-- TRANSLATORS: Sidolus
-			_([[May Satul warm you, Jundlina. Have you considered mining for resources in the mountains around us? We are running short of quartz 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.]]))
+         -- TRANSLATORS: Sidolus
+         _([[May Satul warm you, Jundlina. Have you considered mining for resources in the mountains around us? We are running short of quartz 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",
-			-- TRANSLATORS: Jundlina
-			_([[I have considered this, Sidolus. I think  it is about time. We will make this a priority for now. You shall get your industry soon!]]))
-			.. new_objectives(obj_make_heavy_industry_and_mining)
+         -- TRANSLATORS: Jundlina
+         _([[I have considered this, Sidolus. I think  it is about time. We will make this a priority for now. You shall get your industry soon!]]))
+         .. new_objectives(obj_make_heavy_industry_and_mining)
    },
 }
 
@@ -306,21 +306,21 @@
    {
       title = _"Jundlina Summons Sidolus",
       body = jundlina(_"Jundlina is Angry",
-			-- TRANSLATORS: Jundlina
-			_([[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!]]))
+         -- TRANSLATORS: Jundlina
+         _([[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(
-			-- TRANSLATORS: 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.]]))
+         -- TRANSLATORS: 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(_"Jundlina",
-			-- TRANSLATORS: 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)
+         -- TRANSLATORS: 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)
    }
 }
 
@@ -328,8 +328,8 @@
    {
       title = _"Jundlina Received a Letter",
       body = jundlina(_"Jundlina",
-			-- TRANSLATORS: 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 civilian population.]]))
+         -- TRANSLATORS: 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 civilian population.]]))
    }
 }
 
@@ -337,12 +337,12 @@
    {
       title = _"Jundlina Considers the Economy",
       body = jundlina(_"Jundlina",
-			-- TRANSLATORS: Jundlina
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina
-			_([[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)
+         -- TRANSLATORS: Jundlina
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina
+         _([[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)
    }
 }
 
@@ -350,104 +350,104 @@
 --                         Leftover buildings found
 -- =======================================================================
 first_leftover_building_found = {
-	{
-		posx = 100000,
-		posy = 0,
-		title = _"A Dangerous Discovery",
-		body = jundlina(_"Jundlina is in Thought",
-			-- TRANSLATORS: Jundlina
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina
-			_([[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?]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina
-			_([[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.]]))
-	}
+   {
+      posx = 100000,
+      posy = 0,
+      title = _"A Dangerous Discovery",
+      body = jundlina(_"Jundlina is in Thought",
+         -- TRANSLATORS: Jundlina
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina
+         _([[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?]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina
+         _([[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.]]))
+   }
 }
 
 second_leftover_building_found = {
-	{
-		posx = 100000,
-		posy = 0,
-		title = _"Another Building",
-		body = jundlina(_"Jundlina is Worried",
-			-- TRANSLATORS: Jundlina
-			_([[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.]]))
-	}
+   {
+      posx = 100000,
+      posy = 0,
+      title = _"Another Building",
+      body = jundlina(_"Jundlina is Worried",
+         -- TRANSLATORS: Jundlina
+         _([[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.]]))
+   }
 }
 
 third_leftover_building_found = {
-	{
-		posx = 100000,
-		posy = 0,
-		title = _"One More Building",
-		body = jundlina(_"Jundlina is in Thought",
-			-- TRANSLATORS: 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.]]))
-	}
+   {
+      posx = 100000,
+      posy = 0,
+      title = _"One More Building",
+      body = jundlina(_"Jundlina is in Thought",
+         -- TRANSLATORS: 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.]]))
+   }
 }
 
 -- =======================
 -- Flooding of the island
 -- =======================
 field_flooded_msg = {
-	{
-		posx = 100000,
-		posy = 0,
-		title = _"The Water is Rising!",
-		body = jundlina(_"Jundlina",
-			-- TRANSLATORS: 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(
-			-- TRANSLATORS: 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",
-			-- TRANSLATORS: 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",
-		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(
-			-- TRANSLATORS: 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(_"Jundlina",
-			-- TRANSLATORS: Jundlina
-			_([[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.]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina
-			_([[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)
-	}
+   {
+      posx = 100000,
+      posy = 0,
+      title = _"The Water is Rising!",
+      body = jundlina(_"Jundlina",
+         -- TRANSLATORS: 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(
+         -- TRANSLATORS: 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",
+         -- TRANSLATORS: 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",
+      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(
+         -- TRANSLATORS: 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(_"Jundlina",
+         -- TRANSLATORS: Jundlina
+         _([[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.]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina
+         _([[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",
-			-- TRANSLATORS: 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...]])
-			.. paragraphdivider() ..
-			-- TRANSLATORS: Jundlina
-			_([[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.]]))
+         -- TRANSLATORS: 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...]])
+         .. paragraphdivider() ..
+         -- TRANSLATORS: Jundlina
+         _([[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/bar01.wmf/scripting/helper_functions.lua'
--- campaigns/bar01.wmf/scripting/helper_functions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/bar01.wmf/scripting/helper_functions.lua	2015-11-03 18:26:36 +0000
@@ -19,4 +19,3 @@
 
    return scroll_smoothly_to_pos(x - mv.width / 2, y - mv.height / 2, g_T)
 end
-

=== modified file 'campaigns/bar01.wmf/scripting/init.lua'
--- campaigns/bar01.wmf/scripting/init.lua	2014-10-20 13:59:04 +0000
+++ campaigns/bar01.wmf/scripting/init.lua	2015-11-03 18:26:36 +0000
@@ -25,4 +25,3 @@
 include "map:scripting/starting_conditions.lua"
 
 include "map:scripting/mission_thread.lua"
-

=== modified file 'campaigns/bar01.wmf/scripting/mission_thread.lua'
--- campaigns/bar01.wmf/scripting/mission_thread.lua	2014-10-30 11:37:38 +0000
+++ campaigns/bar01.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -19,8 +19,8 @@
 
    message_box_objective(plr, briefing_msg_01)
    -- these buildings are still burning, but only for a while
-   map:place_immovable("destroyed_building",map:get_field(7,41),"barbarians")
-   map:place_immovable("destroyed_building",map:get_field(5,52),"barbarians")
+   map:place_immovable("destroyed_building",map:get_field(7,41),"tribes")
+   map:place_immovable("destroyed_building",map:get_field(5,52),"tribes")
    plr:reveal_fields(al_thunran:region(8))
    message_box_objective(plr, briefing_msg_02) -- Al'thunran
    plr:reveal_fields(grave:region(4))
@@ -37,10 +37,10 @@
    message_box_objective(plr, order_msg_ranger)
    local obj = add_campaign_objective(obj_build_rangers)
 
-   while not check_for_buildings(plr, {rangers_hut = 2}) do sleep(500) end
+   while not check_for_buildings(plr, {barbarians_rangers_hut = 2}) do sleep(500) end
    obj.done = true
 
-   plr:allow_buildings{"sentry","barrier"}
+   plr:allow_buildings{"barbarians_sentry", "barbarians_barrier"}
 
    message_box_objective(plr, order_msg_1)
    message_box_objective(plr, order_msg_2)
@@ -59,7 +59,7 @@
 
    -- Now, wait till the quarry comes up
    local f = wl.Game().map:get_field(27,48):region(6)
-   while not check_for_buildings(plr, { quarry = 1 }, f) do
+   while not check_for_buildings(plr, { barbarians_quarry = 1 }, f) do
       sleep(5000)
    end
    obj.done = true
@@ -85,17 +85,17 @@
    message_box_objective(plr, order_msg_6_geologist)
    o = add_campaign_objective(obj_build_mines)
    plr:allow_buildings{
-      "coalmine",
-      "oremine",
-      "goldmine",
-      "granitemine"
+      "barbarians_coalmine",
+      "barbarians_ironmine",
+      "barbarians_goldmine",
+      "barbarians_granitemine"
    }
 
    sleep(10000)
    message_box_objective(plr, story_msg2)
 
    -- Wait for completion
-   while not check_for_buildings(plr, {coalmine = 1, oremine = 1}) do
+   while not check_for_buildings(plr, {barbarians_coalmine = 1, barbarians_ironmine = 1}) do
       sleep(5000)
    end
    o.done = true
@@ -111,18 +111,20 @@
       local hunter_msg_done = nil
       while true do
          local rv = plr:get_buildings{
-            "hunters_hut", "gamekeepers_hut", "tavern"
+            "barbarians_hunters_hut",
+            "barbarians_gamekeepers_hut",
+            "barbarians_tavern"
          }
-         if #rv.hunters_hut >= 1 and not hunter_msg_done then
+         if #rv.barbarians_hunters_hut >= 1 and not hunter_msg_done then
             message_box_objective(plr, order_msg_11_basic_food_began)
             hunter_msg_done = true
          end
-         if #rv.tavern >= 1 and not tavern_msg_done then
+         if #rv.barbarians_tavern >= 1 and not tavern_msg_done then
             message_box_objective(plr, order_msg_13_tavern)
             tavern_msg_done = true
          end
-         if #rv.hunters_hut >= 1 and #rv.gamekeepers_hut >= 1
-                  and #rv.tavern >= 1 then break end
+         if #rv.barbarians_hunters_hut >= 1 and #rv.barbarians_gamekeepers_hut >= 1
+                  and #rv.barbarians_tavern >= 1 then break end
          sleep(5331)
       end
       obj_bf.done = true
@@ -137,8 +139,8 @@
 
    run(function()
       while 1 do
-         local rv = plr:get_buildings{"well", "bakery", "farm"}
-         if #rv.well >= 1 and #rv.bakery >= 1 and #rv.farm >= 1 then
+         local rv = plr:get_buildings{"barbarians_well", "barbarians_bakery", "barbarians_farm"}
+         if #rv.barbarians_well >= 1 and #rv.barbarians_bakery >= 1 and #rv.barbarians_farm >= 1 then
             break
          end
          sleep(4234)
@@ -149,13 +151,13 @@
 
    -- Enable food production
    plr:allow_buildings{
-      "hunters_hut",
-      "fishers_hut",
-      "gamekeepers_hut",
-      "tavern",
-      "farm",
-      "well",
-      "bakery",
+      "barbarians_hunters_hut",
+      "barbarians_fishers_hut",
+      "barbarians_gamekeepers_hut",
+      "barbarians_tavern",
+      "barbarians_farm",
+      "barbarians_well",
+      "barbarians_bakery",
    }
 
    while not (obj_bf.done and obj_farming.done) do
@@ -164,9 +166,9 @@
 
    -- Ready to build refiner stuff
    message_box_objective(plr, order_msg_14_refine_ore)
-   plr:allow_buildings{"smelting_works"}
+   plr:allow_buildings{"barbarians_smelting_works"}
    o = add_campaign_objective(obj_refine_ores)
-   while #plr:get_buildings("smelting_works") < 1 do
+   while #plr:get_buildings("barbarians_smelting_works") < 1 do
       sleep(6223)
    end
    o.done = true
@@ -175,15 +177,15 @@
    -- Wait until the player has an experienced worker.
    local chiefminer_found = false
    while not chiefminer_found do
-      local mines = plr:get_buildings{"coalmine","oremine"}
-      for k,v in ipairs(mines.coalmine) do
-         if v:get_workers("chief-miner") > 0 then
+      local mines = plr:get_buildings{"barbarians_coalmine","barbarians_ironmine"}
+      for k,v in ipairs(mines.barbarians_coalmine) do
+         if v:get_workers("barbarians_miner_chief") > 0 then
             chiefminer_found = true
             break
          end
       end
-      for k,v in ipairs(mines.oremine) do
-         if v:get_workers("chief-miner") > 0 then
+      for k,v in ipairs(mines.barbarians_ironmine) do
+         if v:get_workers("barbarians_miner_chief") > 0 then
             chiefminer_found = true
             break
          end
@@ -196,14 +198,22 @@
       sleep(5000)
    end
    message_box_objective(plr, order_msg_15_mines_exhausted)
-   plr:allow_buildings{"deep_coalmine", "deep_oremine", "inn", "micro-brewery"}
+   plr:allow_buildings{
+      "barbarians_coalmine_deep",
+      "barbarians_ironmine_deep",
+      "barbarians_inn",
+      "barbarians_micro_brewery"}
    local obj = add_campaign_objective(obj_enhance_buildings)
 
    run(function()
       while true do
-         local rv = plr:get_buildings{"deep_coalmine", "deep_oremine", "inn", "micro-brewery"}
-         if (#rv.inn > 0 and #rv["micro-brewery"] > 0) and
-            (#rv.deep_coalmine + #rv.deep_oremine > 0) then
+         local rv = plr:get_buildings{
+            "barbarians_coalmine_deep",
+            "barbarians_ironmine_deep",
+            "barbarians_inn",
+            "barbarians_micro_brewery"}
+         if (#rv.barbarians_inn > 0 and #rv["barbarians_micro_brewery"] > 0) and
+            (#rv.barbarians_coalmine_deep + #rv.barbarians_ironmine_deep > 0) then
             break
          end
          sleep(5421)
@@ -222,33 +232,37 @@
 
    -- Wait for a barrier or sentry to be built
    while true do
-      local rv = plr:get_buildings{"sentry", "barrier"}
-      if #rv.sentry + #rv.barrier > 0 then
+      local rv = plr:get_buildings{"barbarians_sentry", "barbarians_barrier"}
+      if #rv.barbarians_sentry + #rv.barbarians_barrier > 0 then
          break
       end
       sleep(5421)
    end
 
    message_box_objective(plr, order_msg_16_blackwood)
-   plr:allow_buildings{"hardener"}
+   plr:allow_buildings{"barbarians_wood_hardener"}
    sf.immovable:set_wares("blackwood",5)
    -- So that player has really little, but still enough to expand a bit
    local o = add_campaign_objective(obj_better_material_1)
 
    sleep(30*1000)
    message_box_objective(plr, story_msg1)
-   while #plr:get_buildings("hardener") < 1 do sleep(5421) end
+   while #plr:get_buildings("barbarians_wood_hardener") < 1 do sleep(5421) end
    o.done = true
 
    message_box_objective(plr, order_msg_17_grout)
-   plr:allow_buildings{"lime_kiln", "well", "charcoal_kiln"}
+   plr:allow_buildings{"barbarians_lime_kiln", "barbarians_well", "barbarians_charcoal_kiln"}
    o = add_campaign_objective(obj_better_material_2)
    -- Wait for the buildings to be built
    while true do
-      local rv = plr:get_buildings{"lime_kiln", "well",
-         "coalmine", "deep_coalmine", "charcoal_kiln"}
-      if (#rv.lime_kiln > 0 and #rv.well > 0) and
-         (#rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln > 0) then
+      local rv = plr:get_buildings{
+         "barbarians_lime_kiln",
+         "barbarians_well",
+         "barbarians_coalmine",
+         "barbarians_coalmine_deep",
+         "barbarians_charcoal_kiln"}
+      if (#rv.barbarians_lime_kiln > 0 and #rv.barbarians_well > 0) and
+         (#rv.barbarians_coalmine + #rv.barbarians_coalmine_deep + #rv.barbarians_charcoal_kiln > 0) then
          break
       end
       sleep(5421)
@@ -256,9 +270,9 @@
    o.done = true
 
    message_box_objective(plr, order_msg_18_reed)
-   plr:allow_buildings{"reed_yard"}
+   plr:allow_buildings{"barbarians_reed_yard"}
    o = add_campaign_objective(obj_better_material_3)
-   while #plr:get_buildings("reed_yard") < 1 do sleep(5421) end
+   while #plr:get_buildings("barbarians_reed_yard") < 1 do sleep(5421) end
 
    message_box_objective(plr, order_msg_19_all_material)
    o.done = true
@@ -270,19 +284,19 @@
 -- Cattlefarm thread
 -- ==================
 function cattle_farm()
-   while not check_for_buildings(plr, { farm = 1, well = 1 }) do
+   while not check_for_buildings(plr, { barbarians_farm = 1, barbarians_well = 1 }) do
       sleep(7834)
    end
 
    message_box_objective(plr, msg_cattlefarm_00)
 
    local o = add_campaign_objective(obj_build_cattlefarm)
-   plr:allow_buildings{"cattlefarm"}
+   plr:allow_buildings{"barbarians_cattlefarm"}
 
    sleep(10000)
    message_box_objective(plr, story_msg3)
 
-   while not check_for_buildings(plr, { cattlefarm = 1 }) do
+   while not check_for_buildings(plr, { barbarians_cattlefarm = 1 }) do
       sleep(2323)
    end
    o.done = true

=== modified file 'campaigns/bar01.wmf/scripting/secret_village.lua'
--- campaigns/bar01.wmf/scripting/secret_village.lua	2014-10-28 19:23:06 +0000
+++ campaigns/bar01.wmf/scripting/secret_village.lua	2015-11-03 18:26:36 +0000
@@ -53,75 +53,75 @@
    end
 
    force_map_immovables{
-      { "spruce_summer_old", 55, 19 },
-      { "larch_summer_pole", 58, 19 },
-      { "birch_summer_mature", 58, 20 },
-      { "larch_summer_old", 57, 21 },
-      { "alder_summer_pole", 54, 22 },
-      { "birch_summer_pole", 56, 24 },
-      { "aspen_summer_old", 58, 24 },
-      { "larch_summer_pole", 56, 25 },
-      { "spruce_summer_old", 53, 27 },
-      { "larch_summer_pole", 57, 27 },
-      { "aspen_summer_mature", 52, 29 },
-      { "birch_summer_pole", 54, 30 },
-      { "beech_summer_old", 55, 30 },
-      { "larch_summer_old", 56, 30 },
-      { "field2", 56, 14, "barbarians" },
-      { "field0s",57, 14, "barbarians" },
-      { "field2", 54, 15, "barbarians" },
-      { "field2", 57, 15, "barbarians" },
-      { "field2", 54, 16, "barbarians" },
-      { "field1", 57, 16, "barbarians" },
-      { "field2", 58, 16, "barbarians" },
-      { "field2", 54, 17, "barbarians" },
-      { "field0", 55, 17, "barbarians" },
-      { "field2", 57, 17, "barbarians" },
-      { "field2", 55, 18, "barbarians" },
-      { "field2", 57, 18, "barbarians" },
-      { "field2", 53, 31, "barbarians" },
-      { "field2", 54, 31, "barbarians" },
-      { "field0", 55, 31, "barbarians" },
-      { "field2", 56, 32, "barbarians" },
-      { "field2", 52, 33, "barbarians" },
-      { "field0s",55, 33, "barbarians" },
-      { "field2", 56, 33, "barbarians" },
-      { "field2", 53, 34, "barbarians" },
-      { "field1", 54, 34, "barbarians" },
-      { "field2", 56, 34, "barbarians" },
-      { "field2", 53, 35, "barbarians" },
-      { "field2", 55, 35, "barbarians" },
+      { "spruce_summer_old", 55, 19, "world" },
+      { "larch_summer_pole", 58, 19, "world" },
+      { "birch_summer_mature", 58, 20, "world" },
+      { "larch_summer_old", 57, 21, "world" },
+      { "alder_summer_pole", 54, 22, "world" },
+      { "birch_summer_pole", 56, 24, "world" },
+      { "aspen_summer_old", 58, 24, "world" },
+      { "larch_summer_pole", 56, 25, "world" },
+      { "spruce_summer_old", 53, 27, "world" },
+      { "larch_summer_pole", 57, 27, "world" },
+      { "aspen_summer_mature", 52, 29, "world" },
+      { "birch_summer_pole", 54, 30, "world" },
+      { "beech_summer_old", 55, 30, "world" },
+      { "larch_summer_old", 56, 30, "world" },
+      { "field_harvested", 56, 14, "tribes" },
+      { "field_small",57, 14, "tribes" },
+      { "field_harvested", 54, 15, "tribes" },
+      { "field_harvested", 57, 15, "tribes" },
+      { "field_harvested", 54, 16, "tribes" },
+      { "field_ripe", 57, 16, "tribes" },
+      { "field_harvested", 58, 16, "tribes" },
+      { "field_harvested", 54, 17, "tribes" },
+      { "field_medium", 55, 17, "tribes" },
+      { "field_harvested", 57, 17, "tribes" },
+      { "field_harvested", 55, 18, "tribes" },
+      { "field_harvested", 57, 18, "tribes" },
+      { "field_harvested", 53, 31, "tribes" },
+      { "field_harvested", 54, 31, "tribes" },
+      { "field_medium", 55, 31, "tribes" },
+      { "field_harvested", 56, 32, "tribes" },
+      { "field_harvested", 52, 33, "tribes" },
+      { "field_small",55, 33, "tribes" },
+      { "field_harvested", 56, 33, "tribes" },
+      { "field_harvested", 53, 34, "tribes" },
+      { "field_ripe", 54, 34, "tribes" },
+      { "field_harvested", 56, 34, "tribes" },
+      { "field_harvested", 53, 35, "tribes" },
+      { "field_harvested", 55, 35, "tribes" },
    }
 
    local plr = wl.Game().players[1]
    prefilled_buildings(plr,
-      {"sentry", 57, 9},
-      {"sentry", 52, 39},
-      {"hunters_hut", 56, 10},
-      {"gamekeepers_hut", 56, 12},
-      {"farm", 56, 16},
-      {"well", 54, 18},
-      {"bakery", 55, 20, wares = {wheat=6, water=6}},
-      {"lumberjacks_hut", 56, 21},
-      {"lumberjacks_hut", 55, 22},
-      {"lumberjacks_hut", 54, 24},
-      {"rangers_hut", 57, 24},
-      {"rangers_hut", 55, 25},
-      {"hardener", 54, 26, wares = {log = 8}},
+      {"barbarians_sentry", 57, 9},
+      {"barbarians_sentry", 52, 39},
+      {"barbarians_hunters_hut", 56, 10},
+      {"barbarians_gamekeepers_hut", 56, 12},
+      {"barbarians_farm", 56, 16},
+      {"barbarians_well", 54, 18},
+      {"barbarians_bakery", 55, 20, wares = {wheat = 6, water = 6}},
+      {"barbarians_lumberjacks_hut", 56, 21},
+      {"barbarians_lumberjacks_hut", 55, 22},
+      {"barbarians_lumberjacks_hut", 54, 24},
+      {"barbarians_rangers_hut", 57, 24},
+      {"barbarians_rangers_hut", 55, 25},
+      {"barbarians_wood_hardener", 54, 26, wares = {log = 8}},
       -- to make it more realistic
-      {"warehouse", 53, 28,
+      {"barbarians_warehouse", 53, 28,
          wares = {
             wheat = 20,
             log = 40,
             meat = 30
          }
       },
-      {"inn", 55, 28, wares = {pittabread = 4, meat = 4}},
-      {"tavern", 57, 28, wares = {pittabread=4, meat = 4}},
-      {"well", 52, 30},
-      {"farm", 54, 33},
-      {"bakery", 51, 35, wares = {wheat = 6, water = 6}},
-      {"well", 52, 37}
+      {"barbarians_inn", 55, 28, wares = {barbarians_bread = 4, meat = 4}},
+      {"barbarians_tavern", 57, 28, wares = {barbarians_bread = 4, meat = 4}},
+      {"barbarians_well", 52, 30},
+      {"barbarians_farm", 54, 33},
+      {"barbarians_bakery", 51, 35, wares = {wheat = 6, water = 6}},
+      {"barbarians_well", 52, 37}
    )
 
    -- Adjust the borders so that the village owns everything green

=== modified file 'campaigns/bar01.wmf/scripting/starting_conditions.lua'
--- campaigns/bar01.wmf/scripting/starting_conditions.lua	2014-10-18 12:34:17 +0000
+++ campaigns/bar01.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -5,65 +5,64 @@
 -- Allow some buildings
 plr:forbid_buildings("all")
 plr:allow_buildings{
-   "lumberjacks_hut",
-   "quarry",
-   "rangers_hut"
+   "barbarians_lumberjacks_hut",
+   "barbarians_quarry",
+   "barbarians_rangers_hut"
 }
 
 -- Place headquarters and fill it with wares
-hq = plr:place_building("headquarters_interim", sf, false, true)
+hq = plr:place_building("barbarians_headquarters_interim", sf, false, true)
 hq:set_wares{
-   ax=6,
-   bread_paddle=2,
-   blackwood=32,
-   coal=5,
-   fire_tongs=2,
-   fish=6,
-   grout=4,
-   hammer=12,
-   hunting_spear=2,
-   ironore=5,
-   kitchen_tools=4,
-   meal=4,
-   meat=6,
-   pick=14,
-   pittabread=8,
-   ration=12,
-   raw_stone=40,
-   scythe=6,
-   shovel=4,
-   snack=3,
-   thatchreed=24,
-   log=80,
+   ax = 6,
+   blackwood = 32,
+   barbarians_bread = 8,
+   bread_paddle = 2,
+   coal = 5,
+   fire_tongs = 2,
+   fish = 6,
+   granite = 40,
+   grout = 4,
+   hammer = 12,
+   hunting_spear = 2,
+   iron_ore = 5,
+   kitchen_tools = 4,
+   log = 80,
+   meal = 4,
+   meat = 6,
+   pick = 14,
+   ration = 12,
+   scythe = 6,
+   shovel = 4,
+   snack = 3,
+   thatch_reed = 24,
 }
 hq:set_workers{
-   blacksmith=2,
-   brewer=1,
-   builder=10,
-   carrier=40,
-   charcoal_burner=1,
-   gardener=1,
-   fisher=1,
-   geologist=4,
-   ["lime-burner"]=1,
-   lumberjack=3,
-   miner=4,
-   ranger=2,
-   stonemason=2
+   barbarians_blacksmith = 2,
+   barbarians_brewer = 1,
+   barbarians_builder = 10,
+   barbarians_carrier = 40,
+   barbarians_charcoal_burner = 1,
+   barbarians_fisher = 1,
+   barbarians_gardener = 1,
+   barbarians_geologist = 4,
+   barbarians_lime_burner = 1,
+   barbarians_lumberjack = 3,
+   barbarians_miner = 4,
+   barbarians_ranger = 2,
+   barbarians_stonemason = 2
 }
 hq:set_soldiers({0,0,0,0}, 45)
 
 -- ============
 -- Build roads
 -- ============
---connected_road(plr,sf.brn.immovable, "r,r|br,r")
 connected_road(plr, sf.brn.immovable, "r,r|br,r|r,r")
 connected_road(plr, sf.brn.immovable, "l,l|l,bl,bl|br,r|br,r|r,tr|tr,tr,tr")
 connected_road(plr, map:get_field(13,14).immovable, "r,br|br,r")
 
 -- Place some initial buildings
 prefilled_buildings(plr,
-   {"lumberjacks_hut", 15, 11},
-   {"lumberjacks_hut", 9, 13},
-   {"quarry", 8, 12}
+   {"barbarians_lumberjacks_hut", 15, 11},
+   {"barbarians_lumberjacks_hut", 9, 13},
+   {"barbarians_quarry", 8, 12}
 )

=== modified file 'campaigns/bar01.wmf/scripting/texts.lua'
--- campaigns/bar01.wmf/scripting/texts.lua	2015-09-11 17:38:01 +0000
+++ campaigns/bar01.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -41,22 +41,22 @@
    name = "mission mines",
    title = _"Start building mines on the mountain",
    number = 2,
-   body = objective_text(_"Build coal and iron ore mines",
-      listitem_bullet(_"Build a coal mine and an iron ore mine.") ..
+   body = objective_text(_"Build coal and iron mines",
+      listitem_bullet(_"Build a coal mine and an iron mine.") ..
       listitem_arrow(_"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 they will find, choosing the appropriate mine to be built:") ..
-		"</rt>" ..
-		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")) ..
-		rt("image=tribes/barbarians/resi_iron1/resi_00.png", p(_"a bit of iron")) ..
-		rt("image=tribes/barbarians/resi_iron2/resi_00.png", p(_"a lot of iron")) ..
-		rt("image=tribes/barbarians/resi_gold1/resi_00.png", p(_"a bit of gold")) ..
-		rt("image=tribes/barbarians/resi_gold2/resi_00.png", p(_"a lot of gold")) ..
-		rt("image=tribes/barbarians/resi_granite1/resi_00.png", p(_"a bit of granite")) ..
-		rt("image=tribes/barbarians/resi_granite2/resi_00.png", p(_"a lot of granite")) ..
-		rt("image=tribes/barbarians/resi_water1/resi_00.png", p(_"water")) ..
-		rt("image=tribes/barbarians/resi_none/resi_00.png", p(_"nothing was found here")) ..
-		"<rt>" ..
-			p(_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as orange mine symbols.]]))
+      "</rt>" ..
+      rt("image=tribes/immovables/resi_coal1/idle_00.png", p(_"a bit of coal")) ..
+      rt("image=tribes/immovables/resi_coal2/idle_00.png", p(_"a lot of coal")) ..
+      rt("image=tribes/immovables/resi_iron1/idle_00.png", p(_"a bit of iron")) ..
+      rt("image=tribes/immovables/resi_iron2/idle_00.png", p(_"a lot of iron")) ..
+      rt("image=tribes/immovables/resi_gold1/idle_00.png", p(_"a bit of gold")) ..
+      rt("image=tribes/immovables/resi_gold2/idle_00.png", p(_"a lot of gold")) ..
+      rt("image=tribes/immovables/resi_stones1/idle_00.png", p(_"a bit of granite")) ..
+      rt("image=tribes/immovables/resi_stones2/idle_00.png", p(_"a lot of granite")) ..
+      rt("image=tribes/immovables/resi_water1/idle_00.png", p(_"water")) ..
+      rt("image=tribes/immovables/resi_none/idle_00.png", p(_"nothing was found here")) ..
+      "<rt>" ..
+         p(_[[Mines can only be built on mountain terrain. Suitable places for mines are displayed as orange mine symbols.]]))
 }
 
 obj_basic_food = {
@@ -103,7 +103,7 @@
    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.]])
+      _([[Bigger and better buildings – including all military ones – require better building materials. They cannot be built out of simple logs – the logs have 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.]])
       .. paragraphdivider() ..
       listitem_bullet(_"Build a wood hardener"))
 }
@@ -313,7 +313,7 @@
    title = _"Your Loyal Companion",
    body = boldreth(_"Brave Boldreth steps to your side…",
       -- TRANSLATORS: Boldreth
-		_([[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.]]))
+      _([[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.]]))
 }
 
 
@@ -321,7 +321,7 @@
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh joins in…",
       -- TRANSLATORS: Khantrukh
-		_([[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 = {
@@ -508,7 +508,7 @@
       -- TRANSLATORS: Thron
       _([[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.]])
+         _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])
 }
 
 msg_story_1 = {
@@ -547,4 +547,3 @@
       _([[But they fear that the war around Al’thunran will set an end to this life. Therefore, they have decided to join us, hoping that we can help each other.]])
    )
 }
-

=== modified file 'campaigns/bar02.wmf/scripting/mission_thread.lua'
--- campaigns/bar02.wmf/scripting/mission_thread.lua	2014-10-02 18:51:30 +0000
+++ campaigns/bar02.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -26,9 +26,9 @@
 
    campaign_message_box(cattlefarm_01)
 
-   p1:allow_buildings{"cattlefarm"}
+   p1:allow_buildings{"barbarians_cattlefarm"}
    local o = add_campaign_objective(obj_build_cattlefarm)
-   while not check_for_buildings(p1, {cattlefarm = 1}) do
+   while not check_for_buildings(p1, {barbarians_cattlefarm = 1}) do
       sleep(1223) end
    o.done = true
 
@@ -42,23 +42,24 @@
    campaign_message_box(briefing_msg_1)
    campaign_message_box(order_msg_1_small_food_economy)
 
-   p1:allow_buildings{"fishers_hut",
-      "hunters_hut",
-      "gamekeepers_hut",
-      "tavern",
-      "farm",
-      "well",
-      "bakery",
-      "sentry",
+   p1:allow_buildings{
+      "barbarians_fishers_hut",
+      "barbarians_hunters_hut",
+      "barbarians_gamekeepers_hut",
+      "barbarians_tavern",
+      "barbarians_farm",
+      "barbarians_well",
+      "barbarians_bakery",
+      "barbarians_sentry",
    }
 
    local o = add_campaign_objective(obj_build_small_food_economy)
    while not check_for_buildings(p1, {
-         fishers_hut = 1,
-         hunters_hut = 1,
-         well = 1,
-         farm = 1,
-         bakery = 1,
+         barbarians_fishers_hut = 1,
+         barbarians_hunters_hut = 1,
+         barbarians_well = 1,
+         barbarians_farm = 1,
+         barbarians_bakery = 1,
       }) do sleep(3413) end
    o.done = true
    campaign_message_box(story_note_1)
@@ -70,7 +71,7 @@
 function foottracks()
    -- Hunter build and some time passed or expanded east
    while true do
-      if game.time > 900000 and #p1:get_buildings("hunters_hut") > 0
+      if game.time > 900000 and #p1:get_buildings("barbarians_hunters_hut") > 0
       then break end
       if check_conquered_footprints()
       then break end
@@ -86,10 +87,10 @@
 
    local pts = scroll_smoothly_to(game.map:get_field(67,19))
 
-   campaign_message_box(order_msg_2_build_a_donjon)
-   local o = add_campaign_objective(obj_build_a_donjon)
-   p1:forbid_buildings{"sentry"}
-   p1:allow_buildings{"donjon"}
+   campaign_message_box(order_msg_2_build_a_tower)
+   local o = add_campaign_objective(obj_build_a_tower)
+   p1:forbid_buildings{"barbarians_sentry"}
+   p1:allow_buildings{"barbarians_tower"}
 
    timed_scroll(array_reverse(pts), 10)
 
@@ -97,13 +98,13 @@
    sleep(5003)
    p1:hide_fields(fields)
 
-   while not check_for_buildings(p1, {donjon=1}) do sleep(2341) end
+   while not check_for_buildings(p1, {barbarians_tower=1}) do sleep(2341) end
    o.done = true
    campaign_message_box(order_msg_3_explore_further)
    -- "explore further" is active untill "Boldreth shout out", so the player always has one open objectve.
    exploration_objective = add_campaign_objective(obj_explore_further)
 
-   p1:allow_buildings{"sentry", "barrier"}
+   p1:allow_buildings{"barbarians_sentry", "barbarians_barrier"}
 
    -- Wait till we see the mountain and at least one frontier
    while true do
@@ -133,26 +134,33 @@
    local o = add_campaign_objective(obj_build_mining_economy)
 
    p1:allow_buildings{
-      "coalmine",
-      "oremine",
-      "goldmine",
-      "granitemine",
-      "smelting_works",
-      "metalworks",
-      "charcoal_kiln",
-      "micro-brewery",
+      "barbarians_coalmine",
+      "barbarians_ironmine",
+      "barbarians_goldmine",
+      "barbarians_granitemine",
+      "barbarians_smelting_works",
+      "barbarians_metal_workshop",
+      "barbarians_charcoal_kiln",
+      "barbarians_micro_brewery",
    }
 
    timed_scroll(array_reverse(pts), 10)
    sleep(500)
 
    while true do
-      local h = p1:get_buildings{"coalmine","charcoal_kiln", "oremine",
-         "tavern", "smelting_works", "metalworks"}
+      local h = p1:get_buildings{
+         "barbarians_coalmine",
+         "barbarians_charcoal_kiln",
+         "barbarians_ironmine",
+         "barbarians_tavern",
+         "barbarians_smelting_works",
+         "barbarians_metal_workshop"}
 
-      if (#h.coalmine + #h.charcoal_kiln > 0) and
-         #h.oremine > 0 and #h.tavern > 0 and #h.smelting_works > 0 and
-         #h.metalworks > 0
+      if (#h.barbarians_coalmine + #h.barbarians_charcoal_kiln > 0) and
+          #h.barbarians_ironmine > 0 and
+          #h.barbarians_tavern > 0 and
+          #h.barbarians_smelting_works > 0 and
+          #h.barbarians_metal_workshop > 0
       then
          break
       end
@@ -165,21 +173,21 @@
 
    campaign_message_box(order_msg_6_build_enhanced_economy_and_training)
    p1:allow_buildings{
-      "axfactory",
-      "warmill",
-      "helmsmithy",
-      "battlearena",
-      "trainingcamp",
-      "inn",
-      "big_inn",
-      "deep_coalmine",
-      "deep_goldmine",
-      "deep_oremine",
-      "deeper_coalmine",
-      "deeper_goldmine",
-      "deeper_oremine",
-      "warehouse",
-      "brewery",
+      "barbarians_ax_workshop",
+      "barbarians_warmill",
+      "barbarians_helmsmithy",
+      "barbarians_battlearena",
+      "barbarians_trainingcamp",
+      "barbarians_inn",
+      "barbarians_big_inn",
+      "barbarians_coalmine_deep",
+      "barbarians_goldmine_deep",
+      "barbarians_ironmine_deep",
+      "barbarians_coalmine_deeper",
+      "barbarians_goldmine_deeper",
+      "barbarians_ironmine_deeper",
+      "barbarians_warehouse",
+      "barbarians_brewery",
    }
    run(check_warehouse_obj, add_campaign_objective(obj_build_a_warehouse))
    run(check_trainingssite_obj, add_campaign_objective(obj_build_trainingssites))
@@ -188,15 +196,19 @@
 end
 
 function check_trainingssite_obj(o)
-   while not check_for_buildings(p1, {trainingcamp = 1, battlearena = 1}) do
+   while not check_for_buildings(p1, {barbarians_trainingcamp = 1, barbarians_battlearena = 1}) do
       sleep(6523)
    end
    o.done = true
 end
 function check_weapon_productions_obj(o)
    while true do
-      local rv = p1:get_buildings{"metalworks", "axfactory", "warmill"}
-      if #rv.metalworks > 0 and (#rv.axfactory + #rv.warmill > 0) then
+      local rv = p1:get_buildings{
+         "barbarians_metal_workshop",
+         "barbarians_ax_workshop",
+         "barbarians_warmill"}
+      if #rv.barbarians_metal_workshop > 0 and
+         (#rv.barbarians_ax_workshop + #rv.barbarians_warmill > 0) then
          break
       end
       sleep(6523)
@@ -204,11 +216,11 @@
    o.done = true
 end
 function check_warehouse_obj(o)
-   while not check_for_buildings(p1, {warehouse = 1}) do sleep(3827) end
+   while not check_for_buildings(p1, {barbarians_warehouse = 1}) do sleep(3827) end
    o.done = true
 end
 function check_helmsmithy_obj(o)
-   while not check_for_buildings(p1, {helmsmithy = 1}) do sleep(3827) end
+   while not check_for_buildings(p1, {barbarians_helmsmithy = 1}) do sleep(3827) end
    o.done = true
 end
 
@@ -219,9 +231,9 @@
 
    campaign_message_box(order_msg_5_build_a_fortress)
    local o = add_campaign_objective(obj_build_a_fortress)
-   p1:allow_buildings{"fortress"}
+   p1:allow_buildings{"barbarians_fortress"}
 
-   while #p1:get_buildings("fortress") == 0 do sleep(6523) end
+   while #p1:get_buildings("barbarians_fortress") == 0 do sleep(6523) end
 
    o.done = true
    campaign_message_box(story_note_3)
@@ -248,12 +260,12 @@
 
 -- checks if all military buildings are drestroyed (the build-in function "defeated" only checks if all warehouses are destroyed)
 function check_player_completely_defeated(dp)
-    if #dp:get_buildings("fortress")  > 0 then return false end
-    if #dp:get_buildings("citadel")   > 0 then return false end
-    if #dp:get_buildings("donjon")    > 0 then return false end
-    if #dp:get_buildings("barrier")   > 0 then return false end
-    if #dp:get_buildings("sentry")    > 0 then return false end
-    if #dp:get_buildings("warehouse") > 0 then return false end
+    if #dp:get_buildings("barbarians_fortress")  > 0 then return false end
+    if #dp:get_buildings("barbarians_citadel")   > 0 then return false end
+    if #dp:get_buildings("barbarians_tower")    > 0 then return false end
+    if #dp:get_buildings("barbarians_barrier")   > 0 then return false end
+    if #dp:get_buildings("barbarians_sentry")    > 0 then return false end
+    if #dp:get_buildings("barbarians_warehouse") > 0 then return false end
     return true
 end
 
@@ -295,14 +307,14 @@
    do sleep(6833) end
 
    prefilled_buildings(p1,
-      {"barrier", 118, 100, soldiers =
+      {"barbarians_barrier", 118, 100, soldiers =
          {[{0,0,0,0}]= 1, [{1,1,0,1}] = 1, [{0,1,0,0}] = 1}
       },
-      {"citadel", 117, 97, soldiers = {
+      {"barbarians_citadel", 117, 97, soldiers = {
          [{0,0,0,0}]=3, [{1,1,0,0}]=1, [{0,0,0,1}]=2,
          [{0,1,0,1}]=1, [{1,1,0,1}]=1, [{2,1,0,2}]=1,
       }},
-      {"sentry", 116, 98 }
+      {"barbarians_sentry", 116, 98 }
    )
 
    -- Some something of the enemy land
@@ -350,4 +362,3 @@
 run(renegade_fortresses)
 run(mission_complete)
 run(mining_and_trainingsites)
-

=== modified file 'campaigns/bar02.wmf/scripting/starting_conditions.lua'
--- campaigns/bar02.wmf/scripting/starting_conditions.lua	2014-08-26 17:25:00 +0000
+++ campaigns/bar02.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -3,57 +3,57 @@
 -- =======================================================================
 p1:forbid_buildings("all")
 p1:allow_buildings{
-   "lumberjacks_hut",
-   "quarry",
-   "rangers_hut",
-   "hardener",
-   "lime_kiln",
-   "reed_yard",
-   "sentry",
+   "barbarians_lumberjacks_hut",
+   "barbarians_quarry",
+   "barbarians_rangers_hut",
+   "barbarians_wood_hardener",
+   "barbarians_lime_kiln",
+   "barbarians_reed_yard",
+   "barbarians_sentry",
 }
 
-hq = p1:place_building("headquarters", wl.Game().map:get_field(52, 33), false, true)
+hq = p1:place_building("barbarians_headquarters", wl.Game().map:get_field(52, 33), false, true)
 hq:set_wares{
-   ax=1,
-   bread_paddle=2,
-   blackwood=32,
-   coal=12,
-   felling_ax=5,
-   fire_tongs=2,
-   fish=6,
-   grout=12,
-   hammer=12,
-   hunting_spear=2,
-   iron=12,
-   ironore=25,
-   kitchen_tools=4,
-   meal=4,
-   meat=6,
-   pick=14,
-   pittabread=8,
-   ration=12,
-   raw_stone=40,
-   scythe=6,
-   shovel=4,
-   snack=3,
-   thatchreed=24,
-   log=80,
+   ax = 1,
+   blackwood = 32,
+   barbarians_bread = 8,
+   bread_paddle = 2,
+   coal = 12,
+   felling_ax = 5,
+   fire_tongs = 2,
+   fish = 6,
+   granite = 40,
+   grout = 12,
+   hammer = 12,
+   hunting_spear = 2,
+   iron = 12,
+   iron_ore = 25,
+   kitchen_tools = 4,
+   log = 80,
+   meal = 4,
+   meat = 6,
+   pick = 14,
+   ration = 12,
+   scythe = 6,
+   shovel = 4,
+   snack = 3,
+   thatch_reed = 24,
 }
 hq:set_workers{
-   carrier=40,
-   blacksmith=2,
-   brewer=1,
-   builder=10,
-   charcoal_burner=1,
-   gardener=1,
-   fisher=2,
-   geologist=4,
-   ["lime-burner"]=1,
-   lumberjack=3,
-   miner=4,
-   ranger=1,
-   stonemason=2,
-   ox = 40,
+   barbarians_blacksmith = 2,
+   barbarians_brewer = 1,
+   barbarians_builder = 10,
+   barbarians_carrier = 40,
+   barbarians_charcoal_burner = 1,
+   barbarians_fisher = 2,
+   barbarians_gardener = 1,
+   barbarians_geologist = 4,
+   barbarians_lime_burner = 1,
+   barbarians_lumberjack = 3,
+   barbarians_miner = 4,
+   barbarians_ox = 40,
+   barbarians_ranger = 1,
+   barbarians_stonemason = 2,
 }
 hq:set_soldiers({0,0,0,0}, 45)
 
@@ -61,33 +61,33 @@
 --                                 Player 2
 -- =======================================================================
 p2:forbid_buildings("all")
-p2:allow_buildings{"lumberjacks_hut"}
+p2:allow_buildings{"barbarians_lumberjacks_hut"}
 
-wh = p2:place_building("warehouse", wl.Game().map:get_field(100,25), false, true)
-wh:set_wares{log=200}
-wh:set_workers{ carrier=40, builder=1, lumberjack=4 }
+wh = p2:place_building("barbarians_warehouse", wl.Game().map:get_field(100,25), false, true)
+wh:set_wares{log = 200}
+wh:set_workers{ barbarians_carrier=40, barbarians_builder=1, barbarians_lumberjack=4 }
 
 prefilled_buildings(p2,
-   {"donjon", 102, 71, soldiers={[{0,0,0,0}] = 4}},
-   {"donjon", 104, 18, soldiers={
+   {"barbarians_tower", 102, 71, soldiers={[{0,0,0,0}] = 4}},
+   {"barbarians_tower", 104, 18, soldiers={
       [{0,0,0,0}] = 1, [{2,0,0,0}] = 1, [{0,1,0,0}] = 1
    }},
-   {"donjon", 104, 25, soldiers = {[{0,0,0,0}]=2, [{1,0,0,0}]=1, }},
-   {"donjon", 102, 83, soldiers = {[{0,0,0,0}]=2 }},
-   {"barrier", 103, 11, soldiers = {[{0,0,0,0}]=2, [{0,0,0,1}]=1 }},
-   {"barrier", 104, 4, soldiers = {[{0,0,0,0}]=4}},
-   {"barrier", 102, 103, soldiers = {[{0,0,0,0}]=2, [{0,1,0,1}]=1}},
-   {"barrier", 103, 96, soldiers = {[{0,0,0,0}]=3}},
-   {"barrier", 104, 110, soldiers = {[{0,0,0,0}]=2}},
-   {"barrier", 104, 30, soldiers = {
+   {"barbarians_tower", 104, 25, soldiers = {[{0,0,0,0}]=2, [{1,0,0,0}]=1, }},
+   {"barbarians_tower", 102, 83, soldiers = {[{0,0,0,0}]=2 }},
+   {"barbarians_barrier", 103, 11, soldiers = {[{0,0,0,0}]=2, [{0,0,0,1}]=1 }},
+   {"barbarians_barrier", 104, 4, soldiers = {[{0,0,0,0}]=4}},
+   {"barbarians_barrier", 102, 103, soldiers = {[{0,0,0,0}]=2, [{0,1,0,1}]=1}},
+   {"barbarians_barrier", 103, 96, soldiers = {[{0,0,0,0}]=3}},
+   {"barbarians_barrier", 104, 110, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_barrier", 104, 30, soldiers = {
       [{0,1,0,1}]=1, [{1,0,0,0}]=1, [{0,0,0,0}]=1
    }},
-   {"barrier", 102, 90, soldiers = {[{0,0,0,0}]=1}},
-   {"sentry", 108, 3, soldiers = {[{0,0,0,0}]=2}},
-   {"sentry", 107, 104, soldiers = {[{0,0,0,0}]=1}},
-   {"sentry", 110, 19, soldiers = {[{0,0,0,0}]=2}},
-   {"sentry", 106, 91, soldiers = {[{0,0,0,0}]=2}},
-   {"sentry", 108, 84, soldiers = {[{0,0,0,0}]=2}}
+   {"barbarians_barrier", 102, 90, soldiers = {[{0,0,0,0}]=1}},
+   {"barbarians_sentry", 108, 3, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_sentry", 107, 104, soldiers = {[{0,0,0,0}]=1}},
+   {"barbarians_sentry", 110, 19, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_sentry", 106, 91, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_sentry", 108, 84, soldiers = {[{0,0,0,0}]=2}}
 )
 
 -- =======================================================================
@@ -95,13 +95,13 @@
 -- =======================================================================
 p3:forbid_buildings("all")
 prefilled_buildings(p3,
-   {"sentry", 137, 87, soldiers = {[{0,0,0,0}]=2}},
-   {"barrier", 130, 86, soldiers = {[{0,0,0,0}]=4}},
-   {"barrier", 132, 82, soldiers = {[{0,0,0,0}]=4}},
-   {"fortress", 135, 85, soldiers = {
+   {"barbarians_sentry", 137, 87, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_barrier", 130, 86, soldiers = {[{0,0,0,0}]=4}},
+   {"barbarians_barrier", 132, 82, soldiers = {[{0,0,0,0}]=4}},
+   {"barbarians_fortress", 135, 85, soldiers = {
       [{0,0,0,0}]=4, [{1,0,0,0}]=2, [{1,1,0,0}]=2,
    }},
-   {"barrier", 132, 78, soldiers = {
+   {"barbarians_barrier", 132, 78, soldiers = {
       [{0,0,0,0}]=1, [{1,1,0,1}]=1, [{0,1,0,0}]=1,
    }}
 )
@@ -110,24 +110,28 @@
 --                                 Player 4
 -- =======================================================================
 p4:forbid_buildings("all")
-wh = p4:place_building("warehouse", wl.Game().map:get_field(132,110), false, true)
-wh:set_wares{log=10}
-wh:set_workers{carrier=40, builder=1, blacksmith=1, ["master-blacksmith"]=1}
+wh = p4:place_building("barbarians_warehouse", wl.Game().map:get_field(132,110), false, true)
+wh:set_wares {log = 10}
+wh:set_workers {
+   barbarians_carrier = 40,
+   barbarians_builder = 1,
+   barbarians_blacksmith = 1,
+   barbarians_blacksmith_master = 1
+}
 
 prefilled_buildings(p4,
-   {"citadel", 135, 3, soldiers = {
+   {"barbarians_citadel", 135, 3, soldiers = {
       [{0,0,0,0}]=2, [{1,1,0,0}]=1, [{0,0,0,1}]=2, [{0,1,0,1}]=1,
    }},
-   {"sentry", 137, 5, soldiers = {[{0,0,0,0}]=2}},
-   {"sentry", 133, 1, soldiers = {[{0,1,0,0}]=2}},
-   {"sentry", 130, 6, soldiers = {[{0,0,0,0}]=2}},
-   {"barrier", 133, 106, soldiers = {[{0,0,0,0}]=2, [{1,0,0,0}]=2}},
-   {"donjon", 132, 7, soldiers = {
+   {"barbarians_sentry", 137, 5, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_sentry", 133, 1, soldiers = {[{0,1,0,0}]=2}},
+   {"barbarians_sentry", 130, 6, soldiers = {[{0,0,0,0}]=2}},
+   {"barbarians_barrier", 133, 106, soldiers = {[{0,0,0,0}]=2, [{1,0,0,0}]=2}},
+   {"barbarians_tower", 132, 7, soldiers = {
       [{0,0,0,0}]=2, [{1,1,0,0}]=1, [{1,0,0,1}]=1,
    }},
-   {"barrier", 132, 3, soldiers = {
+   {"barbarians_barrier", 132, 3, soldiers = {
       [{0,0,0,0}]=1, [{1,0,0,1}]=1, [{0,1,0,1}]=1,
    }},
-   {"warmill", 135, 7}
+   {"barbarians_warmill", 135, 7}
 )
-

=== modified file 'campaigns/bar02.wmf/scripting/texts.lua'
--- campaigns/bar02.wmf/scripting/texts.lua	2015-09-11 17:38:01 +0000
+++ campaigns/bar02.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -41,12 +41,12 @@
    ),
 }
 
-obj_build_a_donjon = {
-   name = "build_a_donjon",
-   title = _"Build a donjon",
+obj_build_a_tower = {
+   name = "build_a_tower",
+   title = _"Build a tower",
    number = 1,
-   body = objective_text(_"Build a donjon",
-      listitem_bullet(_"Build a donjon at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
+   body = objective_text(_"Build a tower",
+      listitem_bullet(_"Build a tower at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
 }
 
 obj_explore_further = {
@@ -79,7 +79,7 @@
    number = 4,
    body = objective_text(_"Build a training infrastructure",
       listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_bullet(_"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.") ..
+      listitem_bullet(_"Enhance your metal workshop to an ax workshop 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 ax workshop to a war mill, which will produce additional weapons.") ..
       listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
@@ -101,7 +101,7 @@
       listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
       listitem_arrow(_"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, attack, defense and evade."))
+      _"The attributes are: health, attack, defense and evade."))
 }
 
 obj_build_weapon_productions = {
@@ -109,7 +109,7 @@
    title = _"Build weapons production",
    number = 3,
    body = objective_text(_"Build weapons production",
-      listitem_bullet(_"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."))
+      listitem_bullet(_"Enhance your metal workshop to an ax workshop 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 ax workshop to a war mill, which will produce additional weapons."))
 }
 
 obj_build_a_helmsmithy = {
@@ -145,10 +145,10 @@
    title=_"Close to Home",
    body =thron(_"Thron looks worried…",
       -- TRANSLATORS: Thron
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Thron
-		_([[For now, we are resting at the borders of the old forest and preparing for the coming days.]]))
+      _([[For now, we are resting at the borders of the old forest and preparing for the coming days.]]))
 }
 
 story_msg_2 = {
@@ -156,7 +156,7 @@
    title=_"Another Cold Day",
    body =thron(_"Thron looks worried…",
       -- TRANSLATORS: Thron
-		_([[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.]]))
+      _([[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 = {
@@ -164,7 +164,7 @@
    title=_"Doubts",
    body = boldreth(_"Boldreth is shaking his head…",
       -- TRANSLATORS: Boldreth
-		_([[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?]]))
+      _([[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 = {
@@ -172,7 +172,7 @@
    title = _"The Story Continues",
    body = boldreth(_"Boldreth says:",
       -- TRANSLATORS: 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.]]))
+      _([[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 = {
@@ -180,7 +180,7 @@
    title = _"Another Cold Day",
    body= thron(_"Thron is speaking confidently.",
       -- TRANSLATORS: Thron
-		_([[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.]]))
+      _([[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 = {
@@ -188,15 +188,15 @@
    title = _"The Story Continues",
    body = thron(_"Thron says:",
       -- TRANSLATORS: 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.]]))
+      _([[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 = boldreth(_"Boldreth shouts out!",
       -- TRANSLATORS: Boldreth
-		_([[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)
+      _([[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)
 }
 
 
@@ -206,13 +206,13 @@
    title = _"Renegade Fortification",
    body = thron(_"Thron says:",
       -- TRANSLATORS: Thron
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Thron
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Thron
-		_([[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.]]))
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Thron
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Thron
+      _([[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 = {
@@ -220,7 +220,7 @@
    title = _"Winter Ahead",
    body = boldreth(_"Boldreth says:",
       -- TRANSLATORS: Boldreth
-		_([[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!]]))
+      _([[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 = {
@@ -228,8 +228,8 @@
    title = _"The Advisor",
    body = khantrukh(_"Khantrukh nods.",
       -- TRANSLATORS: Khantrukh
-		_([[Boldreth is right! We don’t have enough food to survive a long, cold winter. We should start building 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)
+      _([[Boldreth is right! We don’t have enough food to survive a long, cold winter. We should start building 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 = {
@@ -237,16 +237,16 @@
    title = _"Food Economy Completed",
    body = thron(_"Thron says:",
       -- TRANSLATORS: Thron
-		_([[Khantrukh has just informed me that our basic food economy was built up successfully. Finally, none of us has to fear starvation anymore.]]))
+      _([[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 = {
+order_msg_2_build_a_tower = {
    posy = 1,
    title = _"Tracks",
    body = boldreth(_"Boldreth says:",
       -- TRANSLATORS: 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)
+      _([[Thron told me that he discovered tracks in the snow to the northeast of our settlement. He has instructed us to build a tower,  to have a greater visual range over the area around our hall to protect our people from sudden attacks.]]))
+      .. new_objectives(obj_build_a_tower)
 }
 
 order_msg_3_explore_further = {
@@ -254,11 +254,11 @@
    title = _"Further Exploration",
    body = boldreth(_"Boldreth says:",
       -- TRANSLATORS: 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.]])
-		.. paragraphdivider() ..
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Boldreth
-		_([[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)
+      _([[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 = {
@@ -266,8 +266,8 @@
    title = _"Mountains Found",
    body = khantrukh("Khantrukh says:",
       -- TRANSLATORS: 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 of Al’thunran hold coal and some metal ores.]]))
-		.. new_objectives(obj_build_mining_economy)
+      _([[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 of Al’thunran hold coal and some metal ores.]]))
+      .. new_objectives(obj_build_mining_economy)
 }
 
 story_note_2 = {
@@ -275,7 +275,7 @@
    title = _"Mining Economy Completed",
    body = thron(_"Thron says:",
       -- TRANSLATORS: 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.]]))
+      _([[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 = {
@@ -283,8 +283,8 @@
    title = _"Fortress Needed",
    body = thron(_"Thron says:",
       -- TRANSLATORS: 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)
+      _([[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 = {
@@ -292,7 +292,7 @@
    title = _"Fortress Completed",
    body = thron(_"Thron says:",
       -- TRANSLATORS: 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.]]))
+      _([[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 towers at the passages, but for now we can take a deep breath.]]))
 }
 
 order_msg_6_build_enhanced_economy_and_training = {
@@ -300,11 +300,11 @@
    title = _"Enhanced Economy and Training",
    body = boldreth(_"Boldreth says:",
       -- TRANSLATORS: 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 war to come.]])
-		.. paragraphdivider() ..
+      _([[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 war to come.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Boldreth
-		_([[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)
+      _([[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 = {
@@ -312,12 +312,12 @@
    title=_"Another Cold Day",
    body= thron(_"Thron looks worried…",
       -- TRANSLATORS: Thron
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Thron
-		_([[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 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 there 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.]]))
+      _([[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 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 there 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 = {
@@ -325,20 +325,20 @@
    title = _"Military Assault",
    body = thron(_"Thron says:",
       -- TRANSLATORS: 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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Thron
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Thron
-		_([[So be it!]]))
-		.. new_objectives(obj_military_assault_on_althunran),
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Thron
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Thron
+      _([[So be it!]]))
+      .. new_objectives(obj_military_assault_on_althunran),
 }
 
 cattlefarm_01 = {
    title = _"Faster Transportation",
    body = khantrukh(_"Khantrukh says:",
       -- TRANSLATORS: 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),
+      _([[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),
 }

=== removed file 'campaigns/dummy.wmf/allowed_worker_types'
--- campaigns/dummy.wmf/allowed_worker_types	2011-01-04 12:17:44 +0000
+++ campaigns/dummy.wmf/allowed_worker_types	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-[global]
-packet_version="1"
-
-[player_1]
-carrier="true"

=== modified file 'campaigns/emp01.wmf/scripting/mission_thread.lua'
--- campaigns/emp01.wmf/scripting/mission_thread.lua	2015-05-31 13:45:13 +0000
+++ campaigns/emp01.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -12,8 +12,8 @@
 
    -- Show the sea
    p1:reveal_fields(sea:region(6))
-   local ship = p1:place_bob("ship",sea)
-   sleep(200)
+   local ship = p1:place_ship(sea)
+   sleep(1000)
    campaign_message_box(diary_page_2)
    -- Hide the sea after 5 seconds
    run(function() sleep(5000) p1:hide_fields(sea:region(6)) end)
@@ -27,40 +27,40 @@
    sleep(400)
 
    campaign_message_box(saledus_1)
-   p1:allow_buildings{"barracks"}
-   local o = add_campaign_objective(obj_build_barracks)
-   while #p1:get_buildings("barracks") < 1 do sleep(3249) end
+   p1:allow_buildings{"empire_blockhouse"}
+   local o = add_campaign_objective(obj_build_blockhouse)
+   while #p1:get_buildings("empire_blockhouse") < 1 do sleep(3249) end
    o.done = true
 
-   -- Barracks are completed now
+   -- Blockhouse is completed now
    campaign_message_box(saledus_2)
-   p1:allow_buildings{"lumberjacks_house"}
+   p1:allow_buildings{"empire_lumberjacks_house"}
    o = add_campaign_objective(obj_build_lumberjack)
    campaign_message_box(amalea_1)
-   while #p1:get_buildings("lumberjacks_house") < 1 do sleep(3249) end
+   while #p1:get_buildings("empire_lumberjacks_house") < 1 do sleep(3249) end
    o.done = true
 
    -- Lumberjack is now build
    campaign_message_box(amalea_2)
-   p1:allow_buildings{"sawmill"}
+   p1:allow_buildings{"empire_sawmill"}
    o = add_campaign_objective(obj_build_sawmill_and_lumberjacks)
-   while not check_for_buildings(p1, { lumberjacks_house = 3, sawmill = 1})
+   while not check_for_buildings(p1, { empire_lumberjacks_house = 3, empire_sawmill = 1})
       do sleep(2343) end
    o.done = true
 
    -- Now the lady demands a forester after having us cut down the whole forest.
    campaign_message_box(amalea_3)
    o = add_campaign_objective(obj_build_forester)
-   p1:allow_buildings{"foresters_house"}
-   while not check_for_buildings(p1, { foresters_house = 1 }) do sleep(2434) end
+   p1:allow_buildings{"empire_foresters_house"}
+   while not check_for_buildings(p1, { empire_foresters_house = 1 }) do sleep(2434) end
    o.done = true
 
 
    -- Now a quarry
    campaign_message_box(saledus_3)
    o = add_campaign_objective(obj_build_quarry)
-   p1:allow_buildings{"quarry"}
-   while not check_for_buildings(p1, { quarry = 1 }) do sleep(2434) end
+   p1:allow_buildings{"empire_quarry"}
+   while not check_for_buildings(p1, { empire_quarry = 1 }) do sleep(2434) end
    o.done = true
 
    -- All buildings done. Got home
@@ -72,9 +72,9 @@
    p1:reveal_scenario("empiretut01")
 end
 
--- Show a funny message when the player has build 10 barracks
+-- Show a funny message when the player has build 10 blockhouses
 function easter_egg()
-   while not check_for_buildings(p1, {barracks = 10}) do sleep(4253) end
+   while not check_for_buildings(p1, {empire_blockhouse = 10}) do sleep(4253) end
 
    campaign_message_box(safe_peninsula)
 end
@@ -82,4 +82,3 @@
 
 run(mission_thread)
 run(easter_egg)
-

=== modified file 'campaigns/emp01.wmf/scripting/starting_conditions.lua'
--- campaigns/emp01.wmf/scripting/starting_conditions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/emp01.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -3,57 +3,56 @@
 -- =======================================================================
 p1:forbid_buildings("all")
 
-hq = p1:place_building("headquarters_shipwreck",
+hq = p1:place_building("empire_headquarters_shipwreck",
    wl.Game().map:get_field(6, 62), false, true)
-hq:set_wares{
-   helm = 4,
-   wood_lance = 5,
-   ax = 6,
+hq:set_wares {
+   basket = 1,
+   empire_bread = 8,
    bread_paddle = 2,
-   basket = 1,
-   bread = 8,
    cloth = 5,
    coal = 12,
+   felling_ax = 6,
    fire_tongs = 2,
    fish = 6,
    fishing_rod = 2,
    flour = 4,
    gold = 4,
+   granite = 40,
    grape = 4,
    hammer = 12,
+   armor_helmet = 4,
    hunting_spear = 2,
    iron = 12,
-   ironore = 5,
+   iron_ore = 5,
    kitchen_tools = 4,
+   log = 30,
    marble = 25,
-   marblecolumn = 6,
+   marble_column = 6,
    meal = 4,
    meat = 6,
    pick = 14,
+   planks = 45,
    ration = 12,
    saw = 3,
    scythe = 5,
    shovel = 6,
-   stone = 40,
-   log = 30,
+   spear_wooden = 5,
    water = 12,
    wheat = 4,
    wine = 8,
-   wood = 45,
    wool = 2,
 }
-hq:set_workers{
-   armorsmith = 1,
-   brewer = 1,
-   builder = 10,
-   carrier = 40,
-   charcoal_burner = 1,
-   geologist = 4,
-   lumberjack = 3,
-   miner = 4,
-   stonemason = 2,
-   toolsmith = 2,
-   weaponsmith = 1,
+hq:set_workers {
+   empire_armorsmith = 1,
+   empire_brewer = 1,
+   empire_builder = 10,
+   empire_carrier = 40,
+   empire_charcoal_burner = 1,
+   empire_geologist = 4,
+   empire_lumberjack = 3,
+   empire_miner = 4,
+   empire_stonemason = 2,
+   empire_toolsmith = 2,
+   empire_weaponsmith = 1,
 }
 hq:set_soldiers({0,0,0,0}, 45)
-

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua'
--- campaigns/emp01.wmf/scripting/texts.lua	2015-09-11 17:38:01 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -23,12 +23,12 @@
 -- ===========
 -- objectives
 -- ===========
-obj_build_barracks = {
-   name = "build_barracks",
-   title=_"Build a barracks",
+obj_build_blockhouse = {
+   name = "build_blockhouse",
+   title=_"Build a blockhouse",
    number = 1,
-   body = objective_text(_"Barracks",
-      listitem_bullet(_[[Build a barracks at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]])
+   body = objective_text(_"Blockhouse",
+      listitem_bullet(_[[Build a blockhouse at the red house symbol on the east side of the forests, to the right of your provisional headquarters.]])
    ),
 }
 
@@ -78,19 +78,19 @@
    title =_ "A Dark Night",
    body=lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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?]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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 children came to us, to admire our clean and tidy uniforms and weapons.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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 spirits took the last man of his folk!]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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?]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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 children came to us, to admire our clean and tidy uniforms and weapons.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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 spirits took the last man of his folk!]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary. Gulf of Perl is a place name.
-		_([[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 Gulf of Perl with my family, some of my friends and a few of my best warriors.]])),
+      _([[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 Gulf of Perl with my family, some of my friends and a few of my best warriors.]])),
    w=500,
    posy=1,
 }
@@ -99,10 +99,10 @@
    title=_"The Rough Sea",
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[It seems as if sailing on the Gulf of Perl 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.]])
-		.. paragraphdivider() ..
+      _([[It seems as if sailing on the Gulf of Perl 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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])),
+      _([[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,
 }
@@ -111,13 +111,13 @@
    title=_"Survivor",
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[Finally, the Gods were with us!]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]])),
+      _([[Finally, the Gods were with us!]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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,
 }
@@ -126,14 +126,14 @@
    title=_"A Foreboding",
    body= saledus(_"Saledus looks around nervously…",
       -- TRANSLATORS: Saledus
-		_([[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?]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[You really should build a barracks in the eastern portion of the forest. Then one of my men can keep watch in the darkness and keep us safe from these creatures.]]))
-		.. new_objectives(obj_build_barracks),
+      _([[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?]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[You really should build a blockhouse in the eastern portion of the forest. Then one of my men can keep watch in the darkness and keep us safe from these creatures.]]))
+      .. new_objectives(obj_build_blockhouse),
    w=400,
 }
 
@@ -142,10 +142,10 @@
    title=_"Safe For Now",
    body= saledus(_"Saledus speaks with a sigh of relief…",
       -- TRANSLATORS: Saledus
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[Sire, I saw that the construction of the blockhouse was completed, so I have assigned one of my best soldiers to it to keep watch on the desert.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Saledus
-		_([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
+      _([[This is a good step forward. Now we can feel a bit safer and can look forward to repairing our ship.]])),
    w=400,
 }
 
@@ -153,14 +153,14 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea smiles…",
       -- TRANSLATORS: Amalea
-		_([[Greetings, Lutius! I just met Saledus outside.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[He told me about the barracks. Well, I don’t think we need more barracks – instead, we might concentrate on other things now.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday to look for a nice place for a lumberjack’s house and found one right south of our provisional headquarters.]]))
-		.. new_objectives(obj_build_lumberjack),
+      _([[Greetings, Lutius! I just met Saledus outside.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[He told me about the blockhouse. Well, I don’t think we need more blockhouses – instead, we might concentrate on other things now.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[It is absolutely clear that we need wood to repair our ship. So, I walked through the forest yesterday to look for a nice place for a lumberjack’s house and found one right south of our provisional headquarters.]]))
+      .. new_objectives(obj_build_lumberjack),
    w=400,
 }
 
@@ -168,11 +168,11 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea recommends…",
       -- TRANSLATORS: Amalea
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-		_([[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),
+      _([[But unfortunately the logs are useless for repairing our ship – we need to turn them into planks, which are needed by every ship and every bigger building 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,
 }
 
@@ -180,20 +180,20 @@
    title=_"Young Amalea",
    body= amalea(_"Amalea comes in…",
       -- TRANSLATORS: Amalea
-		_([[I’ve got two important things to talk about… First the good news:]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[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 many gentle animals. We shouldn’t leave this island a complete desert.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[Lutius, please find someone who will take care of planting new trees.]]))
-		.. new_objectives(obj_build_forester),
+      _([[I’ve got two important things to talk about… First the good news:]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[But the bad news is that our lumberjacks harvest at an incredible speed. There are almost no trees left on this island.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[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 many gentle animals. We shouldn’t leave this island a complete desert.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[Lutius, please find someone who will take care of planting new trees.]]))
+      .. new_objectives(obj_build_forester),
    w=400,
 }
 
@@ -201,11 +201,11 @@
    title=_"Thinking About the Future",
    body= saledus(_"Saledus notes…",
       -- TRANSLATORS: Saledus
-		_([[Sire, 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.]])
-		.. paragraphdivider() ..
+      _([[Sire, 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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Saledus
-		_([[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),
+      _([[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,
 }
 
@@ -213,10 +213,10 @@
    title=_"A Step Forward",
    body= saledus(_"Saledus looks excited…",
       -- TRANSLATORS: Saledus
-		_([[Sire, 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.]])
-		.. paragraphdivider() ..
+      _([[Sire, 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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Saledus
-		_([[Now we truly can look forward to settling down on another island.]])),
+      _([[Now we truly can look forward to settling down on another island.]])),
    w=400,
 }
 
@@ -224,15 +224,15 @@
    title=_"Mission Complete",
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[Tonight will be our last night on this island. Tomorrow morning we will leave, searching for a new place for our exile.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]]),
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[Tonight will be our last night on this island. Tomorrow morning we will leave, searching for a new place for our exile.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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
 }
 
@@ -240,5 +240,5 @@
    title=_"Safe Peninsula",
    body= saledus(_"Saledus speaks:",
       -- TRANSLATORS: Saledus
-		_[[Sire, you have made this peninsula a very secure place. Now it’s time to move on!]])
+      _[[Sire, you have made this peninsula a very secure place. Now it’s time to move on!]])
 }

=== modified file 'campaigns/emp02.wmf/scripting/mission_thread.lua'
--- campaigns/emp02.wmf/scripting/mission_thread.lua	2015-05-31 13:45:13 +0000
+++ campaigns/emp02.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -22,9 +22,9 @@
    -- Check for completing of the woodeconomy
    run(function()
       while not check_for_buildings(p1, {
-         lumberjacks_house = 3,
-         foresters_house = 1,
-         sawmill = 1,
+         empire_lumberjacks_house = 3,
+         empire_foresters_house = 1,
+         empire_sawmill = 1,
       }) do sleep(2342) end
 
       campaign_message_box(diary_page_6)
@@ -38,7 +38,7 @@
    local o_quarry = add_campaign_objective(obj_build_quarry)
    -- Check for completeness of the quarry
    run(function()
-      while not check_for_buildings(p1, {quarry=1}) do sleep(3423) end
+      while not check_for_buildings(p1, {empire_quarry=1}) do sleep(3423) end
       o_quarry.done = true
 
       campaign_message_box(diary_page_7)
@@ -49,11 +49,11 @@
    -- Wait till one mine goes up
    while true do
       local rv = p1:get_buildings{
-         "coalmine",
-         "deep_coalmine",
-         "oremine",
-         "deep_oremine",
-         "marblemine",
+         "empire_coalmine",
+         "empire_coalmine_deep",
+         "empire_ironmine",
+         "empire_ironmine_deep",
+         "empire_marblemine",
       }
       local s = 0
       for idx,a in pairs(rv) do s = s + #a end
@@ -63,41 +63,41 @@
 
    campaign_message_box(amalea_1)
    p1:allow_buildings{
-      "well",
-      "farm",
-      "brewery",
-      "vineyard",
-      "winery",
-      "mill",
-      "bakery",
-      "hunters_house",
-      "piggery",
-      "tavern",
-      "inn",
-      "fishers_house",
+      "empire_well",
+      "empire_farm",
+      "empire_brewery",
+      "empire_vineyard",
+      "empire_winery",
+      "empire_mill",
+      "empire_bakery",
+      "empire_hunters_house",
+      "empire_piggery",
+      "empire_tavern",
+      "empire_inn",
+      "empire_fishers_house",
    }
    local o = add_campaign_objective(obj_build_food_infrastructure)
 
    -- Run easter egg: Amalea says something when Tavern is done
    run(function()
-      while #p1:get_buildings("tavern") < 1 do sleep(2349) end
+      while #p1:get_buildings("empire_tavern") < 1 do sleep(2349) end
       campaign_message_box(amalea_2)
    end)
 
    while true do
       local rv = p1:get_buildings{
-         "brewery",
-         "fishers_house",
-         "bakery",
-         "hunters_house",
-         "piggery",
-         "tavern",
-         "inn",
+         "empire_brewery",
+         "empire_fishers_house",
+         "empire_bakery",
+         "empire_hunters_house",
+         "empire_piggery",
+         "empire_tavern",
+         "empire_inn",
       }
-      if #rv.brewery > 0 and
-         (#rv.tavern + #rv.inn) > 0 and
-         (#rv.fishers_house + #rv.hunters_house +
-          #rv.piggery + #rv.bakery) > 0 then break end
+      if #rv.empire_brewery > 0 and
+         (#rv.empire_tavern + #rv.empire_inn) > 0 and
+         (#rv.empire_fishers_house + #rv.empire_hunters_house +
+          #rv.empire_piggery + #rv.empire_bakery) > 0 then break end
       sleep(4857)
    end
    o.done = true
@@ -123,40 +123,40 @@
 
    campaign_message_box(saledus_3)
    p1:allow_buildings{
-      "coalmine",
-      "deep_coalmine",
-      "oremine",
-      "deep_oremine",
-      "stonemasons_house",
-      "toolsmithy",
-      "armorsmithy",
-      "weaponsmithy",
-      "smelting_works",
-      "charcoal_kiln",
+      "empire_coalmine",
+      "empire_coalmine_deep",
+      "empire_ironmine",
+      "empire_ironmine_deep",
+      "empire_stonemasons_house",
+      "empire_toolsmithy",
+      "empire_armorsmithy",
+      "empire_weaponsmithy",
+      "empire_smelting_works",
+      "empire_charcoal_kiln",
    }
 
    local o = add_campaign_objective(obj_build_mining_infrastructure)
    -- Wait for the infrastructure to come up
    while true do
       local rv = p1:get_buildings{
-         "coalmine",
-         "deep_coalmine",
-         "oremine",
-         "deep_oremine",
-         "stonemasons_house",
-         "toolsmithy",
-         "armorsmithy",
-         "weaponsmithy",
-         "smelting_works",
-         "charcoal_kiln",
+         "empire_coalmine",
+         "empire_coalmine_deep",
+         "empire_ironmine",
+         "empire_ironmine_deep",
+         "empire_stonemasons_house",
+         "empire_toolsmithy",
+         "empire_armorsmithy",
+         "empire_weaponsmithy",
+         "empire_smelting_works",
+         "empire_charcoal_kiln",
       }
-      if #rv.stonemasons_house > 0 and
-         #rv.toolsmithy > 0 and
-         #rv.armorsmithy > 0 and
-         #rv.smelting_works > 0 and
-         (#rv.oremine + #rv.deep_oremine > 0) and
-         (#rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln > 0) and
-         #rv.weaponsmithy > 0 then break end
+      if #rv.empire_stonemasons_house > 0 and
+         #rv.empire_toolsmithy > 0 and
+         #rv.empire_armorsmithy > 0 and
+         #rv.empire_smelting_works > 0 and
+         (#rv.empire_ironmine + #rv.empire_ironmine_deep > 0) and
+         (#rv.empire_coalmine + #rv.empire_coalmine_deep + #rv.empire_charcoal_kiln > 0) and
+         #rv.empire_weaponsmithy > 0 then break end
       sleep(4948)
    end
    o.done = true
@@ -175,7 +175,7 @@
 
    campaign_message_box(saledus_1)
    local o = add_campaign_objective(obj_build_military_buildings)
-   p1:allow_buildings{"barracks", "sentry"}
+   p1:allow_buildings{"empire_blockhouse", "empire_sentry"}
 
    -- Go back to where we were
    timed_scroll(array_reverse(pts))
@@ -192,9 +192,9 @@
    pts = wait_for_roadbuilding_and_scroll(marblemountains)
 
    campaign_message_box(saledus_2)
-   p1:allow_buildings{"marblemine", "deep_marblemine"}
+   p1:allow_buildings{"empire_marblemine", "empire_marblemine_deep"}
    o = add_campaign_objective(obj_build_marblemine)
-   run(function() while not check_for_buildings(p1, {marblemine = 1})
+   run(function() while not check_for_buildings(p1, {empire_marblemine = 1})
       do sleep(2133) end  o.done = true end)
 
    -- Go back to where we were
@@ -205,12 +205,13 @@
    -- Wait for various buildings to go up
    while true do
       local rv = p1:get_buildings{
-         "marblemine", "deep_marblemine", "oremine", "deep_oremine",
-         "coalmine", "deep_coalmine", "charcoal_kiln"
+         "empire_marblemine", "empire_marblemine_deep",
+         "empire_ironmine", "empire_ironmine_deep",
+         "empire_coalmine", "empire_coalmine_deep", "empire_charcoal_kiln"
       }
-      local mm = #rv.marblemine + #rv.deep_marblemine
-      local ore = #rv.oremine + #rv.deep_oremine
-      local coal = #rv.coalmine + #rv.deep_coalmine + #rv.charcoal_kiln
+      local mm = #rv.empire_marblemine + #rv.empire_marblemine_deep
+      local ore = #rv.empire_ironmine + #rv.empire_ironmine_deep
+      local coal = #rv.empire_coalmine + #rv.empire_coalmine_deep + #rv.empire_charcoal_kiln
 
       if mm > 0 and ore > 0 and coal > 0 then break end
       sleep(6674)
@@ -227,13 +228,13 @@
 
    campaign_message_box(diary_page_8)
    local o = add_campaign_objective(obj_build_bigger_military_buildings)
-   p1:allow_buildings{"outpost", "barrier", "tower"}
-   p2:allow_buildings{"quarry"}
+   p1:allow_buildings{"empire_outpost", "empire_barrier", "empire_tower"}
+   p2:allow_buildings{"barbarians_quarry"}
 
    -- Wait for one of the buildings to go up
    while true do
-      local rv = p1:get_buildings{"outpost", "barrier", "tower"}
-      if (#rv.tower + #rv.outpost + #rv.barrier) > 0 then
+      local rv = p1:get_buildings{"empire_outpost", "empire_barrier", "empire_tower"}
+      if (#rv.empire_tower + #rv.empire_outpost + #rv.empire_barrier) > 0 then
          break
       end
       sleep(2342)
@@ -245,11 +246,11 @@
       sleep(2343)
    end
    campaign_message_box(diary_page_9)
-   p1:allow_buildings{"fortress"}
+   p1:allow_buildings{"empire_fortress"}
 
    o = add_campaign_objective(obj_remove_the_barbarians)
    -- Wait for the fortress to come up
-   while not check_for_buildings(p1, {fortress=1},
+   while not check_for_buildings(p1, {empire_fortress = 1},
       wl.Game().map:get_field(60,65):region(6))
    do sleep(2435) end
 
@@ -269,4 +270,3 @@
 run(mining_infrastructure)
 run(expand_and_build_marblemine)
 run(barbarians_thread)
-

=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- campaigns/emp02.wmf/scripting/starting_conditions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/emp02.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -3,63 +3,63 @@
 -- =======================================================================
 p1:forbid_buildings("all")
 p1:allow_buildings{
-   "foresters_house",
-   "lumberjacks_house",
-   "quarry",
-   "sawmill",
+   "empire_foresters_house",
+   "empire_lumberjacks_house",
+   "empire_quarry",
+   "empire_sawmill",
 }
 prefilled_buildings(p1,
-   {"headquarters", 16, 21,
+   {"empire_headquarters", 16, 21,
       wares = {
-         helm = 4,
-         wood_lance = 5,
-         ax = 6,
+         basket = 1,
+         empire_bread = 8,
          bread_paddle = 2,
-         basket = 1,
-         bread = 8,
          cloth = 5,
          coal = 12,
+         felling_ax = 6,
          fire_tongs = 2,
          fish = 6,
          fishing_rod = 2,
          flour = 4,
          gold = 4,
+         granite = 40,
          grape = 4,
          hammer = 12,
+         armor_helmet = 4,
          hunting_spear = 2,
          iron = 12,
-         ironore = 5,
+         iron_ore = 5,
          kitchen_tools = 4,
+         log = 30,
          marble = 25,
-         marblecolumn = 6,
+         marble_column = 6,
          meal = 4,
          meat = 6,
          pick = 14,
+         planks = 45,
          ration = 12,
          saw = 3,
          scythe = 5,
          shovel = 6,
-         stone = 40,
-         log = 30,
+         spear_wooden = 5,
          water = 12,
          wheat = 4,
          wine = 8,
-         wood = 45,
          wool = 2,
       },
       workers = {
-         armorsmith = 1,
-         brewer = 1,
-         builder = 10,
-         carrier = 40,
-         charcoal_burner = 1,
-         geologist = 4,
-         lumberjack = 3,
-         miner = 4,
-         stonemason = 2,
-         toolsmith = 2,
-         weaponsmith = 1,
-         donkey = 20,
+         empire_armorsmith = 1,
+         empire_brewer = 1,
+         empire_builder = 10,
+         empire_carrier = 40,
+         empire_charcoal_burner = 1,
+         empire_donkey = 20,
+         empire_geologist = 4,
+         empire_lumberjack = 3,
+         empire_miner = 4,
+         empire_stonemason = 2,
+         empire_toolsmith = 2,
+         empire_weaponsmith = 1,
       },
       soldiers = {
          [{0,0,0,0}] = 45,
@@ -72,68 +72,67 @@
 -- =======================================================================
 p2:forbid_buildings("all")
 p2:allow_buildings{
-   "bakery",
-   "barrier",
-   "farm",
-   "reed_yard",
-   "fishers_hut",
-   "hardener",
-   "hunters_hut",
-   "lumberjacks_hut",
-   "micro-brewery",
-   "rangers_hut",
-   "sentry",
-   "lime_kiln",
-   "tavern",
-   "well",
+   "barbarians_bakery",
+   "barbarians_barrier",
+   "barbarians_farm",
+   "barbarians_fishers_hut",
+   "barbarians_hunters_hut",
+   "barbarians_lime_kiln",
+   "barbarians_lumberjacks_hut",
+   "barbarians_micro_brewery",
+   "barbarians_rangers_hut",
+   "barbarians_reed_yard",
+   "barbarians_sentry",
+   "barbarians_tavern",
+   "barbarians_well",
+   "barbarians_wood_hardener",
 }
 
 prefilled_buildings(p2,
-   {"headquarters", 60, 65,
+   {"barbarians_headquarters", 60, 65,
    wares = {
       ax = 6,
+      blackwood = 32,
+      barbarians_bread = 8,
       bread_paddle = 2,
-      blackwood = 32,
       cloth = 5,
       coal = 12,
       fire_tongs = 2,
       fish = 6,
       fishing_rod = 2,
       gold = 4,
+      granite = 40,
       grout = 12,
       hammer = 12,
       hunting_spear = 2,
       iron = 12,
-      ironore = 5,
+      iron_ore = 5,
       kitchen_tools = 4,
+      log = 80,
       meal = 4,
       meat = 6,
       pick = 14,
-      pittabread = 8,
       ration = 12,
-      raw_stone = 40,
       scythe = 6,
       shovel = 4,
       snack = 3,
-      thatchreed = 24,
-      log = 80,
+      thatch_reed = 24,
    },
    workers = {
-      blacksmith = 2,
-      brewer = 1,
-      builder = 10,
-      carrier = 40,
-      charcoal_burner = 1,
-      gardener = 1,
-      geologist = 4,
-      ["lime-burner"] = 1,
-      lumberjack = 3,
-      miner = 4,
-      ranger = 1,
-      stonemason = 2,
+      barbarians_blacksmith = 2,
+      barbarians_brewer = 1,
+      barbarians_builder = 10,
+      barbarians_carrier = 40,
+      barbarians_charcoal_burner = 1,
+      barbarians_gardener = 1,
+      barbarians_geologist = 4,
+      barbarians_lime_burner = 1,
+      barbarians_lumberjack = 3,
+      barbarians_miner = 4,
+      barbarians_ranger = 1,
+      barbarians_stonemason = 2,
    },
    soldiers = {
       [{0,0,0,0}] = 45,
    }
 })
-

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua'
--- campaigns/emp02.wmf/scripting/texts.lua	2015-09-11 17:38:01 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -46,7 +46,7 @@
    title =_"Protect your colony",
    number = 1,
    body = objective_text(_"Protect Your Colony",
-      listitem_bullet(_[[Build some barracks and sentries around the colony.]])
+      listitem_bullet(_[[Build some blockhouses and sentries around the colony.]])
    ),
 }
 
@@ -108,10 +108,10 @@
    posy= 1,
    body = lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])),
+      _([[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 = {
@@ -119,14 +119,14 @@
    posy = 1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[But until that day, many years may 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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[But we mustn’t forget to preserve this natural bounty. These forests should last forever, so we really have to build a forester’s house too.]]))
-		.. new_objectives(obj_build_woodeconomy)
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[But until that day, many years may 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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[But we mustn’t forget to preserve this natural bounty. These forests should last forever, so we really have to build a forester’s house too.]]))
+      .. new_objectives(obj_build_woodeconomy)
 }
 
 diary_page_5_2 = {
@@ -134,11 +134,11 @@
    posy = 1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
+      _([[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 stones for our larger buildings.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-		_([[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)
+      _([[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 = {
@@ -146,15 +146,15 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[Good news! Today our wood economy was completed. Now we can be sure that we will have enough wood for our future building projects.]]))
+      _([[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 =_ "Stones for the Colony",
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_[[Great! Today the building of the quarry was completed. Now we will get enough stone to construct larger buildings.]]),
+      _[[Great! Today the building of the quarry was completed. Now we will get enough stones to construct larger buildings.]]),
 }
 
 saledus_1 = {
@@ -162,66 +162,66 @@
    posy = 1,
    body= saledus(_"Saledus looks unhappy",
       -- TRANSLATORS: Saledus
-		_([[Sire, 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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor – and were brought to this island.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[I beg you to be cautious and to build some barracks or sentries around our colony.]]))
-		.. new_objectives(obj_build_military_buildings)
+      _([[Sire, 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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[Perhaps the people aboard that ship were caught in the same storm which brought us to Malac’ Mor – and were brought to this island.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[I beg you to be cautious and to build some blockhouses or sentries around our colony.]]))
+      .. new_objectives(obj_build_military_buildings)
 }
 
 saledus_2 = {
    title =_ "Marble on the Mountain",
    body= saledus(_"Saledus smiles",
       -- TRANSLATORS: Saledus
-		_([[Sire, 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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[Please, expand to that mountain and start mining marble.]]))
-		.. new_objectives(obj_build_marblemine)
+      _([[Sire, 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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[Please, expand to that mountain and start mining marble.]]))
+      .. new_objectives(obj_build_marblemine)
 }
 
 saledus_3 = {
    title =_ "Further Mountains",
    body= saledus(_"Saledus is excited",
       -- TRANSLATORS: Saledus
-		_([[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. I advise you to immediately build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a house for the stonemason, who will cut columns from marble.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Saledus
-		_([[After everything, we can now begin to live like we did in Fremil.]]))
-		.. new_objectives(obj_build_mining_infrastructure)
+      _([[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. I advise you to immediately build iron ore and coal mines (or at least charcoal kilns), smelting works, toolsmithies, armor and weapon smithies.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[However: for all these bigger buildings, we need better and more elegant building materials. So you have to build a house for the stonemason, who will cut columns from marble.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Saledus
+      _([[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= amalea(_"Amalea enters…",
       -- TRANSLATORS: Amalea
-		_([[Lutius, don’t you think you forgot something important?]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Amalea
-		_([[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)
+      _([[Lutius, don’t you think you forgot something important?]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Amalea
+      _([[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)
 }
 
 amalea_2 = {
    title =_ "Our New Tavern",
    body= amalea(_"Amalea smiles",
       -- TRANSLATORS: Amalea
-		_([[I just visited our new tavern ‘At the palms’. The beer they serve is really tasty. You really should have a drink there, too.]])
-		.. paragraphdivider() ..
+      _([[I just visited our new tavern ‘At the palms’. The beer they serve is really tasty. You really should have a drink there, too.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
-		_([[It is good to see that we have now got a warmer and more familiar environment on our island. Thank you, Lutius.]]))
+      _([[It is good to see that we have now got a warmer and more familiar environment on our island. Thank you, Lutius.]]))
 }
 
 diary_page_8 = {
@@ -229,17 +229,17 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
-		.. paragraphdivider() ..
-      -- TRANSLATORS: Lutius - Diary
-		_([[Anyway, we must build up stronger military buildings as soon as possible.]]))
-		.. new_objectives(obj_build_bigger_military_buildings)
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[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.]])
+      .. paragraphdivider() ..
+      -- TRANSLATORS: Lutius - Diary
+      _([[Anyway, we must build up stronger military buildings as soon as possible.]]))
+      .. new_objectives(obj_build_bigger_military_buildings)
 }
 
 diary_page_9 = {
@@ -247,8 +247,8 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[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)
+      _([[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 = {
@@ -256,12 +256,12 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[Today is a proud day. We have fought for our new home and risen victorious.]])
-		.. paragraphdivider() ..
+      _([[Today is a proud day. We have fought for our new home and risen victorious.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-		_([[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.]])
+      _([[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 = {
@@ -276,10 +276,10 @@
    posy=1,
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-		_([[Today a pigeon landed on our island. It brought a message which fills me with dark thoughts and brings back my fears.]])
-		.. paragraphdivider() ..
+      _([[Today a pigeon landed on our island. It brought a message which fills me with dark thoughts and brings back my fears.]])
+      .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
-		_([[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…]])
-		.. paragraphdivider() ..
-		_([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]))
+      _([[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…]])
+      .. paragraphdivider() ..
+      _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]))
 }

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/helper_functions.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/helper_functions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/helper_functions.lua	2015-11-03 18:26:36 +0000
@@ -12,13 +12,13 @@
       local remove_field = true
 
       if f.immovable then
-         local n = f.immovable.descr.name:match("greenland_stones(%d*)")
+         local n = f.immovable.descr.name:match("greenland_rocks(%d*)")
          if n then
             n = tonumber(n)
             f.immovable:remove()
             if n > 1 then
                remove_field = false
-               map:place_immovable("greenland_stones" .. n-1, f)
+               map:place_immovable("greenland_rocks" .. n-1, f, "world")
             end
             sleep(sleeptime)
          end
@@ -29,4 +29,3 @@
       end
    end
 end
-

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/helper_functions_demonstration.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/helper_functions_demonstration.lua	2014-10-19 09:39:36 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/helper_functions_demonstration.lua	2015-11-03 18:26:36 +0000
@@ -55,16 +55,16 @@
 
    sleep(sleeptime)
    if panel ~= nil then
-		if not panel.active then -- If this is a tab and already on, do nothing
-			mouse_smoothly_to_panel(panel, g_T)
-			sleep(sleeptime)
-			if panel.press then panel:press() sleep(250) end
-			if panel.click then panel:click() end
-			sleep(sleeptime)
-		end
+      if not panel.active then -- If this is a tab and already on, do nothing
+         mouse_smoothly_to_panel(panel, g_T)
+         sleep(sleeptime)
+         if panel.press then panel:press() sleep(250) end
+         if panel.click then panel:click() end
+         sleep(sleeptime)
+      end
    else
       print('Attempt to click on a non-existing panel.')
-	end
+   end
    blocker:lift_blocks()
 end
 

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/init.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/init.lua	2015-02-16 12:49:11 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/init.lua	2015-11-03 18:26:36 +0000
@@ -33,4 +33,3 @@
 include "map:scripting/helper_functions_demonstration.lua"
 
 include "map:scripting/mission_thread.lua"
-

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2015-06-01 20:08:40 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -3,7 +3,7 @@
 -- ================
 
 function starting_infos()
-   map:place_immovable("debris00",second_quarry_field)
+   map:place_immovable("debris00",second_quarry_field, "world")
    -- so that the player cannot build anything here
 
    sleep(1000)
@@ -44,7 +44,7 @@
 
    click_on_field(first_lumberjack_field)
    click_on_panel(wl.ui.MapView().windows.field_action.tabs.small)
-   click_on_panel(wl.ui.MapView().windows.field_action.buttons.lumberjacks_hut)
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.barbarians_lumberjacks_hut)
 
    sleep(500)
 
@@ -99,7 +99,7 @@
    sleep(30*1000) -- let the player experiment a bit with the speed
    message_box_objective(plr, construction_site_window)
 
-   while #plr:get_buildings("lumberjacks_hut") < 1 do sleep(300) end
+   while #plr:get_buildings("barbarians_lumberjacks_hut") < 1 do sleep(300) end
 
    message_box_objective(plr, lumberjack_message_07)
 
@@ -153,7 +153,7 @@
    immovable_is_legal = function(i)
       -- only allow quarry and flag at this position because the road building below relies on this
       if (i.fields[1] == first_quarry_field) or (i.fields[1] == first_quarry_field.brn) then
-         cs = allow_constructionsite(i, {"quarry"})
+         cs = allow_constructionsite(i, {"barbarians_quarry"})
          return cs
       else return false end
    end
@@ -237,7 +237,7 @@
    -- Interludium: talk about census and statistics
    census_and_statistics()
 
-   while #plr:get_buildings("quarry") < 2 do sleep(1400) end
+   while #plr:get_buildings("barbarians_quarry") < 2 do sleep(1400) end
    o.done = true
 
    messages()
@@ -253,7 +253,7 @@
    local cs = nil
    immovable_is_legal = function(i)
       if (i.fields[1] == second_quarry_field) or (i.fields[1] == second_quarry_field.brn) then
-         cs = allow_constructionsite(i, {"quarry"})
+         cs = allow_constructionsite(i, {"barbarians_quarry"})
          return cs
       elseif(i.descr.type_name == "flag") or (i.descr.type_name == "road") then
          register_immovable_as_allowed(i)
@@ -340,7 +340,7 @@
    -- From now on, the player can build whatever he wants
    terminate_bad_boy_sentinel = true
 
-   while #plr:get_buildings("quarry") > 0 do sleep(200) end
+   while #plr:get_buildings("barbarians_quarry") > 0 do sleep(200) end
    o.done = true
 
    sleep(3000)
@@ -357,7 +357,12 @@
    -- wait until there are soldiers inside so that the player sees the expansion
    local soldier_inside = false
    while not soldier_inside do
-      local military_buildings = array_combine(plr:get_buildings("sentry"), plr:get_buildings("donjon"), plr:get_buildings("barrier"), plr:get_buildings("fortress"), plr:get_buildings("citadel"))
+      local military_buildings = array_combine(
+         plr:get_buildings("barbarians_sentry"),
+         plr:get_buildings("barbarians_tower"),
+         plr:get_buildings("barbarians_barrier"),
+         plr:get_buildings("barbarians_fortress"),
+         plr:get_buildings("barbarians_citadel"))
       for i = 1,#military_buildings do
          for k,v in pairs(military_buildings[i]:get_soldiers("all")) do
             soldier_inside = true
@@ -385,4 +390,3 @@
 
 run(bad_boy_sentry)
 run(starting_infos)
-

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/starting_conditions.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/starting_conditions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -5,6 +5,5 @@
 plr:allow_buildings("all")
 
 -- A default headquarters
-include "tribes/barbarians/scripting/sc00_headquarters.lua"
-init.func(plr) -- defined in sc00_headquarters
-
+include "tribes/scripting/starting_conditions/barbarians/headquarters.lua"
+init.func(plr) -- defined in headquarters

=== modified file 'campaigns/tutorial01_basic_control.wmf/scripting/texts.lua'
--- campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-07-30 07:16:09 +0000
+++ campaigns/tutorial01_basic_control.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -40,7 +40,7 @@
    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 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(_[[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 granite. 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.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Left-click the ‘OK’ button to close this box and then try it.]])
@@ -169,7 +169,7 @@
    title = _"Lumberjack is Done",
    position = "topright",
    body = rt(
-      p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the raw stone.]])
+      p(_[[Excellent. The lumberjack’s hut is done. A lumberjack will now move in and start chopping down trees, so our log income is secured for now. Now on to the granite.]])
    ),
    h = 300,
    w = 350
@@ -179,7 +179,7 @@
    title = _"Some Rocks 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 rocks 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(_[[Granite can be mined in granite mines, but the easier way is to build a quarry next to some rocks 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.]]) ..
       paragraphdivider() ..
       listitem_arrow(_[[There are three ways to move your view. The first one is using the cursor keys on your keyboard. Go ahead and try this out.]]) ..
       listitem_bullet(_[[Click the ‘OK’ button and then move the view using the cursor keys]])
@@ -360,7 +360,7 @@
    position = "topright",
    title = _"Build a second quarry",
    body = rt(
-      p(_[[When there are many rocks, you can consider building another quarry. This will make the stone production faster.]]) ..
+      p(_[[When there are many rocks, you can consider building another quarry. This will make the granite production faster.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Build a second quarry near the rocks and connect it to your road network.]])
    ),
@@ -474,7 +474,7 @@
    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(_[[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, towers, 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. I will tell your more about military buildings in another tutorial.]]) ..
       paragraphdivider() ..
       listitem_bullet(_[[Let’s try it out now: build a military building on your border.]]) ..
@@ -486,7 +486,7 @@
       h1(_"Make your territory grow") ..
       p(_[[In Widelands, it is necessary to build many buildings, which take up a lot of space. To expand your territory, you have to build military buildings next to your border. Every tribe has several military buildings.]]) ..
       paragraphdivider() ..
-      listitem_bullet(_[[The Barbarians have four different military buildings you can build: the sentry (small), the barrier and the donjon (both medium) and the fortress (big). Just choose the one you like most.]]) ..
+      listitem_bullet(_[[The Barbarians have four different military buildings you can build: the sentry (small), the barrier and the tower (both medium) and the fortress (big). Just choose the one you like most.]]) ..
       listitem_arrow(_[[Remember that big buildings (green icon) cannot be built on small (red) or medium (yellow) building plots, but buildings can be built on a building plot that provides more space than they need. You should always keep that in mind when you search for a suitable place.]])
    )
 }

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/init.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/init.lua	2014-10-28 12:58:23 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/init.lua	2015-11-03 18:26:36 +0000
@@ -17,4 +17,3 @@
 include "map:scripting/texts.lua"
 
 include "map:scripting/mission_thread.lua"
-

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/mission_thread.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/mission_thread.lua	2015-05-31 13:45:13 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -1,105 +1,104 @@
--- ================
--- Mission thread
--- ================
-
-function intro()
-   sleep(1000)
-   message_box_objective(plr, introduction)
-
-   training()
-end
-
-function training()
-   -- Teach about trainingsites and soldiers' abilities
-   sleep(5000) -- to let soldiers walk
-
-   message_box_objective(plr, abilities)
-   local o = message_box_objective(plr, battlearena1)
-   while #plr:get_buildings("battlearena") == 0 do sleep(500) end
-   o.done = true
-   message_box_objective(plr, battlearena2)
-
-   o = message_box_objective(plr, trainingcamp1)
-   while #plr:get_buildings("trainingcamp") == 0 do sleep(500) end
-   o.done = true
-   message_box_objective(plr, trainingcamp2)
-
-   sleep(300)
-
-   military_buildings()
-end
-
-function military_buildings()
-   message_box_objective(plr, heroes_rookies)
-   message_box_objective(plr, soldier_capacity)
-   local o = message_box_objective(plr, dismantle)
-
-   while #plr:get_buildings("sentry") > 1 do sleep(200) end
-   o.done = true
-
-   sleep(2000)
-
-   enhance_fortress()
-end
-
-function enhance_fortress()
-   sleep(5000)
-
-   local citadel_field = wl.Game().map:get_field(32, 62)
-   local o = message_box_objective(plr, fortress_enhancement)
-   while not (citadel_field.immovable and
-      citadel_field.immovable.descr.name == "citadel") do sleep(800) end
-   o.done = true
-
-   create_enemy()
-
-   -- Wait for soldiers to move in
-   local citadel = citadel_field.immovable
-   local break_out = false
-   while not break_out do
-      for k,v in pairs(citadel:get_soldiers("all")) do
-         break_out = true
-         break -- Break out if there is at least one soldier here
-      end
-
-      sleep(500)
-   end
-
-   sleep(300)
-
-   attack()
-end
-
-function create_enemy()
-   prefilled_buildings(wl.Game().players[2],
-      {"barrier", 24, 7},
-      {"sentry", 29, 16},
-      {"tower", 30, 21},
-      {"headquarters", 30, 27,
-         soldiers = {
-            [{0,0,0,0}] = 15,
-         }
-      }
-   )
-   wl.Game().players[2]:forbid_buildings("all")
-end
-
-function attack()
-   local o = message_box_objective(plr, attack_enemy)
-
-   local plr2 = wl.Game().players[2]
-   while #plr2:get_buildings("headquarters") > 0 do
-      sleep(3000)
-   end
-   o.done = true
-
-   conclusion()
-end
-
-function conclusion()
-   sleep(4000)
-   message_box_objective(plr, conclude_tutorial)
-end
-
-run(intro)
-
+-- ================
+-- Mission thread
+-- ================
+
+function intro()
+   sleep(1000)
+   message_box_objective(plr, introduction)
+
+   training()
+end
+
+function training()
+   -- Teach about trainingsites and soldiers' abilities
+   sleep(5000) -- to let soldiers walk
+
+   message_box_objective(plr, abilities)
+   local o = message_box_objective(plr, battlearena1)
+   while #plr:get_buildings("barbarians_battlearena") == 0 do sleep(500) end
+   o.done = true
+   message_box_objective(plr, battlearena2)
+
+   o = message_box_objective(plr, trainingcamp1)
+   while #plr:get_buildings("barbarians_trainingcamp") == 0 do sleep(500) end
+   o.done = true
+   message_box_objective(plr, trainingcamp2)
+
+   sleep(300)
+
+   military_buildings()
+end
+
+function military_buildings()
+   message_box_objective(plr, heroes_rookies)
+   message_box_objective(plr, soldier_capacity)
+   local o = message_box_objective(plr, dismantle)
+
+   while #plr:get_buildings("barbarians_sentry") > 1 do sleep(200) end
+   o.done = true
+
+   sleep(2000)
+
+   enhance_fortress()
+end
+
+function enhance_fortress()
+   sleep(5000)
+
+   local citadel_field = wl.Game().map:get_field(32, 62)
+   local o = message_box_objective(plr, fortress_enhancement)
+   while not (citadel_field.immovable and
+      citadel_field.immovable.descr.name == "barbarians_citadel") do sleep(800) end
+   o.done = true
+
+   create_enemy()
+
+   -- Wait for soldiers to move in
+   local citadel = citadel_field.immovable
+   local break_out = false
+   while not break_out do
+      for k,v in pairs(citadel:get_soldiers("all")) do
+         break_out = true
+         break -- Break out if there is at least one soldier here
+      end
+
+      sleep(500)
+   end
+
+   sleep(300)
+
+   attack()
+end
+
+function create_enemy()
+   prefilled_buildings(wl.Game().players[2],
+      {"empire_barrier", 24, 7},
+      {"empire_sentry", 29, 16},
+      {"empire_tower", 30, 21},
+      {"empire_headquarters", 30, 27,
+         soldiers = {
+            [{0,0,0,0}] = 15,
+         }
+      }
+   )
+   wl.Game().players[2]:forbid_buildings("all")
+end
+
+function attack()
+   local o = message_box_objective(plr, attack_enemy)
+
+   local plr2 = wl.Game().players[2]
+   while #plr2:get_buildings("empire_headquarters") > 0 do
+      sleep(3000)
+   end
+   o.done = true
+
+   conclusion()
+end
+
+function conclusion()
+   sleep(4000)
+   message_box_objective(plr, conclude_tutorial)
+end
+
+run(intro)

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -7,8 +7,8 @@
    plr:allow_buildings("all")
 
    prefilled_buildings(plr,
-      {"fortress", 32, 62, soldiers = {[{3,5,0,2}] = 8 }},
-      {"warehouse", 33, 57,
+      {"barbarians_fortress", 32, 62, soldiers = {[{3,5,0,2}] = 8 }},
+      {"barbarians_warehouse", 33, 57,
          soldiers = {
             [{0,0,0,0}] = 20, -- needed for training
             [{1,0,0,0}] = 1,
@@ -24,9 +24,9 @@
             [{3,5,0,2}] = 30,
          },
          workers = {
-            builder = 3,
-            ox = 15,
-            trainer = 2
+            barbarians_builder = 3,
+            barbarians_ox = 15,
+            barbarians_trainer = 2
          },
          wares = {
             log = 40,
@@ -34,27 +34,27 @@
             cloth = 10,
             gold = 10,
             grout = 30,
-            raw_stone = 30,
-            thatchreed = 40,
+            granite = 30,
+            thatch_reed = 40,
 
             -- wares for training
-            sharpax = 20,
-            broadax = 20,
-            bronzeax = 20,
-            battleax = 20,
-            warriorsax = 20,
-            helm = 20,
-            mask = 20,
-            warhelm = 20,
-            strongbeer = 50,
-            pittabread = 200,
+            ax_sharp = 20,
+            ax_broad = 20,
+            ax_bronze = 20,
+            ax_battle = 20,
+            ax_warriors = 20,
+            helmet = 20,
+            helmet_mask = 20,
+            helmet_warhelm = 20,
+            beer_strong = 50,
+            barbarians_bread = 200,
             meat = 200
          }
       },
-      {"sentry", 28, 57, soldiers = {[{3,5,0,2}] = 2 }},
-      {"sentry", 37, 61, soldiers = {[{3,5,0,2}] = 2 }},
-      {"barrier", 30, 58, soldiers = {[{0,0,0,0}] = 1 }}, -- to make sure some soldiers walk out
-      {"lumberjacks_hut", 24, 1}
+      {"barbarians_sentry", 28, 57, soldiers = {[{3,5,0,2}] = 2 }},
+      {"barbarians_sentry", 37, 61, soldiers = {[{3,5,0,2}] = 2 }},
+      {"barbarians_barrier", 30, 58, soldiers = {[{0,0,0,0}] = 1 }}, -- to make sure some soldiers walk out
+      {"barbarians_lumberjacks_hut", 24, 1}
    )
 
    -- Build the roads
@@ -66,4 +66,3 @@
 end
 
 run(init_player)
-

=== modified file 'campaigns/tutorial02_warfare.wmf/scripting/texts.lua'
--- campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2015-09-05 16:42:45 +0000
+++ campaigns/tutorial02_warfare.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -1,215 +1,214 @@
--- =======================================================================
---                      Texts for the tutorial mission
--- =======================================================================
-
--- =========================
--- Some formating functions
--- =========================
-
-include "scripting/formatting.lua"
-include "scripting/format_scenario.lua"
-
--- =============
--- Texts below
--- =============
-
-introduction = {
-   title = _"Introduction",
-   body = rt(
-      h1(_"Soldiers, Training and Warfare") ..
-      p(_[[In this scenario, I’m going to tell you about soldiers, their training and their profession: warfare. Although Widelands is about building up, not burning down, there is an enemy you sometimes have to defeat. Yet warfare is mainly focused on economics, not on military strategies, and its mechanics deserve explanation.]]) ..
-      p(_[[I’ve set up a small village that contains the most important buildings. You also have enough wares, so you do not have to take care of your weapons production. In a real game, you will not have this luxury.]])
-   ),
-   h = 300
-}
-
-abilities = {
-   position = "topright",
-   title = _"Soldiers’ abilities",
-   body = rt(
-      p(_[[A new soldier is created like a worker: when a military building needs a soldier, a carrier grabs the needed weapons and armor from a warehouse (or your headquarters) and walks up the road to your new building. Basic Barbarian soldiers do not use armor, they only need an ax.]]) ..
-      p(_[[Take a look at the soldiers that are on their way to our military buildings. 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(_[[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 abilities have the following meaning:]])
-   ) ..
-   rt("image=tribes/barbarians/soldier/hp_level0.png", h2(_"Health:"))..
-   rt(p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
-   rt("image=tribes/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
-   rt(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.]])) ..
-   -- The Atlanteans' image, because the Barbarian one has a white background
-   rt("image=tribes/atlanteans/soldier/defense_level0.png", h2(_"Defense:")) ..
-   rt(p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a Barbarian soldier, the Barbarian will lose 35·0.97 = 34 health.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level0.png", h2(_"Evade:")) ..
-   rt(p(_[[Evade is the chance that the soldier is able to dodge an attack. A level 0 Barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]]))
-}
-
-battlearena1 = {
-   position = "topright",
-   title = _"The Battle Arena",
-   body = rt(
-      p(_[[Now I have talked about training and levels. Let me elaborate on that.]]) ..
-      p(_[[A newly created soldier has no experience and is not very good at fighting. To make him stronger, you can build training sites.]]) ..
-      p(_[[One of these training sites is the battle arena. It is a big and expensive building, and it trains soldiers in evade. Since soldiers get very hungry during their workout, this building needs a lot of food and strongbeer. In a real game, you should have a good infrastructure before you build it.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[To see evade training in action, build a battle arena.]]) ..
-      "</p><p font-size=8><br></p>" ..
-      p(_[[While we’re waiting for the battle arena, you’ll probably notice some soldiers walking around. They are automatically exchanged from time to time. I’ll teach you about that later.]])
-   ),
-   h = 400,
-   obj_name = "build_battlearena",
-   obj_title = _"Build a battle arena",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a battle arena. It is a big building.]]) ..
-      listitem_arrow(_[[Since the construction will take some time, you can change the game speed using PAGE UP and PAGE DOWN.]])
-   )
-}
-
-battlearena2 = {
-   position = "topright",
-   title = _"The Battle Arena",
-   body = rt(
-      h1(_"The Battle Arena Has Been Constructed") ..
-      p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
-      -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
-      p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strongbeer, as well as either fish or meat.]] .. " " ..
-      _[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
-      p(_[[To learn how far your soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]])
-   ) ..
-   rt("image=tribes/barbarians/soldier/evade_level0.png", p(_[[No red dots means that the soldier is not trained, so he has level 0. All your new recruits have this.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level1.png", p(_[[With every successful training step, your soldier becomes stronger. This is indicated by a red dot. This soldier is on level 1 in evade training.]])) ..
-   rt("image=tribes/barbarians/soldier/evade_level2.png", p(_[[When your soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]])),
-   h = 450
-}
-
-trainingcamp1 = {
-   position = "topright",
-   title = _"The Training Camp",
-   body = rt(
-      h1(_"The Training Camp") ..
-      p(_[[There is a second training site: the training camp. It is a big building too, and to complement the battle arena, it trains attack and health (remember, the Barbarian soldiers cannot be trained in defense).]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
-   ),
-   h = 300,
-   obj_name = "build_trainingcamp",
-   obj_title = _"Build a training camp",
-   obj_body = rt(
-      p(_[[The battle arena only trains the soldiers in evade. To get the strongest possible soldier, you also need to build a training camp, which trains them in attack and health.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a training camp.]])
-   )
-}
-
-trainingcamp2 = {
-   position = "topright",
-   title = _"The Training Camp",
-   body = rt(
-      p(_[[Great, our training camp has now been finished, too. Now nothing will hinder us from getting the strongest warriors the world has ever seen.]]) ..
-      p(_[[To train in the training camp, our soldiers need food like in the battle arena, but no strongbeer. Instead, they need different axes for attack training and helmets for health training.]]) ..
-      p(_[[This equipment is produced in smithies out of coal, iron, and sometimes gold. You will learn more about this in the second scenario of the Barbarian campaign.]]) ..
-      p(_[[You should also keep in mind that each of the three tribes in Widelands has its own way of training, so the buildings and wares are different. Also, the ability levels cannot be compared: an Imperial soldier with evade level 0 has a 30% chance of evading, while a Barbarian soldier at the same level only has a 25% chance.]])
-   )
-}
-
-heroes_rookies = {
-   position = "topright",
-   title = _"Heroes and Rookies",
-   body = rt(
-      h1(_"Heroes and Rookies") ..
-      p(_[[While our soldiers are training, let me tell you what we can do with them.]]) ..
-      p(_[[In every military building, you can set the preference for heroes (trained soldiers) or rookies. From time to time, a soldier will walk out of the building and be replaced by a stronger/weaker one automatically – this is what you saw earlier.]]) ..
-      p(_[[The initial setting depends on the type of the building. For the Barbarians, the sentry is the only building that prefers rookies by default. You should change this setting to fit your current needs.]]) ..
-      p(_[[When you are expanding into no man’s land, you can make your buildings prefer rookies. When you are planning to attack, send heroes into that region. Conquered buildings always prefer heroes.]])
-   )
-}
-
-soldier_capacity = {
-   position = "topright",
-   title = _"Soldier capacity",
-   body = rt(
-      h1(_"Adjusting the number of soldiers") ..
-      p(_[[There is another way how you can control the strength of a military building: by the number of soldiers stationed there. Just click on the arrow buttons to decrease or increase the desired number of soldiers. Every building has a maximum capacity. In case of the barrier, it is five, for example.]]) ..
-      p(_[[If you wish to send a certain soldier away, you can simply click on it. It will then be replaced by another soldier.]]) ..
-      p(_[[Let me also describe what the numbers in the statistics string mean. This string can contain up to three numbers, e.g. ‘1 (+5) soldier (+2)’.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[The first number describes how many soldiers are currently in this building. In this example, only one soldier is left inside (each military building is always guarded by at least one soldier).]]) ..
-      listitem_bullet(_[[The second number tells you how many additional soldiers reside in this building, but are currently outside. The five soldiers may be attacking an enemy. They will return when they have been successful.]]) ..
-      listitem_bullet(_[[The third number indicates the missing soldiers. From the eight soldiers (1 + 5 + 2) you wish to have here, two may have died. They will be replaced by new soldiers from your warehouse, if possible.]])
-   )
-}
-
-dismantle = {
-   position = "topright",
-   title = _"Dismantle your sentry",
-   body = rt(
-      h1(_"Dismantling military buildings") ..
-      p(_[[You can only reduce the number of soldiers to one. The last soldier of a building will never come out (unless this building is attacked). If you want to have your soldier elsewhere, you will have to dismantle the building (buildings of an alien tribe cannot be dismantled, only be burned down).]]) ..
-      p(_[[However, destroying a military building is always linked with a risk: the land is still yours, but it is no longer protected. Any enemy that builds his own military sites can take over that land without a fight, causing your buildings to burst into flames. Furthermore, some parts of the land can now be hidden under the fog of war. You should therefore only dismantle military buildings deep inside your territory where you are safe from enemies.]]) ..
-      p(_[[Have you seen your sentry? Since it cannot contain many soldiers and is next to a stronger barrier, it is rather useless.]]) ..
-      paragraphdivider() ..
-      -- TRANSLATORS: 'it' refers to the Barbarian sentry
-      listitem_bullet(_[[Dismantle it.]])
-   ) ..
-   rt(p(_[[You can also use this opportunity to become familiar with the other options: the heroes/rookies preference and the capacity.]])),
-   obj_name = "dismantle_sentry",
-   obj_title = _"Dismantle your north-western sentry",
-   obj_body = rt(
-      p(_[[You can control the number of soldiers stationed at a military site with the arrow buttons. If you want to get even your last soldier out, you will have to destroy it. However, it then will no longer protect your territory, which will make it vulnerable to hostile attacks.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Dismantle your sentry in the north-west, next to the barrier.]])
-   )
-}
-
-fortress_enhancement = {
-   position = "topright",
-   title = _"Enhance Your Fortress",
-   body = rt(
-      h1(_"Enhancing Buildings") ..
-      p(_[[Well done. Now you know how to draw back your soldiers from the places where you don’t need them. It is time to tell you how to reinforce your front line.]]) ..
-      p(_[[Your fortress is already quite strong and conquers a lot of space. But there is an even bigger building: the citadel.]]) ..
-      p(_[[Citadels can’t be built directly. Instead, you’ll 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.]]) ..
-      p(_[[Your soldiers will leave the fortress while the construction is going on. This means that your fortress will lose its military influence, as I described above.]]) ..
-      listitem_bullet(_[[Enhance your fortress to a citadel now.]])
-   ),
-   obj_name = "enhance_fortress",
-   obj_title = _"Enhance your fortress to a citadel",
-   obj_body = rt(
-      h1(_"Enhance Your Fortress") ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Enhance your fortress to a mighty citadel.]]) ..
-      listitem_arrow(_[[The citadel can house 12 soldiers, and it 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.]])
-   )
-}
-
-attack_enemy = {
-   position = "topright",
-   field = wl.Game().map:get_field(29,4), -- show the lost territory
-   title = _"Defeat your Enemy",
-   body = rt(
-      h1(_"Defeat the Enemy") ..
-      p(_[[Great work, the citadel is finished. But what’s that? A hostile tribe has settled next to us while the citadel was under construction! Do you see how they took away a part of our land? And our lumberjack has now lost his place of work. This is what I was talking about. Let’s take our land back and defeat the enemy!]]) ..
-      p(_[[To attack a building, click on its doors, 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.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]])
-   ),
-   h = 350,
-   obj_name = "defeated_the_empire",
-   obj_title = _"Defeat the enemy tribe",
-   obj_body = rt(
-      h1(_"Defeat Your Enemy") ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Defeat the nearby enemy.]]) ..
-      listitem_arrow(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]])
-   )
-}
-
-conclude_tutorial = {
-   title = _"Conclusion",
-   body = rt(
-      h1(_"Conclusion") ..
-      p(_[[Thank you for playing this tutorial. I hope you enjoyed it and you learned how to create and train soldiers, how to control where they go and how to defeat an enemy. Did you see how easily you could overwhelm your enemy? Having trained soldiers is a huge advantage.]]) ..
-      p(_[[But a war is expensive, and not always the path leading to the goal. When setting up a new game, you can also choose peaceful win conditions. You should definitely try them out, they’re worth it.]]) ..
-      p(_[[You are now ready to play the campaigns. They will teach you about the different economies of the tribes. You can also play the remaining tutorials, but they are not crucial for succeeding in the campaigns.]])
-   )
-}
-
+-- =======================================================================
+--                      Texts for the tutorial mission
+-- =======================================================================
+
+-- =========================
+-- Some formating functions
+-- =========================
+
+include "scripting/formatting.lua"
+include "scripting/format_scenario.lua"
+
+-- =============
+-- Texts below
+-- =============
+
+introduction = {
+   title = _"Introduction",
+   body = rt(
+      h1(_"Soldiers, Training and Warfare") ..
+      p(_[[In this scenario, I’m going to tell you about soldiers, their training and their profession: warfare. Although Widelands is about building up, not burning down, there is an enemy you sometimes have to defeat. Yet warfare is mainly focused on economics, not on military strategies, and its mechanics deserve explanation.]]) ..
+      p(_[[I’ve set up a small village that contains the most important buildings. You also have enough wares, so you do not have to take care of your weapons production. In a real game, you will not have this luxury.]])
+   ),
+   h = 300
+}
+
+abilities = {
+   position = "topright",
+   title = _"Soldiers’ abilities",
+   body = rt(
+      p(_[[A new soldier is created like a worker: when a military building needs a soldier, a carrier grabs the needed weapons and armor from a warehouse (or your headquarters) and walks up the road to your new building. Basic Barbarian soldiers do not use armor, they only need an ax.]]) ..
+      p(_[[Take a look at the soldiers that are on their way to our military buildings. 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(_[[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 abilities have the following meaning:]])
+   ) ..
+   rt("image=tribes/workers/barbarians/soldier/hp_level0.png", h2(_"Health:"))..
+   rt(p(_[[The total life of a soldier. A Barbarian soldier starts with 130 health, and he will gain 28 health with each health level.]])) ..
+   rt("image=tribes/workers/barbarians/soldier/attack_level0.png", h2(_"Attack:")) ..
+   rt(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.]])) ..
+   -- The Atlanteans' image, because the Barbarian one has a white background
+   rt("image=tribes/workers/atlanteans/soldier/defense_level0.png", h2(_"Defense:")) ..
+   rt(p(_[[The defense is the percentage that is subtracted from the attack value. The Barbarians cannot train in this skill and therefore have always defense level 0, which means that the damage is always reduced by 3%. If an attacker with an attack value of 35 points hits a Barbarian soldier, the Barbarian will lose 35·0.97 = 34 health.]])) ..
+   rt("image=tribes/workers/barbarians/soldier/evade_level0.png", h2(_"Evade:")) ..
+   rt(p(_[[Evade is the chance that the soldier is able to dodge an attack. A level 0 Barbarian has a 25% chance to evade an attack, and this increases in steps of 15% for each level.]]))
+}
+
+battlearena1 = {
+   position = "topright",
+   title = _"The Battle Arena",
+   body = rt(
+      p(_[[Now I have talked about training and levels. Let me elaborate on that.]]) ..
+      p(_[[A newly created soldier has no experience and is not very good at fighting. To make him stronger, you can build training sites.]]) ..
+      p(_[[One of these training sites is the battle arena. It is a big and expensive building, and it trains soldiers in evade. Since soldiers get very hungry during their workout, this building needs a lot of food and strong beer. In a real game, you should have a good infrastructure before you build it.]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[To see evade training in action, build a battle arena.]]) ..
+      "</p><p font-size=8><br></p>" ..
+      p(_[[While we’re waiting for the battle arena, you’ll probably notice some soldiers walking around. They are automatically exchanged from time to time. I’ll teach you about that later.]])
+   ),
+   h = 400,
+   obj_name = "build_battlearena",
+   obj_title = _"Build a battle arena",
+   obj_body = rt(
+      paragraphdivider() ..
+      listitem_bullet(_[[Build a battle arena. It is a big building.]]) ..
+      listitem_arrow(_[[Since the construction will take some time, you can change the game speed using PAGE UP and PAGE DOWN.]])
+   )
+}
+
+battlearena2 = {
+   position = "topright",
+   title = _"The Battle Arena",
+   body = rt(
+      h1(_"The Battle Arena Has Been Constructed") ..
+      p(_[[Very good. Our battle arena has been finished, and the soldiers are already walking towards it.]]) ..
+      -- Not perfectly correct (some training steps need either bread or meat), but we do not want to confuse new players
+      p(_[[The needed wares are also delivered there. For successful training, you need pitta bread and strong beer, as well as either fish or meat.]] .. " " ..
+      _[[For more information, you can have a look at the building’s help window, accessible via the question mark in every building’s window.]]) ..
+      p(_[[To learn how far your soldiers have progressed in their training, you can have a look at their icons. They are modified by red dots:]])
+   ) ..
+   rt("image=tribes/workers/barbarians/soldier/evade_level0.png", p(_[[No red dots means that the soldier is not trained, so he has level 0. All your new recruits have this.]])) ..
+   rt("image=tribes/workers/barbarians/soldier/evade_level1.png", p(_[[With every successful training step, your soldier becomes stronger. This is indicated by a red dot. This soldier is on level 1 in evade training.]])) ..
+   rt("image=tribes/workers/barbarians/soldier/evade_level2.png", p(_[[When your soldier has reached the highest possible level (in this case level 2), this is indicated by a white background color.]])),
+   h = 450
+}
+
+trainingcamp1 = {
+   position = "topright",
+   title = _"The Training Camp",
+   body = rt(
+      h1(_"The Training Camp") ..
+      p(_[[There is a second training site: the training camp. It is a big building too, and to complement the battle arena, it trains attack and health (remember, the Barbarian soldiers cannot be trained in defense).]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Build a training camp.]])
+   ),
+   h = 300,
+   obj_name = "build_trainingcamp",
+   obj_title = _"Build a training camp",
+   obj_body = rt(
+      p(_[[The battle arena only trains the soldiers in evade. To get the strongest possible soldier, you also need to build a training camp, which trains them in attack and health.]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Build a training camp.]])
+   )
+}
+
+trainingcamp2 = {
+   position = "topright",
+   title = _"The Training Camp",
+   body = rt(
+      p(_[[Great, our training camp has now been finished, too. Now nothing will hinder us from getting the strongest warriors the world has ever seen.]]) ..
+      p(_[[To train in the training camp, our soldiers need food like in the battle arena, but no strong beer. Instead, they need different axes for attack training and helmets for health training.]]) ..
+      p(_[[This equipment is produced in smithies out of coal, iron, and sometimes gold. You will learn more about this in the second scenario of the Barbarian campaign.]]) ..
+      p(_[[You should also keep in mind that each of the three tribes in Widelands has its own way of training, so the buildings and wares are different. Also, the ability levels cannot be compared: an Imperial soldier with evade level 0 has a 30% chance of evading, while a Barbarian soldier at the same level only has a 25% chance.]])
+   )
+}
+
+heroes_rookies = {
+   position = "topright",
+   title = _"Heroes and Rookies",
+   body = rt(
+      h1(_"Heroes and Rookies") ..
+      p(_[[While our soldiers are training, let me tell you what we can do with them.]]) ..
+      p(_[[In every military building, you can set the preference for heroes (trained soldiers) or rookies. From time to time, a soldier will walk out of the building and be replaced by a stronger/weaker one automatically – this is what you saw earlier.]]) ..
+      p(_[[The initial setting depends on the type of the building. For the Barbarians, the sentry is the only building that prefers rookies by default. You should change this setting to fit your current needs.]]) ..
+      p(_[[When you are expanding into no man’s land, you can make your buildings prefer rookies. When you are planning to attack, send heroes into that region. Conquered buildings always prefer heroes.]])
+   )
+}
+
+soldier_capacity = {
+   position = "topright",
+   title = _"Soldier capacity",
+   body = rt(
+      h1(_"Adjusting the number of soldiers") ..
+      p(_[[There is another way how you can control the strength of a military building: by the number of soldiers stationed there. Just click on the arrow buttons to decrease or increase the desired number of soldiers. Every building has a maximum capacity. In case of the barrier, it is five, for example.]]) ..
+      p(_[[If you wish to send a certain soldier away, you can simply click on it. It will then be replaced by another soldier.]]) ..
+      p(_[[Let me also describe what the numbers in the statistics string mean. This string can contain up to three numbers, e.g. ‘1 (+5) soldier (+2)’.]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[The first number describes how many soldiers are currently in this building. In this example, only one soldier is left inside (each military building is always guarded by at least one soldier).]]) ..
+      listitem_bullet(_[[The second number tells you how many additional soldiers reside in this building, but are currently outside. The five soldiers may be attacking an enemy. They will return when they have been successful.]]) ..
+      listitem_bullet(_[[The third number indicates the missing soldiers. From the eight soldiers (1 + 5 + 2) you wish to have here, two may have died. They will be replaced by new soldiers from your warehouse, if possible.]])
+   )
+}
+
+dismantle = {
+   position = "topright",
+   title = _"Dismantle your sentry",
+   body = rt(
+      h1(_"Dismantling military buildings") ..
+      p(_[[You can only reduce the number of soldiers to one. The last soldier of a building will never come out (unless this building is attacked). If you want to have your soldier elsewhere, you will have to dismantle the building (buildings of an alien tribe cannot be dismantled, only be burned down).]]) ..
+      p(_[[However, destroying a military building is always linked with a risk: the land is still yours, but it is no longer protected. Any enemy that builds his own military sites can take over that land without a fight, causing your buildings to burst into flames. Furthermore, some parts of the land can now be hidden under the fog of war. You should therefore only dismantle military buildings deep inside your territory where you are safe from enemies.]]) ..
+      p(_[[Have you seen your sentry? Since it cannot contain many soldiers and is next to a stronger barrier, it is rather useless.]]) ..
+      paragraphdivider() ..
+      -- TRANSLATORS: 'it' refers to the Barbarian sentry
+      listitem_bullet(_[[Dismantle it.]])
+   ) ..
+   rt(p(_[[You can also use this opportunity to become familiar with the other options: the heroes/rookies preference and the capacity.]])),
+   obj_name = "dismantle_sentry",
+   obj_title = _"Dismantle your north-western sentry",
+   obj_body = rt(
+      p(_[[You can control the number of soldiers stationed at a military site with the arrow buttons. If you want to get even your last soldier out, you will have to destroy it. However, it then will no longer protect your territory, which will make it vulnerable to hostile attacks.]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Dismantle your sentry in the north-west, next to the barrier.]])
+   )
+}
+
+fortress_enhancement = {
+   position = "topright",
+   title = _"Enhance Your Fortress",
+   body = rt(
+      h1(_"Enhancing Buildings") ..
+      p(_[[Well done. Now you know how to draw back your soldiers from the places where you don’t need them. It is time to tell you how to reinforce your front line.]]) ..
+      p(_[[Your fortress is already quite strong and conquers a lot of space. But there is an even bigger building: the citadel.]]) ..
+      p(_[[Citadels can’t be built directly. Instead, you’ll 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.]]) ..
+      p(_[[Your soldiers will leave the fortress while the construction is going on. This means that your fortress will lose its military influence, as I described above.]]) ..
+      listitem_bullet(_[[Enhance your fortress to a citadel now.]])
+   ),
+   obj_name = "enhance_fortress",
+   obj_title = _"Enhance your fortress to a citadel",
+   obj_body = rt(
+      h1(_"Enhance Your Fortress") ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Enhance your fortress to a mighty citadel.]]) ..
+      listitem_arrow(_[[The citadel can house 12 soldiers, and it 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.]])
+   )
+}
+
+attack_enemy = {
+   position = "topright",
+   field = wl.Game().map:get_field(29,4), -- show the lost territory
+   title = _"Defeat your Enemy",
+   body = rt(
+      h1(_"Defeat the Enemy") ..
+      p(_[[Great work, the citadel is finished. But what’s that? A hostile tribe has settled next to us while the citadel was under construction! Do you see how they took away a part of our land? And our lumberjack has now lost his place of work. This is what I was talking about. Let’s take our land back and defeat the enemy!]]) ..
+      p(_[[To attack a building, click on its doors, 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.]]) ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Attack and conquer all military buildings of the enemy and destroy their headquarters.]])
+   ),
+   h = 350,
+   obj_name = "defeated_the_empire",
+   obj_title = _"Defeat the enemy tribe",
+   obj_body = rt(
+      h1(_"Defeat Your Enemy") ..
+      paragraphdivider() ..
+      listitem_bullet(_[[Defeat the nearby enemy.]]) ..
+      listitem_arrow(_[[To attack a building, click on its doors, choose the number of soldiers that you wish to send and click on the ‘Attack’ button.]])
+   )
+}
+
+conclude_tutorial = {
+   title = _"Conclusion",
+   body = rt(
+      h1(_"Conclusion") ..
+      p(_[[Thank you for playing this tutorial. I hope you enjoyed it and you learned how to create and train soldiers, how to control where they go and how to defeat an enemy. Did you see how easily you could overwhelm your enemy? Having trained soldiers is a huge advantage.]]) ..
+      p(_[[But a war is expensive, and not always the path leading to the goal. When setting up a new game, you can also choose peaceful win conditions. You should definitely try them out, they’re worth it.]]) ..
+      p(_[[You are now ready to play the campaigns. They will teach you about the different economies of the tribes. You can also play the remaining tutorials, but they are not crucial for succeeding in the campaigns.]])
+   )
+}

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua	2014-10-17 08:38:24 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua	2015-11-03 18:26:36 +0000
@@ -25,4 +25,3 @@
       elseif b.valid_wares then b:set_wares(b.valid_wares) end
    end
 end
-

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/init.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/init.lua	2014-10-28 12:58:23 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/init.lua	2015-11-03 18:26:36 +0000
@@ -25,4 +25,3 @@
 include "map:scripting/starting_conditions.lua"
 
 include "map:scripting/mission_thread.lua"
-

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua	2015-06-01 20:08:40 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/mission_thread.lua	2015-11-03 18:26:36 +0000
@@ -1,92 +1,91 @@
--- ===============
--- Mission thread
--- ===============
-
-function introduction()
-   additional_port_space.terr = "wasser" -- disable the port space
-   sleep(1000)
-   message_box_objective(plr, intro_south)
-   sleep(300)
-   message_box_objective(plr, intro_north)
-   sleep(20000)
-
-   build_port()
-end
-
-function build_port()
-   sleep(200)
-   message_box_objective(plr, tell_about_port)
-
-   wl.ui.MapView().buildhelp = true -- so that the player sees the port building icon
-   local o = message_box_objective(plr, tell_about_port_building)
-
-   while #plr:get_buildings("port") < 2 do sleep(200) end
-   o.done = true
-
-   build_ships()
-end
-
-function build_ships()
-   sleep(200)
-   local o = message_box_objective(plr, tell_about_shipyard)
-   plr:allow_buildings{"shipyard"}
-
-   while #plr:get_buildings("shipyard") < 1 do sleep(200) end
-   o.done = true
-
-   local o = message_box_objective(plr, tell_about_ships)
-
-   -- we only wait for one ship and a bit longer because it takes long enough
-   while #plr:get_ships() < 1 do sleep(30*1000) end
-   sleep(5*60*1000)
-
-   o.done = true
-
-   expedition()
-end
-
-function expedition()
-   sleep(200)
-   message_box_objective(plr, expedition1)
-   local o = message_box_objective(plr, expedition2)
-
-   local function _ship_ready_for_expedition()
-      for k,ship in ipairs(plr:get_ships()) do
-         if ship.state == "exp_waiting" then return true end
-      end
-      return false
-   end
-
-   while not _ship_ready_for_expedition() do sleep(1000) end
-   o.done = true
-
-   local o2 = message_box_objective(plr, expedition3)
-
-   while #plr:get_buildings("port") < 3 do sleep(200) end
-   o.done = true
-
-   -- places 5 signs with iron to show the player he really found some iron ore
-   local fields = map:get_field(97,35):region(3)
-   for i=1,5 do
-      local successful = false
-      while not successful do
-         local idx = math.random(#fields)
-         f = fields[idx]
-         if ((f.resource == "iron") and not f.immovable) then
-            map:place_immovable("resi_iron2",f,"atlanteans")
-            successful = true
-         end
-         table.remove(fields,idx)
-      end
-   end
-
-   conclude()
-end
-
-function conclude()
-   additional_port_space.terr = "desert_steppe" -- make it land again so that the player can build a port
-   message_box_objective(plr, conclusion)
-end
-
-run(introduction)
-
+-- ===============
+-- Mission thread
+-- ===============
+
+function introduction()
+   additional_port_space.terr = "wasser" -- disable the port space
+   sleep(1000)
+   message_box_objective(plr, intro_south)
+   sleep(300)
+   message_box_objective(plr, intro_north)
+   sleep(20000)
+
+   build_port()
+end
+
+function build_port()
+   sleep(200)
+   message_box_objective(plr, tell_about_port)
+
+   wl.ui.MapView().buildhelp = true -- so that the player sees the port building icon
+   local o = message_box_objective(plr, tell_about_port_building)
+
+   while #plr:get_buildings("atlanteans_port") < 2 do sleep(200) end
+   o.done = true
+
+   build_ships()
+end
+
+function build_ships()
+   sleep(200)
+   local o = message_box_objective(plr, tell_about_shipyard)
+   plr:allow_buildings{"atlanteans_shipyard"}
+
+   while #plr:get_buildings("atlanteans_shipyard") < 1 do sleep(200) end
+   o.done = true
+
+   local o = message_box_objective(plr, tell_about_ships)
+
+   -- we only wait for one ship and a bit longer because it takes long enough
+   while #plr:get_ships() < 1 do sleep(30*1000) end
+   sleep(5*60*1000)
+
+   o.done = true
+
+   expedition()
+end
+
+function expedition()
+   sleep(200)
+   message_box_objective(plr, expedition1)
+   local o = message_box_objective(plr, expedition2)
+
+   local function _ship_ready_for_expedition()
+      for k,ship in ipairs(plr:get_ships()) do
+         if ship.state == "exp_waiting" then return true end
+      end
+      return false
+   end
+
+   while not _ship_ready_for_expedition() do sleep(1000) end
+   o.done = true
+
+   local o2 = message_box_objective(plr, expedition3)
+
+   while #plr:get_buildings("atlanteans_port") < 3 do sleep(200) end
+   o.done = true
+
+   -- places 5 signs with iron to show the player he really found some iron ore
+   local fields = map:get_field(97,35):region(3)
+   for i=1,5 do
+      local successful = false
+      while not successful do
+         local idx = math.random(#fields)
+         f = fields[idx]
+         if ((f.resource == "iron") and not f.immovable) then
+            map:place_immovable("resi_iron2",f,"tribes")
+            successful = true
+         end
+         table.remove(fields,idx)
+      end
+   end
+
+   conclude()
+end
+
+function conclude()
+   additional_port_space.terr = "desert_steppe" -- make it land again so that the player can build a port
+   message_box_objective(plr, conclusion)
+end
+
+run(introduction)

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua	2014-10-18 09:02:51 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua	2015-11-03 18:26:36 +0000
@@ -5,144 +5,144 @@
 plr:allow_buildings("all")
 
 function init_player()
-   filled_buildings(plr, {"port", sf.x, sf.y,
+   filled_buildings(plr, {"atlanteans_port", sf.x, sf.y,
       wares = {
-         diamond = 7,
-         ironore = 20,
-         quartz = 9,
-         stone = 50,
-         spideryarn = 9,
-         log = 80,
+         blackroot = 5,
+         blackroot_flour = 12,
+         atlanteans_bread = 28,
+         bread_paddle = 2,
+         buckets = 2,
          coal = 12,
-         goldyarn = 6,
-         iron = 12,
-         planks = 65,
-         spidercloth = 35,
-         blackroot = 5,
-         blackrootflour = 12,
-         bread = 28,
          corn = 15,
-         cornflour = 12,
+         cornmeal = 12,
+         diamond = 7,
+         fire_tongs = 2,
          fish = 13,
-         meat = 13,
-         smoked_fish = 26,
-         smoked_meat = 26,
-         water = 12,
-         bread_paddle = 2,
-         bucket = 2,
-         fire_tongs = 2,
          fishing_net = 4,
+         gold_thread = 6,
+         granite = 50,
          hammer = 11,
+         hook_pole = 2,
          hunting_bow = 1,
+         iron = 12,
+         iron_ore = 20,
+         log = 80,
+         meat = 13,
          milking_tongs = 2,
-         hook_pole = 2,
          pick = 8,
+         planks = 65,
+         quartz = 9,
          saw = 9,
          scythe = 4,
          shovel = 9,
+         smoked_fish = 26,
+         smoked_meat = 26,
+         spider_silk = 9,
+         spidercloth = 35,
          tabard = 15,
-         light_trident = 15,
+         trident_light = 15,
+         water = 12,
       },
       workers = {
-         armorsmith = 1,
-         blackroot_farmer = 1,
-         builder = 10,
-         charcoal_burner = 1,
-         carrier = 40,
-         fish_breeder = 2,
-         geologist = 4,
-         miner = 3,
-         sawyer = 1,
-         stonecutter = 2,
-         toolsmith = 2,
-         weaponsmith = 1,
-         woodcutter = 3,
-         horse = 15,
+         atlanteans_armorsmith = 1,
+         atlanteans_blackroot_farmer = 1,
+         atlanteans_builder = 10,
+         atlanteans_charcoal_burner = 1,
+         atlanteans_carrier = 40,
+         atlanteans_fishbreeder = 2,
+         atlanteans_geologist = 4,
+         atlanteans_miner = 3,
+         atlanteans_sawyer = 1,
+         atlanteans_stonecutter = 2,
+         atlanteans_toolsmith = 2,
+         atlanteans_weaponsmith = 1,
+         atlanteans_woodcutter = 3,
+         atlanteans_horse = 15,
       },
       soldiers = {
          [{0,0,0,0}] = 35,
       }
    },
-   {"woodcutters_house", 32, 48},
-   {"woodcutters_house", 33, 47},
-   {"woodcutters_house", 29, 56},
-   {"woodcutters_house", 30, 57},
-   {"foresters_house", 31, 53},
-   {"foresters_house", 32, 46},
-   {"foresters_house", 32, 50},
-   {"foresters_house", 34, 50},
-   {"sawmill", 41, 46},
-   {"quarry",  45, 54},
-   {"tower", 43, 52},
-   {"tower", 35, 46},
-   {"guardhouse", 49, 60},
-   {"crystalmine", 51, 61},
-   {"guardhall", 43, 64},
-   {"fish_breeders_house", 40, 66},
-   {"fishers_house", 42, 66},
-   {"fish_breeders_house", 44, 66},
-   {"fishers_house", 46, 66},
-   {"fish_breeders_house", 48, 66},
-   {"castle", 22, 55},
-   {"coalmine", 22, 48},
-   {"coalmine", 16, 49},
-   {"farm", 20, 59},
-   {"farm", 23, 59},
-   {"farm", 19, 64},
-   {"farm", 21, 65},
-   {"farm", 26, 64},
-   {"blackroot_farm", 53, 53},
-   {"blackroot_farm", 56, 50},
-   {"mill", 34, 58},
-   {"mill", 32, 64},
-   {"bakery", 38, 49},
-   {"bakery", 40, 48},
-   {"smokery", 46, 57},
-   {"smokery", 44, 57},
-   {"horsefarm", 40, 55},
-   {"spiderfarm", 37, 45},
-   {"weaving-mill", 45, 45},
-   {"smelting_works", 35, 56, wares = {coal = 8, ironore = 8}}, -- no gold
-   {"smelting_works", 35, 59, wares = {coal = 8, ironore = 8}},
-   {"toolsmithy", 41, 52},
-   {"weaponsmithy", 37, 54},
-   {"small_tower", 34, 63},
-   {"tower", 52, 46},
-   {"well", 39, 43},
-   {"well", 39, 45},
-   {"well", 38, 55},
-   {"well", 35, 61},
-   {"well", 32, 59},
-   {"warehouse", 36, 57},
+   {"atlanteans_woodcutters_house", 32, 48},
+   {"atlanteans_woodcutters_house", 33, 47},
+   {"atlanteans_woodcutters_house", 29, 56},
+   {"atlanteans_woodcutters_house", 30, 57},
+   {"atlanteans_foresters_house", 31, 53},
+   {"atlanteans_foresters_house", 32, 46},
+   {"atlanteans_foresters_house", 32, 50},
+   {"atlanteans_foresters_house", 34, 50},
+   {"atlanteans_sawmill", 41, 46},
+   {"atlanteans_quarry",  45, 54},
+   {"atlanteans_tower", 43, 52},
+   {"atlanteans_tower", 35, 46},
+   {"atlanteans_guardhouse", 49, 60},
+   {"atlanteans_crystalmine", 51, 61},
+   {"atlanteans_guardhall", 43, 64},
+   {"atlanteans_fishbreeders_house", 40, 66},
+   {"atlanteans_fishers_house", 42, 66},
+   {"atlanteans_fishbreeders_house", 44, 66},
+   {"atlanteans_fishers_house", 46, 66},
+   {"atlanteans_fishbreeders_house", 48, 66},
+   {"atlanteans_castle", 22, 55},
+   {"atlanteans_coalmine", 22, 48},
+   {"atlanteans_coalmine", 16, 49},
+   {"atlanteans_farm", 20, 59},
+   {"atlanteans_farm", 23, 59},
+   {"atlanteans_farm", 19, 64},
+   {"atlanteans_farm", 21, 65},
+   {"atlanteans_farm", 26, 64},
+   {"atlanteans_blackroot_farm", 53, 53},
+   {"atlanteans_blackroot_farm", 56, 50},
+   {"atlanteans_mill", 34, 58},
+   {"atlanteans_mill", 32, 64},
+   {"atlanteans_bakery", 38, 49},
+   {"atlanteans_bakery", 40, 48},
+   {"atlanteans_smokery", 46, 57},
+   {"atlanteans_smokery", 44, 57},
+   {"atlanteans_horsefarm", 40, 55},
+   {"atlanteans_spiderfarm", 37, 45},
+   {"atlanteans_weaving_mill", 45, 45},
+   {"atlanteans_smelting_works", 35, 56, wares = {coal = 8, iron_ore = 8}}, -- no gold
+   {"atlanteans_smelting_works", 35, 59, wares = {coal = 8, iron_ore = 8}},
+   {"atlanteans_toolsmithy", 41, 52},
+   {"atlanteans_weaponsmithy", 37, 54},
+   {"atlanteans_tower_small", 34, 63},
+   {"atlanteans_tower", 52, 46},
+   {"atlanteans_well", 39, 43},
+   {"atlanteans_well", 39, 45},
+   {"atlanteans_well", 38, 55},
+   {"atlanteans_well", 35, 61},
+   {"atlanteans_well", 32, 59},
+   {"atlanteans_warehouse", 36, 57},
 
    -- everthing below is in the north
-   {"castle", castle_field.x, castle_field.y},
-   {"warehouse", 37, 16,
+   {"atlanteans_castle", castle_field.x, castle_field.y},
+   {"atlanteans_warehouse", 37, 16,
       wares = {
-         smoked_meat = 50,
-         smoked_fish = 150,
-         bread = 200,
+         atlanteans_bread = 200,
+         diamond = 3,
+         gold = 2,
+         granite = 10,
+         hammer = 1,
          log = 30,
          planks = 30,
-         stone = 10,
-         diamond = 3,
          quartz = 4,
+         smoked_fish = 150,
+         smoked_meat = 50,
          spidercloth = 14,
-         gold = 2,
-         hammer = 1
       },
       workers = {
-         builder = 3,
-         miner = 3
+         atlanteans_builder = 3,
+         atlanteans_miner = 3
       },
       soldiers = {
          [{0,0,0,0}] = 10,
       }
    }, -- end of warehouse on northern peninsula
-   {"goldmine", 32, 25}
+   {"atlanteans_goldmine", 32, 25}
    )
 
-   plr:forbid_buildings{"shipyard"}
+   plr:forbid_buildings{"atlanteans_shipyard"}
 
    connected_road(plr,map:get_field(42,44).immovable,"bl,br,bl|bl,bl|bl,l|l,bl|l,l,l|l,l|tr,tl|r,tr")
    connected_road(plr,map:get_field(42,44).immovable,"br,r|br,r,r|r,r,tr|r,r|r,r|br,bl|br,br|br,br|r,r")
@@ -161,4 +161,3 @@
 end
 
 run(init_player)
-

=== modified file 'campaigns/tutorial03_seafaring.wmf/scripting/texts.lua'
--- campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2015-05-31 13:45:13 +0000
+++ campaigns/tutorial03_seafaring.wmf/scripting/texts.lua	2015-11-03 18:26:36 +0000
@@ -1,193 +1,192 @@
--- =======================================================================
---                      Texts for the tutorial mission
--- =======================================================================
-
--- =========================
--- Some formating functions
--- =========================
-
-include "scripting/formatting.lua"
-include "scripting/format_scenario.lua"
-
-
--- =============
--- Texts below
--- =============
-
-intro_south = {
-   position = "topright",
-   field = sf,
-   title = _"Seafaring",
-   body = rt(
-      h1(_"Seafaring Tutorial") ..
-      p(_[[Welcome back. In this tutorial, you are going to learn the most important things about seafaring, that is ships, ports, and expedition.]]) ..
-      p(_[[But let me first give you an overview about your territory: here in the south, you have a whole economy with almost everything you need.]])
-   ),
-   h = 250
-}
-
-intro_north = {
-   position = "topright",
-   field = castle_field,
-   title = _"The Northern Part",
-   body = rt(
-      p(_[[Here in the northern part, you only have a goldmine and a warehouse. While the miners are supplied well with food, there is no way to transport the gold ore to our smelting works in the southern part.]]) ..
-      p(_[[We have tried to build a road, but the mountain is too wide and too steep. We therefore have only one possibility: we need to establish a sea lane between these two parts.]]) ..
-      p(_[[But I don’t want to rush you: you have just arrived here and you would probably like to have a closer look at your camp. I will also take a short break and be back soon.]])
-   ),
-   h = 350
-}
-
-tell_about_port = {
-   position = "topright",
-   title = _"Ports",
-   body = rt(
-      h1(_"Ports") ..
-      p(_[[For everything you do on the high seas, you need a port at the shore. Ports are like headquarters: they can store wares, workers and soldiers. The soldiers inside will automatically come out when an enemy attacks the port.]]) ..
-      p(_[[Additionally, ports offer the possibility of transporting wares via ships. When you click on the port you already have, you will notice two additional tabs: wares and workers in the dock. They are waiting for a ship to transport them to another port. Currently, there are none because we have not yet built a second port. So let’s change this!]])
-   ),
-   h = 350
-}
-
-tell_about_port_building = {
-   position = "topright",
-   field = second_port_field,
-   title = _"Building ports",
-   body = rt(
-      h1(_"How to build a port") ..
-      p(_[[Ports are big buildings, but they can only be built at special locations: those marked with the]])
-   ) ..
-   rt("image=pics/port.png", p(_[[blue port space icon.]])) ..
-   rt(
-      p(_[[Port spaces are set by the map designer, so a map will either contain them or not. They might, however, be hidden under trees or be blocked by surrounding buildings.]]) ..
-      p(_[[You might already have noticed that you have such an icon next to your castle.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a port in the northern part of your camp.]])
-   ),
-   obj_name = "build_port",
-   obj_title = _"Build a port in the northern part of your camp.",
-   obj_body = rt(
-      h1(_"Build a port") ..
-      p(_[[You always need a port when you want to transport wares with a ship.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a port next to your castle, on the blue port space icon.]]) ..
-      listitem_arrow(_[[Ports are built like normal buildings, but are only available on blue port spaces. Just click on a field with the icon and the building menu automatically offers you to build a port.]]) ..
-      listitem_arrow(_[[Although ports act as warehouses, you should not build more than necessary: they cost quartz, diamonds and gold, which makes them quite expensive.]])
-   ),
-}
-
-tell_about_shipyard = {
-   position = "topright",
-   title = _"Constructing ships",
-   body = rt(
-      h1(_"Let’s build ships") ..
-      p(_[[Great. Your port has just been finished. Now we need some ships.]]) ..
-      p(_[[Ships are constructed in a shipyard by a shipwright. We have to build one somewhere close to the shore.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the coast. It is a medium building.]])
-   ),
-   h = 300,
-   obj_name = "build_shipyard",
-   obj_title = _"Build a shipyard",
-   obj_body = rt(
-      h1(_"Build a shipyard") ..
-      p(_[[Ships are produced in a shipyard.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Build a shipyard close to the shore of the southern part of your territory.]]) ..
-      listitem_arrow(_[[The shipyard is a medium building. Although it can be built everywhere on the map, the shipwright only works when he is close to the water and there are no trees or roads at the shoreline.]])
-   ),
-}
-
-tell_about_ships = {
-   position = "topright",
-   title = _"Constructing ships",
-   body = rt(
-      h1(_"Waiting for the ships") ..
-      p(_[[Very good. Your shipyard is finished and your shipwright immediately started working. For the construction of ships, he needs logs, planks and spidercloth, which will be transported to the shipyard.]] .. " " ..
-		_[[The shipwright will take the ware he needs to a free spot at the shoreline and build a ship there. When the first ship is finished, it will launch onto the sea, and the shipwright will construct another one.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[We should wait until we have two ships. That should be enough for now.]]) ..
-      listitem_arrow(_[[You need to stop your shipyard when you have enough ships. Otherwise, your shipwright will consume all your logs and spidercloth, producing dozens of ships.]])
-   ) ..
-   rt("image=pics/stop.png",p(_[[This is the icon for stopping production. You will find it in the building window.]])),
-   obj_name = "wait_for_ships",
-   obj_title = _"Construct two ships",
-   obj_body = rt(
-      p(_[[Ships are constructed automatically when the shipyard is complete and the needed wares have been delivered.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Wait until the shipwright has constructed two ships.]]) ..
-      listitem_arrow(_[[Do not forget to stop your shipyard when you have enough ships.]])
-   )
-}
-
-expedition1 = {
-   position = "topright",
-   title = _"No Iron",
-   body = rt(
-      h1(_"We lack iron") ..
-      p(_[[The second ship might not be finished yet, but we have an urgent problem.]]) ..
-      p(_[[As you surely have already noticed, there is no iron in the mountain in the west. We have plenty of coal and gold ore, but without iron ore, we cannot produce any tools.]]) ..
-      p(_[[Although it might take long and be expensive and not without dangers – who knows what monsters live in the sea? – I see no other possibility: we will have to undertake an expedition to the unknown seas.]])
-   ),
-   h = 300
-}
-
-expedition2 = {
-   position = "topright",
-   -- TRANSLATORS: This shall be the beginning of a poem
-   title = _"A trip by the sea, what fun it can be",
-   body = rt(
-      h1(_"Expeditions") ..
-      p(_[[During an expedition, you send a ship out to discover new islands and maybe found a colony there.]])
-   ) ..
-   rt("image=pics/start_expedition.png",p(_[[Expeditions can be started in every port. Then, all needed wares are transported to that port. The wares are exactly those your tribe needs to build a port (your goal is to build a port far away from home, so this is not surprising), and of course you need a builder, too. When everything is prepared, a ship will come and pick it up.]] .. " " ..
-		_[[You can check out the needed wares in the fifth tab of your port (it will appear when you’ve started an expedition).]]) ..
-      p(_[[Now try this out. I will tell you later what the next steps are.]]) ..
-      paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition in any of your ports.]])
-   ),
-   obj_name = "start_expedition",
-   obj_title = _"Start an expedition",
-   obj_body = rt(
-      paragraphdivider() ..
-      listitem_bullet(_[[Start an expedition.]])
-   ) ..
-   rt("image=pics/start_expedition.png",p(_[[To do so, click on the ‘Start Expedition’ button in any port. A new tab where you can see the needed wares will appear.]])
-   )
-}
-
-expedition3 = {
-   position = "topright",
-   title = _"Off to greener pastures",
-   body = rt(
-      h1(_"Start your expedition") ..
-		p(_[[Your expedition ship is ready. It is waiting for your orders in front of your port. It isn’t transporting wares anymore. Use its buttons to send your ship in any of the six main directions of the Widelands map. When it has reached a coastline, you can make it travel around the coast, where it will look for suitable places for landing.]] .. " " ..
-		_[[Once a port space has been found, you can construct a new port with the button in the center of the ship’s control window.]]) ..
-      p(_[[The wares will then be unloaded, and the ship will take up the task of transporting wares once again. The builder will start his work and build a port.]]) ..