Merge lp:~sirver/widelands/tutorial_mission into lp:widelands

[SirVer]

This is not really a merge request, as an earlier version of this tutorial was already merged together with the ui scripting capabilities, so this will also be merged eventually. I want to try out if making a merge request will help in getting feedback for the mission to further improve on it.

Please, play the mission and give me some feedback (especially positive to keep me motivated :P).

@chuck and other native speakers: I am especially looking forward to english language improvement. Feel free to reformulate whatever you seem unfitting, as long as the sense stays around, I am happy with improvements to the grammar and the words.

Changes:
To tutorial:
* made tutorial more robust against bad user input
  - by allowing user input to be completely suppressed
  - by adding a coroutine that rips everything the user builds when he shouldn't build anything.
* typo and grammatical fixes
* added infos about census & statistics
* added a chapter about resources & mining
* added infos about the mini map
* added a chapter about soldiers, training and warfare
* added mission objectives

To code:
* minimal Lua wrappings for constructionsites
* new functions to suppress user input processing in the UI
* new property fields in base immovables that offers the reverse mapping from Field.immovable

[Chuck Wilder (chuckw20)]

spellchecking

I reviewed the campaigns folder and found a number of instances that require spelling, grammatical and/or wording changes.

These I have applied and can be found in the following branch:
        ~chuckw20/widelands/tutorial_mission_edit

review: Needs Fixing (playtesting, spellchecking)

[SirVer (sirver)]

I didn't get much feedback for the scenario, so I guess this could count as a failed experiment. I merged this now, so I guess feedback will come from players.

[Kiscsirke (csirkeee)]

I did try it, and played it through, I just didn't have any problems :)

András

On 3 May 2010 11:39, SirVer <email address hidden> wrote:
> I didn't get much feedback for the scenario, so I guess this could count as a failed experiment. I merged this now, so I guess feedback will come from players.
> --
> https://code.launchpad.net/~sirver/widelands/tutorial_mission/+merge/24444
> You are subscribed to branch lp:widelands.
>

=== modified file 'campaigns/cconfig' (properties changed: -x to +x)
--- campaigns/cconfig	2010-04-21 17:45:21 +0000
+++ campaigns/cconfig	2010-04-30 14:39:36 +0000
@@ -24,13 +24,13 @@
 campname0=_"(Tutorial) Barbarians - The second Empire"
 campsect0=barbariantut
 campdiff0=1
-campdesc0=_"When Chat’Karuth died, he was an old man, father to three strong and ambitious sons and warlord to an army that could match any enemy willing to rise against the ancient forests. Though his glorious reign, Chat’Karuth left his eldest son Thron in the due to succeed him as the tribes warlord – a decision that left his two brothers unsatisfied. The old warlord knew that. As his father told him, Thron left the capital of Al’thunran, the home of the throne among the trees and redrew his forces to the high hills where he buried the corpse of his father and swore to the gods and his spirit, that he’d return to re-established order. While his brothers raged in blind war against Thron and the few forces he left to secure the borders of Al’thunran, the young warlord seeks to reunite his ambitious brothers and force the tribes to march once again under a common banner."
+campdesc0=_"When Chat’Karuth died, he was an old man, father to three strong and ambitious sons and warlord to an army that could match any enemy willing to rise against the ancient forests. Though at the end of his glorious reign, Chat’Karuth left his eldest son, Thron, to succeed him as the tribe's warlord – a decision that left his two brothers unsatisfied. The old warlord knew that. As his father instructed him, Thron left the capital of Al’thunran, the home of the Throne Among the Trees and withdrew his forces to the high hills where he buried the corpse of his father. There he swore to the gods and his father's spirit that he’d return to re-established order. While his brothers raged in blind war against Thron and the few forces he left to secure the borders of Al’thunran, the young warlord seeks to reunite his ambitious brothers and force the tribes to march once again under a common banner."
 campvisi0=1
 # Empire Campaign
 campname1=_"Empire - The months of exile"
 campsect1=empiretut
 campdiff1=2
-campdesc1=_"Six months ago, Lutius - a young general of the Empire - was send with 150 soldiers to the frontier beyond the northern forests where Barbarian-tribes and official Empire-land are crossing. His task was to defend the Empire-land. At first, everything was calm. He even talked to a few barbarian children and thought about a peaceful life - side by side with this archaic folk. He began to feel safer and his army began to drop their attention off the potential enemy. That was their fault. At one night in march his unprepared army was attacked by 100 barbarian footmen and was completely scattered. Only with his bare life he and a handful of his soldiers survived."
+campdesc1=_"Six months ago, Lutius - a young general of the Empire - was sent with 150 soldiers to the frontier beyond the northern forests where Barbarian tribes were crossing onto land held by the Empire. His task was to defend the Empire's land. At first, everything was calm. He even talked to a few barbarian children and thought about a peaceful life - side by side with this archaic folk. He began to feel safer and his army began to drop their attention off the potential enemy. That was their undoing. One night in March his unprepared army was attacked by 100 barbarian footmen and was completely scattered. Only with his bare life he and a handful of his soldiers survived."
 campvisi1=0
 # Atlantean Campaign
 campname2=_"Atlanteans - the new rise"

=== modified file 'campaigns/emp01.wmf/scripting/texts.lua' (properties changed: -x to +x)
--- campaigns/emp01.wmf/scripting/texts.lua	2010-04-18 06:46:20 +0000
+++ campaigns/emp01.wmf/scripting/texts.lua	2010-04-30 14:39:36 +0000
@@ -35,7 +35,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
    _"Diary of Lutius" ..
    "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Finally, the Gods were with us!<br> We landed on an unknown coast and found peaceful rest under the palm trees growing at the strand. But that is about as good as it gets. The truth is:<br> when I woke up this morning, I saw nothing more than sand around us.<br> It really seems as if we landed under the only palm trees existing in this far-away sandy desert. I fear we won't find the help we need to get our ship repaired in good time." ]] ..
+   _[[ "Finally, the Gods were with us!<br> We landed on an unknown coast and found peaceful rest under the palm trees growing at the shore. But that is about as good as it gets. The truth is:<br> when I woke up this morning, I saw nothing more than sand around us.<br> It really seems as if we landed under the only palm trees existing in this far-away sandy desert. I fear we won't find the help we need to get our ship repaired in good time." ]] ..
    "</p></rt>",
    width=400,
    height=350,
@@ -47,7 +47,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8F9131>" ..
    _"Saledus looks around nervously..." ..
    "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Sire, I fear we are not safe in this foreign land. Who knows what terrible creatures live beyond this forest, in that mighty desert? What if these creatures enter the woods and await the time to attack us?<br> Well, perhaps my fear is misguided, but it can't be wrong to keep watch in the forests - so that we can be sure to see any potential enemies before they can see us.<br> We really should build a barracks in the eastern portion of the forest. Than one of us will keep watch in the darkness and keep us safe from these creatures."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+   _[[ "Sire, I fear we are not safe in this foreign land. Who knows what terrible creatures live beyond this forest, in that mighty desert? What if these creatures enter the woods and await the time to attack us?<br> Well, perhaps my fear is misguided, but it can't be wrong to keep watch in the forests - so that we can be sure to see any potential enemies before they can see us.<br> We really should build a barracks in the eastern portion of the forest. Then one of us can keep watch in the darkness and keep us safe from these creatures."<br><br>-- NEW OBJECTIVE --<br> ]] ..
    _"* Build a barracks at the red point on the east side of the forests, to the right of your headquarters." ..
    "</p></rt>",
    width=400,
@@ -87,7 +87,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=AF7511>" ..
    _"Amalea recommends..." ..
    "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey Lutius, I got the message that our first lumberjack started his work today. Perhaps it would be a good idea to wait until he cleans enough space for building up two further lumberjack's houses, so that we can faster harvest the trunks.<br> But unfortunately the trunks are useless for repairing our ship - we need refined wood, like every ship and every bigger building needs, too. So we should build up a sawmill - as soon as we have enough space for this."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+   _[[ "Hey Lutius, I got the message that our first lumberjack started his work today. Perhaps it would be a good idea to wait until he cleans enough space for building up two further lumberjack's houses, so that we can harvest the trunks faster.<br> But unfortunately the trunks are useless for repairing our ship - we need refined lumber, like every ship and every bigger building needs, too. So we should build up a sawmill - as soon as we have enough space for this."<br><br>-- NEW OBJECTIVE --<br> ]] ..
    _"* Build two more lumberjack's houses and a sawmill as soon as there is enough space for them." ..
    "</p></rt>",
    width=400,
@@ -99,7 +99,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=AF7511>" ..
    _"Amalea comes in..." ..
    "</p></rt><rt image=map:Amalea.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hi Lutius, I've got two important things to talk about... First the good news:<br> I saw that the construction of the sawmill is complete, so we can begin to refine the trunks the lumberjacks are harvesting to wood.<br> But that's just about the only positive thing I know to talk about. The bad news is that our lumberjacks harvest at an unbelievable speed. There are almost no trees left on this island.<br> Lutius, these trees provide shelter from the sandstorms from the desert, shade on the hot days and they are the home of so many gentle animals. We shouldn't leave this island a complete desert.<br> Lutius, I beg you: find someone who takes care about planting new trees."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+   _[[ "Hi Lutius, I've got two important things to talk about... First the good news:<br> I saw that the construction of the sawmill is complete, so we can begin to refine the trunks that the lumberjacks are harvesting into lumber.<br> But that's just about the only positive thing I know to talk about. The bad news is that our lumberjacks harvest at an unbelievable speed. There are almost no trees left on this island.<br> Lutius, these trees provide shelter from the sandstorms from the desert, shade on the hot days and they are the home of so many gentle animals. We shouldn't leave this island a complete desert.<br> Lutius, I beg you: find someone who takes care about planting new trees."<br><br>-- NEW OBJECTIVE --<br> ]] ..
    _"* Build a forester's house to preserve the wood resources of this island." ..
    "</p></rt>",
    width=400,
@@ -111,7 +111,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8F9131>" ..
    _"Saledus notes..." ..
    "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-   _[[ "Hey, my good old friend. I just thought about the rocks standing on the south strand of this land. Perhaps we could cut out some useful hard stones and beautiful marble.<br> The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+   _[[ "Hey, my good old friend. I just thought about the rocks standing on the south shore of this land. Perhaps we could cut out some useful hard stones and beautiful marble.<br> The repair of our ship will take a few weeks, anyway, and the resources we harvest now might be the base of strong and big buildings in another land."<br><br>-- NEW OBJECTIVE --<br> ]] ..
    _"* Build a quarry in the south to cut some stones and marble out of the rocks.<br> These might be used for future buildings." ..
    "</p></rt>",
    width=400,

=== modified file 'campaigns/emp02.wmf/scripting/texts.lua' (properties changed: -x to +x)
--- campaigns/emp02.wmf/scripting/texts.lua	2010-03-14 11:16:54 +0000
+++ campaigns/emp02.wmf/scripting/texts.lua	2010-04-30 14:39:36 +0000
@@ -66,7 +66,7 @@
    title =_"Destroy the barbarian tribe",
    body ="<rt><p>" ..
 _"* As soon as you have enough soldiers, attack and completely destroy the barbarian buildings.<br>" ..
-_"* Finally, build up a fortress on the peninsula<br> (near where the barbarian headquarters stood befre), to avoid new settlements of other tribes in that region." ..
+_"* Finally, build up a fortress on the peninsula<br> (near where the barbarian headquarters stood before), to avoid new settlements of other tribes in that region." ..
 "</p></rt>",
 }
 
@@ -132,7 +132,7 @@
    body="<rt><p font-size=24 text-align=left font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
 _"Diary of Lutius" ..
 "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Great, today the building of the quarry was completed. Now we get enough stone to construct larger buildings." ]] ..
+_[[ "Great! Today the building of the quarry was completed. Now we get enough stone to construct larger buildings." ]] ..
 "</p></rt>",
 }
 
@@ -144,7 +144,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8F9131>" ..
 _"Saledus looks unhappy" ..
 "</p></rt><rt image=map:Saledus.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "Greetings Lutius, I don't want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern strands I found the remains of another ship. I don't know whether these parts are all that is left of that ship. Inn any case: these parts do not seem to be old.<br> Perhaps the people aboard that ship were caught in the same storm which brought us to Malac' Mor - and were brought to this island.<br> I beg you to be cautious and to build some barracks or sentries around our colony."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+_[[ "Greetings Lutius, I don't want to start a panic, but I found something which gives me a sinking feeling in my stomach and spreads waves of fear in my heart. As I walked down to the southern shore I found the remains of another ship. I don't know whether these parts are all that is left of that ship. In any case, these parts do not seem to be old.<br> Perhaps the people aboard that ship were caught in the same storm which brought us to Malac' Mor - and were brought to this island.<br> I beg you to be cautious and to build some barracks or sentries around our colony."<br><br>-- NEW OBJECTIVE --<br> ]] ..
 _"* Build some barracks and sentries around the colony." ..
 "</p></rt>",
 }
@@ -193,7 +193,7 @@
    body="<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
 _"Diary of Lutius" ..
 "</p></rt><rt image=map:Lutius.png><p line-spacing=3 font-size=12><br>" ..
-_[[ "By the Gods! This is absolutely terrible. It seems as if we stand close to a test - and it seems as if Saledus was right with his fear concerning the shipwreck he found.<br> Today, as I walked down to the eastern strands,<br> I got a shock. I caught sight of one of those hated, evil, barbarian tribes with whom we have had so many problems before.<br> At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods that<br> I was able to flee and hide myself, before retreating back to our colony under cover of darkness.<br> Anyway, we must build up stronger military buildings as soon as possible."<br><br>-- NEW OBJECTIVE --<br> ]] ..
+_[[ "By the Gods! This is absolutely terrible. It seems as if we stand close to a test - and it seems as if Saledus was right with his fear concerning the shipwreck he found.<br> Today, as I walked down to the eastern shore,<br> I got a shock. I caught sight of one of those hated, evil, barbarian tribes with whom we have had so many problems before.<br> At first, I was naive and hoped that they were peaceful, but as soon as one of them saw me they charged towards me and started attacking me with their throwing-spears. Thanks be to the Gods that<br> I was able to flee and hide myself, before retreating back to our colony under cover of darkness.<br> Anyway, we must build up stronger military buildings as soon as possible."<br><br>-- NEW OBJECTIVE --<br> ]] ..
 _"* Build up stronger military buildings, such as an outpost, a barrier or a tower, on the eastern frontier. To watch deep inside the enemy territory, build a tower." ..
 "</p></rt>",
 }

=== modified file 'campaigns/t01.wmf/scripting/initial_messages.lua' (properties changed: -x to +x)
--- campaigns/t01.wmf/scripting/initial_messages.lua	2010-03-19 09:54:23 +0000
+++ campaigns/t01.wmf/scripting/initial_messages.lua	2010-04-30 14:39:36 +0000
@@ -19,7 +19,7 @@
 show_story_box(title, msg, al_thunran)
 
 msg = "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "My father's bones rest peacefully in the grounds he cleared from the senseless bloodspilling that has once risen among us.<br> Boldreth, my loyal companion and friend is a source of peace and comfort to me in these dark times. He keeps my spirits high and those of my warriors awake, not to let greed or despair destroy the bonds between us as well." ]] ..
+_[[ "My father's bones rest peacefully in the grounds on which he once ended the senseless bloodspilling that has risen among us. It pains me that his peace only endured for one generation.<br> Boldreth, my loyal companion and friend is a source of peace and comfort to me in these dark times. He keeps my spirits high and those of my warriors awake, not to let greed or despair destroy the bonds between us as well." ]] ..
 "</p></rt>"
 show_story_box(title, msg, grave)
 

=== modified file 'campaigns/t01.wmf/scripting/khantrukhs_talking.lua' (properties changed: -x to +x)
--- campaigns/t01.wmf/scripting/khantrukhs_talking.lua	2010-03-13 20:20:27 +0000
+++ campaigns/t01.wmf/scripting/khantrukhs_talking.lua	2010-04-30 14:39:36 +0000
@@ -22,7 +22,7 @@
 end
 
 function tutorial_thread()
-   show_story_box(_"Somebody comes upon to you", khantrukh_1)
+   show_story_box(_"Somebody comes up to you", khantrukh_1)
    show_story_box(_"The advisor", khantrukh_2, nil, 80, 80)
    o = start_lumberjack_01(p)
    -- Wait till the hut is build.

=== modified file 'campaigns/t01.wmf/scripting/texts.lua' (properties changed: -x to +x)
--- campaigns/t01.wmf/scripting/texts.lua	2010-04-18 16:36:26 +0000
+++ campaigns/t01.wmf/scripting/texts.lua	2010-04-30 14:39:36 +0000
@@ -8,7 +8,7 @@
 "<rt><p>" ..
 _"* Press SPACE to see where you can build.<br> The red house symbols show you where a small building - like a lumberjack's hut - may be built.<br>" ..
 _"* Build a lumberjack's hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack's hut.<br>" ..
-_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicats how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farer away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
+_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farther away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
 "</p></rt>")
 end
 
@@ -16,7 +16,7 @@
    return p:add_objective("lumberjack02",
      _ "Build another lumberjack's hut",
      "<rt><p>" ..
-_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When much wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
+_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
 _"* Place a lumberjack's hut just south of the flag you just placed on the road. Connect the flag you just raised with the flag of the new lumberjack's hut construction site afterwards.<br> Note that instead of building a road step by step, you may also click directly at its destination to build the entire road at once." ..
 "</p></rt>")
 end
@@ -48,7 +48,7 @@
 khantrukh_2= "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8080FF>" ..
 _"Khantrukh continues..." ..
 "</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
-_[[ "None but the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...<br> We should prepare, in case we have to face the winter in these harsh lands. I believe to the east of our campside are a few places where we could raise a lumberjack's hut."<br><br>-- NEW OBJECTIVES --<br> ]] .. 
+_[[ "None but the gods know how long we have to remain hidden here. The warriors hope we may march back gloriously any day now, but I strongly doubt that will happen soon. And the days are already getting shorter and colder...<br> We should prepare, in case we have to face the winter in these harsh lands. I believe to the east of our campsite are a few places where we could raise a lumberjack's hut."<br><br>-- NEW OBJECTIVES --<br> ]] .. 
 _"* Press SPACE to see where you can build.<br> The red house symbols show you where a small building - like a lumberjack's hut - may be built.<br>" ..
 _"* Build a lumberjack's hut at the red house symbol just right of your headquarters by clicking on it and selecting a lumberjack's hut.<br>" ..
 "</p></rt>" 
@@ -58,14 +58,14 @@
 _"The elder remarks..." ..
 "</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
 _[[ "Obviously, it would be too exhausting for our people to walk all the way to the lumberjack's hut through the wilderness. We will have to build a road between our hall and the lumberjack's hut. It's not a hard guess that the men would appreciate a way as short and plain as possible - the wood will surely be heavy enough, nevertheless."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicats how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farer away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
+_"* Build a road between your headquarters and the construction site of the lumberjack's hut.<br> When you place the lumberjack's hut, a flag is created for it. You need to connect it to another flag by building a road between them.<br> If you click on a flag and select to build a road, little symbols will appear around it to show you in which directions you can build it.<br> The colour of these symbols indicates how steep this part of the road will be. Green is for flat, yellow means steep and red stands for very steep. The steeper the road is, the harder it will be for your people to walk on it (and your wares will be transported more slowly).<br> You can click on any of the symbols to build the first part of the road there. New symbols will appear to show you where the next part of the road can go, and so on. However, you can also click farer away from the flag to build several steps at once. Click on the flag at the headquarters to finish the road." ..
 "</p></rt>"
 
 khantrukh_4 = "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8080FF>" ..
 _"Khantrukh remembers..." ..
 "</p></rt><rt image=map:khantrukh.png><p line-spacing=3 font-size=12>" ..
 _[[ "There is an old saying:<br> 'A burden divided is easier to endure.'<br> A crossroads on the way between our headquarters and the lumberjack's hut would ease the work of our carriers."<br><br>-- NEW OBJECTIVE --<br> ]] ..
-_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When much wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
+_"* Place a flag in the middle of the road.<br> There is a flag symbol in the middle of the way you just built. You create a flag there by clicking on the symbol and then choosing the flag button in the menu that opens up. This divides the way the wood is transported into two parts with one carrier each.<br> When many wares are being transported between two points, additional flags in between make them arrive at their destination faster, thus improving your infrastructure.<br>" ..
 "</p></rt>"
 
 khantrukh_5 = "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=8080FF>" ..

=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua' (properties changed: -x to +x)
--- campaigns/t02.wmf/scripting/mission_thread.lua	2010-04-25 13:59:43 +0000
+++ campaigns/t02.wmf/scripting/mission_thread.lua	2010-04-30 14:39:36 +0000
@@ -209,7 +209,7 @@
    This is a village of poor but friendly people who have settled in a safe
    valley between two glaciers. They hunt and produce timber and grain but they
    do not have ores or even stones, so they are dependent on the infrequent
-   merchant that may pass by and provide them with whatever they can not
+   merchant that may pass by and provide them with whatever they cannot
    produce on their own. Their only protection is a guard hut at each entrance
    to the valley. Therefore they realize that they may have to join a more
    powerful society for protection in order to stay alive in this world.

=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua' (properties changed: -x to +x)
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2010-03-13 22:33:12 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2010-04-30 14:39:36 +0000
@@ -9,7 +9,7 @@
 "<rt><p font-size=24 font-weight=bold font-face=FreeSerif font-color=2F9131>" ..
 _"Thron shakes his head..." ..
 "</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The war goes on. More and more of our brothers and sisters flee the brutal war raging in the capital beneath the trees.<br> The stories they tell about the deeds of our kin are sad to hear. I've spent nights lying awake, restless, more tired I ever believed one could be. Yet whenever I close my eyes, I see the fortress my father built consumed by flames. The throne between the trees, the symbol of unity and peace among our kin became the wedge that drives us apart." ]] ..
+_[[ "The war goes on. More and more of our brothers and sisters flee the brutal war raging in the capital beneath the trees.<br> The stories they tell about the deeds of our kin are sad to hear. I've spent nights lying awake, restless, more tired I ever believed one could be. Yet whenever I close my eyes, I see the fortress my father built consumed by flames. The Throne Among the Trees, the symbol of unity and peace among our kin, became the wedge that drives us apart." ]] ..
 "</p></rt>",
 }
 
@@ -18,7 +18,7 @@
    title =_ "The story continues",
    body = 
 "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_ [[ "Today my hunters brought men, women and little children who had hidden out in the forests, trying to escape the war, hate and revenge that rage among the tribes fighting each other like in old times, when we were no more but the wild beasts driven and controlled by instincts. None of my brothers will ever gain and hold control over the wooden throne, none of the tribes will be strong enough to subdue the other. There will be no end to this slaughtering, unless... is this it? As father told me?<br> Rise against whoever threatens our very existence, may it even be one of your blood or mind?" ]] ..
+_ [[ "Today my hunters brought men, women and little children who had hidden out in the forests, trying to escape the war, hate and revenge that rage among the tribes fighting each other like in old times, when we were no more but wild beasts driven and controlled by instincts. None of my brothers will ever gain and hold control over the wooden throne, none of the tribes will be strong enough to subdue the other. There will be no end to this slaughtering, unless... is this it? As father told me?<br> Rise against whoever threatens our very existence, may it even be one of your blood or mind?" ]] ..
 "</p></rt>",
 }
 

=== modified file 'campaigns/t03.wmf/scripting/texts.lua' (properties changed: -x to +x)
--- campaigns/t03.wmf/scripting/texts.lua	2010-04-25 18:33:38 +0000
+++ campaigns/t03.wmf/scripting/texts.lua	2010-04-30 14:39:36 +0000
@@ -126,7 +126,7 @@
    body= "<rt><p line-spacing=3 font-size=12>" ..
 _"* Destroy Kalitaths army and expand your territory to the east." ..
 "<br>" ..
-_"-> To attack an enemy you must click on the door of an advarse military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
+_"-> To attack an enemy you must click on the door of an adversary's military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
 "</p></rt>",
 }
 
@@ -148,7 +148,7 @@
 _"Thron looks worried..." ..
 "</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
 
-_[[ "The last days we came closer to our capital. Many people have already joined us on our march and set their hopes on me. However, I fear that we are not strong enough to take up the battle with my brothers.<br>For now we rest at the borders of the old forest and prepare for the coming days." ]] ..
+_[[ "These last days we came closer to our capital. Many people have already joined us on our march and set their hopes on me. However, I fear that we are not strong enough to take up the battle with my brothers.<br>For now we rest at the borders of the old forest and prepare for the coming days." ]] ..
 "</p></rt>",
 }
 
@@ -186,7 +186,7 @@
    body= "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
 _"Thron speaks confidently." ..
 "</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The frontier line of my forces has expanded to the edge of the forests. We have a long and cold winter and so many miles behind us. The fortification that we erected around Ondun will guarantee us fast supply of man and goods and once Al’thunran is in my hands, the two cities will be linked by a good and defendable infrastructure. Still I hope I will not walk alone on this mission, I hope Kailitat 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 defendable infrastructure. Still I hope I will not walk alone on this mission, I hope Kalitath son of Kun will follow my call." ]] ..
 "</p></rt>",
 }
 
@@ -194,7 +194,7 @@
    posy=1,
    title=_"The story continues",
    body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "I have sent men to meet Kalitath in this fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I wait won't be lost. I will further upgrade my soldiers and prepare for battle." ]] ..
+_[[ "I have sent men to meet with Kalitath in his fortress. He has barricaded the former main entrance to the capital and is trying to set up a siege ring around Al’thunran. He will not let anyone enter or leave the city while the ring is intact. Until now, he has not answered any of my messages. But the time I wait won't be lost. I will further upgrade my soldiers and prepare for battle." ]] ..
 "</p></rt>",
 }
 
@@ -203,13 +203,13 @@
    body= "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=FF0000>" ..
 _"Boldreth shouts out!" ..
 "</p></rt><rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "This BASTARD! Only one man of our frontier patrol came back alive. He carried a message of Kalitath telling us that he will punish every move of our troops with their own blood! We cannot accept this behaviour. From now on there is war between Kalitath and us!" ]] ..
+_[[ "This BASTARD! Only one man of our frontier patrol came back alive. He carried a message from Kalitath telling us that he will punish every move of our troops with their own blood! We cannot accept this behaviour. From now on there is war between Kalitath and us!" ]] ..
 "<br><br>" ..
 _"-- NEW OBJECTIVE --" ..
 "<br>" ..
-_"* Destroy Kalitaths army and expand your territory to the east." ..
+_"* Destroy Kalitath's army and expand your territory to the east." ..
 "<br>" ..
-_"-> To attack an enemy you must click on the door of an advarse military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
+_"-> To attack an enemy you must click on the door of an adversary's military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross ('start attack')" ..
 "</p></rt>",
 }
 
@@ -219,7 +219,7 @@
    body= "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
 _"Thron speaks:" ..
 "</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "The traitor has left his armies dying where they lay as he saw that he would not keep my forces back. Kalitath disappeared in the mess of the war, but I don’t care now. Shall he flee and be forgotten for all times as a tribeleader that would not bow before the wooden throne, that is mine to take now. Even more his flight brought us a big benefit: All year Kalitath was to busy fighting so that he did not even care to store enough food for all his men. Now that he fled the hunger brought some of his younger followers to desert. This group helds a strong fortification on the main ring. But there is more news: My scouts reported, that the two raging tribes of my brothers are in chaos and have barely noticed the new danger that is about to strike them. However they would not care if they noticed I guess, blinded by rage and hate, there is no sense left in them at all I believe." ]] ..
+_[[ "The traitor has left his armies dying where they lay as he saw that he would not keep my forces back. Kalitath disappeared in the mess of the war, but I don’t care now. Shall he flee and be forgotten for all times as a tribeleader that would not bow before the wooden throne, that is mine to take now. Even more his flight brought us a big benefit: All year Kalitath was so busy fighting that he did not even care to store enough food for all his men. Now that he has fled, their hunger has brought some of his younger followers to desert. This group holds a strong fortification on the main ring. But there is more news: My scouts reported, that the two raging tribes of my brothers are in chaos and have barely noticed the new danger that is about to strike them. However they would not care if they noticed I guess, blinded by rage and hate, there is no sense left in them at all I believe." ]] ..
 "</p></rt>",
 }
 
@@ -229,7 +229,7 @@
    body= "<rt><p font-size=24 font-weight=bold font-face=FreeSerif font-color=2F9131>" ..
 _"Boldreth speaks:" ..
 "</p></rt><rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "This morning I found Thron trouble-minded. He returned from his patrol late last night and sat back against a tree watching over the encampment. The number of quarrels and disputes keeps growing and the winter has us firmly under control. We should put food in our storage to survive the long, cold winter!" ]] ..
+_[[ "This morning I found Thron trouble-minded. He returned from his patrol late last night and sat back against a tree watching over the encampment. The number of quarrels and disputes keeps growing and the winter has us firmly in its grip. We should put food in our storage to survive the long, cold winter!" ]] ..
 "</p></rt>",
 }
 
@@ -259,7 +259,7 @@
    posy=1,
    title=_"Tracks",
    body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-   _[[ "Thron told me that he discovered tracks in the snow to the northeast of our settlement. He instructed us to build a Donjon, to have a further visual range on the area around our hall to protect our people from sudden attacks." ]] ..
+   _[[ "Thron told me that he discovered tracks in the snow to the northeast of our settlement. He instructed us to build a Donjon, to have a greater visual range on the area around our hall to protect our people from sudden attacks." ]] ..
    "<br><br>" ..
 _"-- NEW OBJECTIVE --" ..
 "<br>" ..
@@ -271,7 +271,7 @@
    posy=1,
    title=_"Further explorations",
    body= "<rt image=map:boldreth.png><p line-spacing=3 font-size=12>" ..
-_[[ "The first fortification Thron ordered has just been completed. At the moment he seeks to bring trust and belief to those who live inside the walls of our new habitat, that we named 'Ondun', which means 'those who wait' in the old tongue. But Thron is not yet satisfied - and I fully understand his fears: The forests are deep and the frontier to Al’thunran is near. I am sure that there are thousand bigger dangers out there than the unknown tracks.<br>To overlook more of the area around our hall we should explore further and set up more guards and scouts to observe the frontier and keep an eye on the raging wars on our doorsteps. THEN we will be prepared once trouble seeks to capture our woods." ]] ..
+_[[ "The first fortification Thron ordered has just been completed. At the moment he seeks to bring trust and belief to those who live inside the walls of our new habitat, that we named 'Ondun', which means 'those who wait' in the old tongue. But Thron is not yet satisfied - and I fully understand his fears: The forests are deep and the frontier to Al’thunran is near. I am sure that there are a thousand greater dangers out there than the unknown tracks.<br>To overlook more of the area around our hall we should explore further and set up more guards and scouts to observe the frontier and keep an eye on the raging wars on our doorsteps. THEN we will be prepared once trouble seeks to capture our woods." ]] ..
 "<br><br>" ..
 _"-- NEW OBJECTIVE --" ..
 "<br>" ..
@@ -295,7 +295,7 @@
    posy=1,
    title=_"Mining economy completed",
    body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "I just got informed, that our mining economy started its work. These news brought a smile on my face - even if the hardest part is still waiting to be done, now our smiths will give their best to further ease our lives." ]] ..
+_[[ "I just got informed, that our mining economy started its work. This news brought a smile to my face - even if the hardest part is still waiting to be done, now our smiths will give their best to further ease our lives." ]] ..
 "</p></rt>",
 }
 
@@ -345,7 +345,7 @@
    body= "<rt><p font-size=24 font-face=FreeSerif font-weight=bold font-color=2F9131>" ..
 _"Thron looks worried." ..
 "</p></rt><rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "My brothers and their soldiers are dead and left fire and destruction behind. In none of all the ruins I found any man or woman of the normal folk and so I just may hope that they fled from this cruel battleground and started a better life somewhere else. Nothing is left from that beauty I remember, only ruins remain from the old capital. I am sorrowful but also relieved. I never hoped to ever see Al'thunrans old beauty again - few months ago I even wondered whether I will ever be able to set my feet near to Al'thunran again. Now the old town is back in my hands and I will not hesitate to rebuild it with all forces my people have. I can't wait to see it again in it's old beauty." ]] ..
+_[[ "My brothers and their soldiers are dead and left fire and destruction behind. In none of all the ruins could I find any man or woman of the normal folk and so I just may hope that they fled from this cruel battleground and started a better life somewhere else. Nothing is left from that beauty I remember, only ruins remain from the old capital. I am sorrowful but also relieved. I never hoped to ever see Al'thunran's old beauty again - it was only a few months ago that I wondered whether I would ever be able to set my feet in Al'thunran again. Now the old town is back in my hands and I will not hesitate to rebuild it with all the strength my people have. I can't wait to see it again in it's old beauty." ]] ..
 "<br><br>" ..
 _"--------------------- VICTORY! ----------------------" ..
 "<br><br>" ..
@@ -357,7 +357,7 @@
    posy = 1,
    title=_"Military assault",
    body= "<rt image=map:chieftain.png><p line-spacing=3 font-size=12>" ..
-_[[ "So be it, the generals are out to set up my troops and Boldreth himself will lead the first strike. I will ride by his side, to free Al’thunran of this war and bring peace back in our capital. When the young sun rises above the trees tomorrow morning, I will order the assault. By dusk, I will celebrate my victory in the wooden halls of the warlord and sacrifice a newborn lamb in the honour of my father whose eyes lie upon me today.<br>So be it!" ]] ..
+_[[ "So be it, the generals are out to set up my troops and Boldreth himself will lead the first strike. I will ride by his side, to free Al’thunran of this war and bring peace back to our capital. When the young sun rises above the trees tomorrow morning, I will order the assault. By dusk, I will celebrate my victory in the wooden halls of the warlord and sacrifice a newborn lamb in the honour of my father whose eyes are set upon me today.<br>So be it!" ]] ..
 "<br><br>" ..
 _"-- NEW OBJECTIVE --" ..
 "<br>" ..

=== modified file 'campaigns/tutorial01.wmf/elemental'
--- campaigns/tutorial01.wmf/elemental	2010-04-17 11:18:54 +0000
+++ campaigns/tutorial01.wmf/elemental	2010-04-30 14:39:36 +0000
@@ -2,7 +2,7 @@
 packet_version=1
 map_w=64
 map_h=64
-nr_players=1
+nr_players=2
 world=greenland
 name=_"Tutorial01"
 author="Winterwind, SirVer, Nasenbaer"

=== modified file 'campaigns/tutorial01.wmf/player_names'
--- campaigns/tutorial01.wmf/player_names	2010-04-13 19:19:45 +0000
+++ campaigns/tutorial01.wmf/player_names	2010-04-30 14:39:36 +0000
@@ -4,3 +4,9 @@
 [player_1]
 name=Player 1
 tribe=barbarians
+
+[player_2]
+name=Sparing Partner
+tribe=empire
+ai="Defensive"
+

=== modified file 'campaigns/tutorial01.wmf/player_position'
--- campaigns/tutorial01.wmf/player_position	2010-04-13 19:19:45 +0000
+++ campaigns/tutorial01.wmf/player_position	2010-04-30 14:39:36 +0000
@@ -1,3 +1,5 @@
 [global]
 packet_version=2
 player_1=12 10
+player_2=50 10
+

=== modified file 'campaigns/tutorial01.wmf/scripting/init.lua'
--- campaigns/tutorial01.wmf/scripting/init.lua	2010-04-27 08:20:50 +0000
+++ campaigns/tutorial01.wmf/scripting/init.lua	2010-04-30 14:39:36 +0000
@@ -22,18 +22,58 @@
 -- Constants
 first_lumberjack_field = wl.map.Field(16,10)
 first_quarry_field = wl.map.Field(8,12)
-conquer_field = wl.map.Field(19,15)
+conquer_field = wl.map.Field(6,18)
+trainings_ground = wl.map.Field(33,57)
+
+-- Global variables
+registered_player_immovables = {}
+terminate_bad_boy_sentinel = false
+illegal_immovable_found = function(i) return false end
 
 use("map", "texts")
 
--- TODO: add objectives, there are none currently
-
 -- =================
 -- Helper functions 
 -- =================
+
+-- A small helper class to disable/enable autosaving and user interaction
+UserInputDisabler = {}
+function UserInputDisabler:new()
+   local rv = {}
+   setmetatable(rv, self)
+   self.__index = self
+
+   rv:establish_blocks()
+
+   return rv
+end
+function UserInputDisabler:establish_blocks()
+   self._ui_state = wl.ui.get_user_input_allowed()
+   self._as_state = wl.game.get_allow_autosaving()
+
+   wl.ui.set_user_input_allowed(false)
+   wl.game.set_allow_autosaving(false)
+end
+function UserInputDisabler:lift_blocks()
+   wl.ui.set_user_input_allowed(self._ui_state)
+   wl.game.set_allow_autosaving(self._as_state)
+end
+
+function _try_add_objective(i)
+   -- Add an objective that is defined in the table i to the players objectives.
+   -- Returns the new objective or nil. Does nothing if i does not specify an
+   -- objective.
+   local o = nil
+   if i.obj_name then
+      o = plr:add_objective(i.obj_name, i.obj_title, i.obj_body)
+   end
+   return o
+end
 function msg_box(i)
    wl.game.set_speed(1000)
 
+   local blocker = UserInputDisabler:new()
+
    if i.field then
       scroll_smoothly_to(i.field.trn.trn.trn.trn)
 
@@ -50,46 +90,267 @@
 
    plr:message_box(i.title, i.body, i)
 
+   blocker:lift_blocks()
+
+   local o = _try_add_objective(i)
+
    sleep(130)
+
+   return o
 end
 
 function send_message(i)
    plr:send_message(i.title, i.body, i)
 
+   local o = _try_add_objective(i)
    sleep(130)
+   return o
 end
    
-function click_on_field(f, g_T)
-   sleep(500)
+function click_on_field(f, g_T, g_sleeptime)
+   local sleeptime = g_sleeptime or 500
+
+   local blocker = UserInputDisabler:new()
+
    mouse_smoothly_to(f, g_T)
-   sleep(500)
+   sleep(sleeptime)
+
    wl.ui.MapView():click(f)
-   sleep(500)
-end
-
-function click_on_panel(panel, g_T)
-   sleep(500)
-   mouse_smoothly_to_panel(panel, g_T)
-   sleep(500)
-   if panel.press then panel:press() sleep(250) end
-   if panel.click then panel:click() end
-   sleep(500)
-end
-
--- ======
--- Logic 
--- ======
+   sleep(sleeptime)
+
+   blocker:lift_blocks()
+end
+
+function click_on_panel(panel, g_T, g_sleeptime)
+   local sleeptime = g_sleeptime or 500
+   
+   local blocker = UserInputDisabler:new()
+
+   sleep(sleeptime)
+   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
+
+   blocker:lift_blocks()
+end
+
+function warp_houses(descriptions)
+   local blocker = UserInputDisabler:new()
+
+   for idx, d in ipairs(descriptions) do 
+      local name, x, y = d[1], d[2], d[3]
+      mouse_smoothly_to(wl.map.Field(x, y))
+      sleep(300)
+      prefilled_buildings(plr, d)
+      sleep(300)
+   end
+
+   blocker:lift_blocks()
+end
+
+function build_road(field, ...)
+   -- Build a road by clicking the UI. A little faster than before
+   mouse_smoothly_to(field, 400, 200)
+
+   local function _start_road(field)
+      wl.ui.MapView():click(field)
+      click_on_panel(
+         wl.ui.MapView().windows.field_action.buttons.build_road, 100, 200
+      )
+   end
+
+   _start_road(field)
+
+   for idx, d in ipairs{...} do
+      if field.immovable and field.immovable.player ~= plr then
+         field.immovable:remove()
+      end
+      if d == '|' or d == '.' then
+         mouse_smoothly_to(field, 400, 200)
+         wl.ui.MapView():click(field)
+         if d == '|' then
+            wl.ui.MapView():click(field)
+            click_on_panel(
+               wl.ui.MapView().windows.field_action.buttons.build_flag, 100, 200
+            )
+            _start_road(field)
+         end
+      else
+         field = field[d .. 'n']
+      end
+   end
+end
+   
+function build_eastern_trainings_area()
+   -- Build some infrastructure as another example
+   local blocker = UserInputDisabler:new()
+
+   warp_houses{
+      {"fortress", 31, 63, soldiers = {[{3,5,0,2}] = 8 }},
+      {"warehouse", 33, 57,
+         soldiers = {
+            [{0,0,0,0}] = 1,
+            [{1,0,0,0}] = 1,
+            [{2,0,0,0}] = 1,
+            [{3,0,0,0}] = 1,
+            [{0,1,0,0}] = 1,
+            [{0,2,0,0}] = 1,
+            [{0,3,0,0}] = 1,
+            [{0,4,0,0}] = 1,
+            [{0,5,0,0}] = 1,
+            [{0,0,0,1}] = 1,
+            [{0,0,0,2}] = 1,
+            [{3,5,0,2}] = 30,
+         },
+         workers = {
+            builder = 1
+         },
+         wares = {
+            trunk = 40,
+            blackwood = 40,
+            cloth = 10,
+            gold = 10,
+            grout = 30,
+            raw_stone = 30,
+            thatchreed = 40,
+         }
+      },
+      {"trainingscamp", 31, 56, soldiers = {} },
+      {"sentry", 28, 57, soldiers = {[{3,5,0,2}] = 2 }},
+      {"sentry", 37, 61, soldiers = {[{3,5,0,2}] = 2 }},
+   }
+   -- Build the roads
+   build_road(wl.map.Field(31,57), "bl", "bl", "|", "br", "br", "|",
+      "r", "r", "|", "tr", "tr", "tl", ".")
+   build_road(wl.map.Field(29,58), "r", "br", ".")
+   build_road(wl.map.Field(38,62), "l", "l", "|", "l", "bl",
+      "|", "tl", "tl", ".")
+   build_road(wl.map.Field(32, 0), "tr", "tr", "tr", '.')
+
+   -- Add wares to the trainingssite so that it does something. Also
+   -- add buildwares to the warehouse
+   local ts = wl.map.Field(31,56).immovable
+   ts:set_wares(ts.valid_wares)
+
+   blocker:lift_blocks()
+end
+   
+-- Remove all stones in a given environment. This is done
+-- in a loop for a nice optical effect
+function remove_all_stones(fields, g_sleeptime)
+   local sleeptime = g_sleeptime or 150 
+   while #fields > 0 do
+      local idx = math.random(#fields)
+      local f = fields[idx]
+      local remove_field = true
+
+      if f.immovable then
+         local n = f.immovable.name:match("stones(%d*)")
+         if n then
+            n = tonumber(n)
+            f.immovable:remove()
+            if n > 1 then 
+               remove_field = false
+               wl.map.create_immovable("stones" .. n-1, f)
+            end
+            sleep(sleeptime)
+         end
+      end
+
+      if remove_field then
+         table.remove(fields, idx)
+      end
+   end
+end
+
+-- ==============
+-- Sentry Thread 
+-- ==============
+-- This thread makes sure that the player does not build stuff where he
+-- is not supposed to. He gets a message box when he tries and what he build
+-- gets immediately ripped. This thread can be disabled temporarily.
+function _fmt(f) return ("%i_%i"):format(f.x, f.y) end
+function register_immovable_as_allowed(i)
+   for idx, f in ipairs(i.fields) do
+      registered_player_immovables[_fmt(f)] = true
+   end
+
+    -- buildings and constructionsite have a flag
+   if i.building_type or i.type == "constructionsite" then
+      registered_player_immovables[_fmt(i.fields[1].brn)] = true
+   end
+end
+register_immovable_as_allowed(plr.starting_field.immovable)
+
+function bad_boy_sentry()
+   while not terminate_bad_boy_sentinel do
+      -- Check all fields.
+      local sent_msg = false
+      for idx,f in ipairs(plr.starting_field:region(8)) do
+         if f.immovable and f.immovable.player == plr and
+               not registered_player_immovables[_fmt(f)] then
+
+            -- Give the callback a chance to veto the deletion. Maybe
+            -- we expect the player to build something at the moment
+            if not illegal_immovable_found(f.immovable) then
+               print ("Killing", f.x .. '_' .. f.y)
+
+               -- scould the player
+               if not sent_msg then
+                  msg_box(scould_player)
+                  sent_msg = true
+               end
+
+               -- Remove the object again
+               f.immovable:remove()
+            end
+         end
+      end
+      sleep(1000)
+   end
+end
+   
+-- Allows constructionsites for the given buildings, all others are invalid
+-- as is any other immovable build by the player
+function allow_constructionsite(i, buildings)
+   if i.type == "constructionsite" then
+      if not buildings then return i end
+      for idx,n in ipairs(buildings) do
+         if i.building == n then return i end
+      end
+      return false
+   elseif i.type == "flag" then
+      local tr = i.fields[1].tln.immovable
+      if tr and tr.type == "constructionsite" then
+         return allow_constructionsite(tr, buildings)
+      end
+   end
+
+   return false
+end
+
+-- ================
+-- Message threads 
+-- ================
 function starting_infos()
    sleep(100)
 
    msg_box(initial_message_01)
    sleep(500)
-   msg_box(initial_message_02)
+
+   local o = msg_box(initial_message_02)
+
 
    -- Wait for buildhelp to come on
    while not wl.ui.MapView().buildhelp do
       sleep(200)
    end
+   o.done = true
+
    sleep(500)
 
    build_lumberjack()
@@ -98,12 +359,17 @@
 function build_lumberjack()
    sleep(100)
 
+   -- We take control, everything that we build is legal
+   illegal_immovable_found = function(i) return true end
+
    msg_box(lumberjack_message_01)
 
+   local blocker = UserInputDisabler:new()
+
+   scroll_smoothly_to(first_lumberjack_field)
    mouse_smoothly_to(first_lumberjack_field)
    sleep(500)
    msg_box(lumberjack_message_02)
-
    sleep(500)
 
    click_on_field(first_lumberjack_field)
@@ -117,15 +383,32 @@
    click_on_field(plr.starting_field.brn)
 
    msg_box(lumberjack_message_04)
+   
+   register_immovable_as_allowed(first_lumberjack_field.immovable) -- hut + flag
+
+   local f = wl.map.Field(14,11)
+   register_immovable_as_allowed(f.immovable) -- road + everything on it
+
+   illegal_immovable_found = function(i) return false end
+
+   blocker:lift_blocks()
+
    sleep(15000)
    
-   msg_box(lumberjack_message_05)
+   local o = msg_box(lumberjack_message_05)
+
+   local blocker = UserInputDisabler:new()
    
    local f = wl.map.Field(14,11)
+   scroll_smoothly_to(f)
    mouse_smoothly_to(f)
-
+   
+   blocker:lift_blocks()
+   
    -- Wait for flag
    while not (f.immovable and f.immovable.type == "flag") do sleep(300) end
+   o.done = true
+
    sleep(300)
    
    msg_box(lumberjack_message_06)
@@ -139,7 +422,7 @@
 
 function learn_to_move()
    -- Teaching the user how to scroll on the map
-   msg_box(inform_about_stones)
+   local o = msg_box(inform_about_stones)
    
    function _wait_for_move()
       local cx = wl.ui.MapView().viewpoint_x
@@ -151,11 +434,13 @@
    end
 
    _wait_for_move()
+   o.done = true
    sleep(3000) -- Give the player a chance to try this some more
 
-   msg_box(tell_about_right_drag_move)
+   o = msg_box(tell_about_right_drag_move)
 
    _wait_for_move()
+   o.done = true
    sleep(3000) -- Give the player a chance to try this some more
    
    msg_box(congratulate_and_on_to_quarry)
@@ -167,25 +452,22 @@
    sleep(200)
 
    -- Teaching how to build a quarry and the nits and knacks of road building.
-   msg_box(order_quarry_recap_how_to_build)
+   local o = msg_box(order_quarry_recap_how_to_build)
 
+   local cs = nil
    -- Wait for the constructionsite to come up.
-   -- TODO: this needs to be done better, but a wrapping of the constructionsite
-   -- is needed for this. 
-   -- TODO: check that the constructionsite is indeed for the correct building
-   local cs = nil
-   while not cs do
-      for idx,f in ipairs(first_quarry_field:region(6)) do
-         if f.immovable and f.immovable.type == "constructionsite" then
-            cs = f
-            break
-         end
-      end
-      sleep(400)
+   illegal_immovable_found = function(i)
+      cs = allow_constructionsite(i, {"quarry"})
+      return cs
    end
 
+   -- Wait for the constructionsite to be placed
+   while not cs do sleep(300) end
+   o.done = true
+   register_immovable_as_allowed(cs)
+
    local function _rip_road()
-      for idx,f in ipairs(cs:region(2)) do
+      for idx,f in ipairs(cs.fields[1].brn:region(2)) do
          if f.immovable and f.immovable.type == "road" then 
             click_on_field(f)
             click_on_panel(wl.ui.MapView().windows.
@@ -196,6 +478,10 @@
       end
    end
 
+   local blocker = UserInputDisabler:new()
+
+   illegal_immovable_found = function() return true end
+
    msg_box(talk_about_roadbuilding_00)
    -- Showoff one-by-one roadbuilding
    click_on_field(wl.map.Field(9,12))
@@ -203,65 +489,93 @@
    click_on_field(wl.map.Field(11,12))
    click_on_field(wl.map.Field(12,12))
    click_on_field(wl.map.Field(12,11))
+   
    sleep(3000)
+
    _rip_road()
    
    msg_box(talk_about_roadbuilding_01)
    -- Showoff direct roadbuilding
-   click_on_field(cs.brn)
+   click_on_field(cs.fields[1].brn)
    click_on_panel(wl.ui.MapView().windows.field_action.buttons.build_road, 300)
    click_on_field(plr.starting_field.brn)
+   
    sleep(3000)
+
    _rip_road()
 
-   msg_box(talk_about_roadbuilding_02)
-   
-   -- TODO: Add information about census and statistics here
-   
+   blocker:lift_blocks()
+
+   local o = msg_box(talk_about_roadbuilding_02)
+   
+   -- From now on, the player can build whatever he wants
+   terminate_bad_boy_sentinel = true
+   
+   -- Wait a while
+   sleep( 120*1000 )   
+
+   -- Interludium: talk about census and statistics
+   census_and_statistics(cs)
+
    while #plr:get_buildings("quarry") < 1 do sleep(1400) end
+   o.done = true
 
    messages()
 end
+   
+function census_and_statistics(cs)
+   sleep(25000)
+   
+   local blocker = UserInputDisabler:new()
+
+   wl.ui.MapView().census = false
+   wl.ui.MapView().statistics = false
+  
+   msg_box(census_and_statistics_00)
+   -- Pick any empty field
+   local function _pick_empty_field()
+      local reg = cs.fields[1]:region(2)
+      local f
+      repeat
+         f = reg[math.random(#reg)]
+      until not f.immovable
+      return f
+   end
+
+   click_on_field(_pick_empty_field())
+   click_on_panel(wl.ui.MapView().windows.field_action.tabs.watch)
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.census)
+   sleep(300)
+   click_on_field(_pick_empty_field())
+   click_on_panel(wl.ui.MapView().windows.field_action.tabs.watch)
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.statistics)
+
+   msg_box(census_and_statistics_01)
+   
+   blocker:lift_blocks()
+end
 
 function messages()
    -- Teach the player about receiving messages
    sleep(10)
 
-   send_message(teaching_about_messages)
+   local o = send_message(teaching_about_messages)
 
    while #plr.inbox > 0 do sleep(200) end
-
-   msg_box(closing_msg_window_00)
+   o.done = true
+
+   sleep(500)
+
+   local o = msg_box(closing_msg_window_00)
 
    -- Wait for messages window to close
    while wl.ui.MapView().windows.messages do sleep(300) end
+   o.done = true
    
    msg_box(closing_msg_window_01)
 
    -- Remove all stones
-   local fields = first_quarry_field:region(6)
-   while #fields > 0 do
-      local idx = math.random(#fields)
-      local f = fields[idx]
-      local remove_field = true
-
-      if f.immovable then
-         temp, temp, n = f.immovable.name:find("stones(%d*)")
-         if n then
-            n = n + 0 -- trick to convert string to integer
-            f.immovable:remove()
-            if n > 1 then 
-               remove_field = false
-               wl.map.create_immovable(("stones%i"):format(n-1), f)
-               sleep(150)
-            end
-         end
-      end
-
-      if remove_field then
-         table.remove(fields, idx)
-      end
-   end
+   remove_all_stones(first_quarry_field:region(6))
 
    -- Wait for message to arrive
    while #plr.inbox < 1 do sleep(300) end
@@ -269,16 +583,155 @@
    sleep(800)
    msg_box(conclude_messages)
 
+   sleep(3000)
    expansion()
 end
 
 function expansion() 
    -- Teach about expanding your territory.
    sleep(10)
+   
+   -- This is not really needed since the stones are already removed, but if
+   -- we're debugging and we start with this function it is most useful to have
+   -- the stones away already
+   remove_all_stones(first_quarry_field:region(6), 20)
 
-   msg_box(introduce_expansion)
+   local o = msg_box(introduce_expansion)
 
    while #conquer_field.owners < 1 do sleep(100) end
+   o.done = true
+
+   mining()
+end
+
+function mining()
+   -- Teach about geologist and resources
+   sleep(10)
+
+   msg_box(mining_00)
+
+   local function _find_good_flag_position()
+      fields = conquer_field:region(8)
+      while #fields > 0 do
+         local idx = math.random(#fields)
+         local f = fields[idx]
+         
+         if f.terr:match("berg%d+") and f.terd:match("berg%d+") then
+            if pcall(function() plr:place_flag(f) end) then
+               f.immovable:remove()
+               return f
+            end
+         end
+
+         table.remove(fields, idx)
+      end
+   end
+
+   local function _find_nearby_flag()
+      for i=2,8 do
+         for idx, f in ipairs(conquer_field:region(i)) do
+            if f.immovable and f.immovable.type == "flag" then
+               return f
+            end
+         end
+      end
+   end
+
+   scroll_smoothly_to(conquer_field)
+   
+   local dest = _find_good_flag_position()
+   local start = _find_nearby_flag()
+
+   -- Build a road, call a geologist
+   click_on_field(start)
+   click_on_panel(wl.ui.MapView().windows.field_action.tabs.roads)
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.build_road)
+   click_on_field(dest)
+   click_on_field(dest) -- second click
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.build_flag)
+   click_on_field(dest)
+   click_on_panel(wl.ui.MapView().windows.field_action.buttons.geologist)
+
+   sleep(6000)
+
+   msg_box(mining_01)
+
+   local function _wait_for_some_resi(wanted)
+      while 1 do
+         local cnt = 0
+         for idx, f in ipairs(dest:region(6)) do 
+            if f.immovable and f.immovable.name:sub(1,4) == "resi" then
+               cnt = cnt + 1
+               if cnt >= wanted then return end
+            end
+         end
+         sleep(500)
+      end
+   end
+   _wait_for_some_resi(8)
+
+   scroll_smoothly_to(dest)
+
+   msg_box(mining_02)
+
+   training()
+end
+
+function training()
+   -- Teach about trainingsites and soldiers
+   sleep(300)
+   
+   msg_box(warefare_and_training_00)
+
+   build_eastern_trainings_area()
+   sleep(8000)
+
+   msg_box(warefare_and_training_01)
+
+   sleep(5000)
+   local citadel_field = wl.map.Field(31, 63)
+   scroll_smoothly_to(citadel_field)
+
+   local o = msg_box(enhance_fortress)
+   while not (citadel_field.immovable and 
+      citadel_field.immovable.name == "citadel") do sleep(800) end
+   o.done = true
+
+   -- 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
+
+   -- Create enemy tribe
+   prefilled_buildings(wl.game.Player(2),
+      {"barrier", 25, 6},
+      {"sentry", 29, 16},
+      {"tower", 30, 21},
+      {"headquarters", 30, 27,
+         workers = {
+            carrier = 50,
+         },
+         soldiers = {
+            [{0,0,0,0}] = 15,
+         }
+      }
+   )
+
+   scroll_smoothly_to(citadel_field)
+   local o = msg_box(attack_enemey)
+
+   local plr2 = wl.game.Player(2)
+   while #plr2:get_buildings("headquarters") > 0 or not plr2.defeated do
+      sleep(3000)
+   end
+   o.done = true
 
    conclusion()
 end
@@ -292,5 +745,6 @@
 
 end
 
+run(bad_boy_sentry)
 run(starting_infos)
 

=== modified file 'campaigns/tutorial01.wmf/scripting/texts.lua' (properties changed: -x to +x)
--- campaigns/tutorial01.wmf/scripting/texts.lua	2010-04-27 07:47:43 +0000
+++ campaigns/tutorial01.wmf/scripting/texts.lua	2010-04-30 14:39:36 +0000
@@ -23,6 +23,11 @@
       ..  s .. "<br></p><p font-size=8> <br></p>"
 end
 
+function h2(s)
+   return "<p font=FreeSerif font-size=12 font-weight=bold font-color=D1D1D1>"
+      ..  s .. "<br></p><p font-size=4> <br></p>"
+end
+
 -- Simple flowing text. One Paragraph
 function p(s)
    return "<p line-spacing=3 font-size=12>" .. s .. "<br></p>" ..
@@ -30,15 +35,26 @@
 end
 
 -- =============
--- Textes below
+-- Texts below
 -- =============
+scould_player = {
+   title = _ "Nice and easy does it all the time",
+   body = rt(p(_
+[[I am sorry, but I have to rip this again. We might need the space here later
+on. If I am too slow for you, you might want to play a real game and just find
+everything out for yourself. Otherwise, please bear with me, I am not the
+youngest and quickest anymore.]]
+      )
+   )
+}
+
 initial_message_01 = {
    title = _ "Welcome to the Widelands tutorial!",
    body = rt(
       h1(_"Welcome to Widelands!") ..
       p(_
 [[Widelands is a slow-paced build-up strategy with an emphasis on construction,
- not destruction. This tutorial will get you through the basics of the game.]]
+not destruction. This tutorial will get you through the basics of the game.]]
       ) .. p(_
 [[You can dismiss this box by left-clicking on the button below.]]
       )
@@ -52,23 +68,32 @@
       h1(_"Let's dive right in!") ..
       p(_
 [[There are three different tribes in Widelands: the barbarians, the empire and
- the atlanteans. All tribes have a different economy, strength and weaknesses,
- but the general gameplay is the same for all. We play the barbarians for now.]]
+the atlanteans. All tribes have a different economy, strength and weaknesses,
+but the general gameplay is the same for all. We play the barbarians for now.]]
       ) .. p(_
 [[You usually start the game with one headquarters. This is the big building
- with the blue flag in front of it. The headquarters is a ware house that stores
- wares, workers and soldiers. Some wares are needed for building houses, others
- for making other wares. Obviously, the wares in the headquarters will not last
- forever, so you must make sure to reproduce them. The most important wares in
- the early game are the basic build wares: trunks and raw stone. Let's make sure
- that we do not run out of trunks. For this, we need to build a lumberjack.]]
+with the blue flag in front of it. The headquarters is a ware house that stores
+wares, workers and soldiers. Some wares are needed for building houses, others
+for making other wares. Obviously, the wares in the headquarters will not last
+forever, so you must make sure to reproduce them. The most important wares in
+the early game are the basic build wares: trunks and raw stone. Let's make sure
+that we do not run out of trunks. For this, we need to build a lumberjack.]]
       ) .. p(_
 [[We need to find a nice place for the lumberjack. To make this easier, we
- activate the build help. To do this, either click on the build help button
- at the bottom of the screen which is the fourth one from the left. Or you
- can use the SPACE key to toggle it.]]
+activate the build help. To do this, either click on the build help button
+at the bottom of the screen which is the fourth one from the left. Or you
+can use the SPACE key to toggle it.]]
       )
    ),
+   obj_name = "enable_buildhelp",
+   obj_title = _ "Enable the build help",
+   obj_body = rt(h1(_"Enable the build help") .. 
+      p(
+[[It is easier to understand what is allowed to be built on which field when
+the build help symbols are enabled. Do so now either by pressing SPACE or by
+clicking the fourth button from the left at the very bottom of the screen.]]
+      )
+   )
 }
 
 lumberjack_message_01 = {
@@ -77,8 +102,8 @@
    field = first_lumberjack_field,
    body = rt(p(_
 [[There you go. I will explain about all those symbols in a minute. First, let
- me show you how to make a lumberjack's hut and how to connect it with a road.
- There is a sweet spot for a lumberjack right next to those trees.]]
+me show you how to make a lumberjack's hut and how to connect it with a road.
+There is a sweet spot for a lumberjack right next to those trees.]]
       )
    )
 }
@@ -88,11 +113,11 @@
    pos = "topright",
    body = rt(p(_
 [[First, I'll left-click on the symbol were I want the lumberjack to be built. A
- window will appear where I can choose between buildings. Because I clicked a
- yellow house symbol - it means that this field can house medium and small
- buildings - I am presented with all medium buildings that I can build. I
- go on to select the small buildings tab. Then I choose the lumberjack's hut.
- Watch me, I'll go really slow: click - select tab - choose building.]]
+window will appear where I can choose between buildings. Because I'll click a
+yellow house symbol - which means that this field can house medium and small
+buildings - I am presented with all medium buildings that I can build. I
+go on to select the small buildings tab. Then I choose the lumberjack's hut.
+Watch me, I'll go really slow: click - select tab - choose building.]]
     )
    )
 }
@@ -102,9 +127,9 @@
    pos = "topright",
    body = rt(p(_
 [[That won't do yet. I still need to connect the lumberjack's hut to the
- rest of my road network. After I ordered a construction site, I am
- automatically in road building mode, so all I have to do is click on the flag
- in front of my headquarters.]]
+rest of my road network. After I ordered a construction site, I am
+automatically in road building mode, so all I have to do is click on the flag
+in front of my headquarters.]]
        )
    )
 }
@@ -114,8 +139,8 @@
    pos = "topright",
    body = rt(p(_
 [[Now watch closely as a builder leaves the headquarters and goes to the
- construction site. Also a carrier will take position in between the two flags
- and carry wares from one flag to the other.]]
+construction site. Also a carrier will take position in between the two flags
+and carry wares from one flag to the other.]]
       )
    )
 }
@@ -125,10 +150,18 @@
    pos = "topright",
    body = rt(p(_
 [[Nice how they work, isn't it? But the poor carrier has a very long way to go.
- We can make it easier for him (and more efficient for us) when we place another
- flag on the road. You try it this time: click on the yellow flag symbol
- in between the two blue flags we just placed and then click on the]]
+We can make it easier for him (and more efficient for us) when we place another
+flag on the road. You try it this time: click on the yellow flag symbol
+in between the two blue flags we just placed and then click on the]]
       )) .. rt("image=pics/menu_build_flag.png", p(_ "build flag symbol.")
+   ),
+   obj_name = "build_flag_on_road_to_lumberjack",
+   obj_title = _ "Build a flag to divide the road to the lumberjack",
+   obj_body = rt(h1(_"Build a flag on the road") .. p(_
+[[The shorter your road segments are, the faster your wares will be transported.
+You should therefore make sure that your roads have as many flags as possible. 
+Build a flag now in the middle of the road that connects your headquarters
+to your lumberjack's hut.]])
    )
 }
 
@@ -137,8 +170,8 @@
    pos = "topright",
    body = rt(p(_
 [[Well done! Let's wait till the hut is finished. If you want things to
- go faster, simply use the PAGE UP key on your keyboard to increase the game
- speed. You can use PAGE DOWN to make the game slower again.]]
+go faster, simply use the PAGE UP key on your keyboard to increase the game
+speed. You can use PAGE DOWN to make the game slower again.]]
       )
    )
 }
@@ -148,8 +181,8 @@
    pos = "topright",
    body = rt(p(_
 [[Excellent. The lumberjack's hut is done. A lumberjack will now move in and
- start chopping down trees, so our trunks income is secured for now. Now on to
- the raw stone.]]
+start chopping down trees, so our trunks income is secured for now. Now on to
+the raw stone.]]
       )
    )
 }
@@ -159,13 +192,23 @@
    body = rt(h1(_ "Getting a quarry up.")) ..
    rt(p(_
 [[Stones can be mined in granite mines, but the easier way is to build a quarry
- next to some stones laying around. As it happens, there is a pile of them
- laying right to the west of your headquarters. I will teach you now how to
- move your view over there]]
+next to some stones laying around. As it happens, there is a pile of them
+laying just to the west of your headquarters. I will teach you now how to
+move your view over there.]]
       ) .. p(_
 [[There are two ways to move your view. The first one is using the cursor keys
- on your keyboard. Go ahead and try this out, move the view using the cursor
- keys]]
+on your keyboard. Go ahead and try this out, move the view using the cursor
+keys]]
+      )
+   ),
+   obj_name = "move_view_with_cursor_keys",
+   obj_title = _ "Move your view with the cursor keys",
+   obj_body = rt(h1(_"Moving your view") .. p(_
+[[Moving your view is essential to get a complete overview over your whole
+economy. There are two ways to move your view in widelands. The first one is
+to use the cursor keys on your keyboard. The second one is the more common and
+faster one: press-and-hold the right mouse button anywhere on the map, then move
+your mouse around and you'll see the view scroll.]]
       )
    )
 }
@@ -174,16 +217,19 @@
    title = _ "Other ways to move the view",
    body = rt(p(_
 [[Excellent. Now there is a faster way to move, using the mouse instead: Simply
- right-click-and-hold anywhere on the map, then drag the mouse and instead
- of the cursor, the view will be moved. Try it.]]
+right-click-and-hold anywhere on the map, then drag the mouse and instead
+of the cursor, the view will be moved. Try it.]]
       )
-   )
+   ),
+   obj_name = "move_view_with_mouse",
+   obj_title = _ "Move your view with the mouse",
+   obj_body = inform_about_stones.obj_body,
 }
 
 congratulate_and_on_to_quarry = {
    title = _ "Onward to the quarry",
    body = rt(p(_
-[[Great. Now about the quarry...]]
+[[Great. Now about that quarry...]]
       )
    )
 }
@@ -194,17 +240,17 @@
    title = _ "How to build a quarry",
    body = rt(p(_
 [[Build a quarry next to those stones here. Remember how I did it earlier?
- Just click the place were you want the building to be, choose it from the
- window that appears and it is placed. Maybe it is a good time to explain about
- all those build help symbols we activated earlier.]]
+Just click the place were you want the building to be, choose it from the
+window that appears and it is placed. Maybe it is a good time to explain about
+all those build help symbols we activated earlier.]]
    ) .. p(_
 [[You can build four things on fields in Widelands: Flags, small houses, medium
- houses and big houses. But not every field can hold anything. The build help
- eases recognition:]]
+houses and big houses. But not every field can hold anything. The build help
+eases recognition:]]
    )) .. rt("image=pics/big.png", p(_
-[[Everything can be build on the green house symbol.]]
+[[Everything can be built on the green house symbol.]]
    )) .. rt("image=pics/medium.png", p(_
-[[Everything except for big buildings can be build on a yellow house symbol.]]
+[[Everything except for big buildings can be built on a yellow house symbol.]]
    )) .. rt("image=pics/small.png", p(_
 [[Red building symbols can only hold small buildings and flags.]]
    )) .. rt("image=pics/set_flag.png", p(_
@@ -214,40 +260,54 @@
  space for holding buildings, so choose your fields wisely.]]
    )) .. rt(p(_
 [[Now go ahead, try it. The quarry is a small building, so if you click on a
- medium or big building symbol, you will have to select the small buildings
- tab first to find it. Go on, check it out!]]
+medium or big building symbol, you will have to select the small buildings
+tab first to find it. Go on, check it out!]]
+      )
+   ), 
+   obj_name = "build_a_quarry",
+   obj_title = _ "Build a quarry next to the stones",
+   obj_body = rt(h1(_ "Build a quarry") .. p(_
+[[There are some stones to the west of your headquarters. Build a quarry right
+next to them. The quarry is a small building like the lumberjack's hut. You
+can therefore build it on any field that shows a red, yellow or green house
+when the build help is enabled (Press SPACE for that).]]) .. p(_
+[[Just click on any house symbol next to the stones, select the small buildings
+tab in the window that opens up, then click on the quarry symbol.]]
       )
    )
 }
 
 talk_about_roadbuilding_00 = {
    pos = "topright",
+   field = wl.map.Field(9,12),
    title = _ "Road building",
    body = rt(p(_
 [[Excellent! Directly after you placed a building, you are in road building
- mode. The new road will start at the flag in front of your newly placed
- construction site. You can enter road building mode for any flag by
- left-clicking on a flag and selecting]]
+mode. The new road will start at the flag in front of your newly placed
+construction site. You can enter road building mode for any flag by
+left-clicking on a flag and selecting]]
       )) .. rt("image=pics/menu_build_way.png", p(_
 [[the road building symbol.]]
       )) .. rt(p(_
 [[If you decide you do not want to build a road at this time, you can cancel
- road building by clicking on the starting flag of the road and selecting]]
+road building by clicking on the starting flag of the road and selecting]]
       )) .. rt("image=pics/menu_abort.png", p(_
 [[the abort symbol.]]
       )) .. rt(p(_
-[[Now, you can either make it longer by one field at a time by left-clicking
- multiple times on neighbouring fields for perfect control over the route the
- road takes like so:]]
+[[Now, about this road. Remember: we are already in road building mode since you
+just ordered the quarry. You can either make it longer by one field at a time
+by left-clicking multiple times on neighbouring fields for perfect control over
+the route the road takes like so:]]
       ))
 }
 
 talk_about_roadbuilding_01 = {
    pos = "topright",
+   field = wl.map.Field(9,12),
    title = _ "Road building",
    body = rt(p(_
 [[Alternatively, you can directly click the flag where
- the road should end like so.]]
+the road should end like so.]]
    ))
 }
 
@@ -256,23 +316,62 @@
    title = _ "Road building",
    body = rt(p(_
 [[One more thing: around the field where your road would end you can see
- different markers. They have the following meaning:]]
+different markers. They have the following meaning:]]
       )) .. rt("image=pics/roadb_green.png", p(_
 [[The terrain is flat here. Your carriers will be very swift on this terrain.]]
    )) .. rt("image=pics/roadb_yellow.png", p(_
 [[There is a small slope to climb to reach this field. This means you're
- workers are faster walking downwards than they are walking upwards.]]
+workers are faster walking downwards than they are walking upwards.]]
    )) .. rt("image=pics/roadb_red.png", p(_
 [[The connection between the fields is extremely steep. The speed increase in
- one direction is huge while the slowdown in the other is also substantial.]]
+one direction is huge while the slowdown in the other is also substantial.]]
    )) .. rt(p(_
 [[Keep the slopes in mind while placing roads and use them to your advantage.
- Also try to keep roads as short as possible and always remember to place as
- many flags as you can on road segments to share the load better.]]
+Also try to keep roads as short as possible and always remember to place as
+many flags as you can on road segments to share the load better.]]
    )) .. rt(p(_
 [[Now please rebuild the road between your quarry and your headquarters.
- We'll wait until the quarry is completed.]]
-   ))
+We'll wait until the quarry is completed.]]
+   )),
+   obj_name = "build_road_to_quarry",
+   obj_title = _ "Connect the quarry to the headquarters",
+   obj_body = rt(h1(_"Connect your construction site") .. p(_
+[[Connect your quarry construction site to your headquarters with a road. You
+are directly in road building mode when you ordered a new site. But now, you
+aren't. To build a completely new road just click on the flag in front of your
+construction site, click on the build road icon then click on the flag in front
+of your headquarters.]]
+      )
+   )
+}
+
+census_and_statistics_00 = {
+   title = _ "Census and statistics",
+   body = rt(p(_
+[[While we wait, I'll quickly show you another useful feature. All construction
+sites look the same and some buildings look alike. It is sometimes hard to tell
+them apart. Widelands offers a feature to show label texts over the buildings.
+They are called the census and you can toggle them via the 'c' key or via
+the button on the watch tab of any field.]]
+    ) .. p(_
+[[Similar to this are building statistics which are also toggled via a
+button on the watch tab of any field. The hotkey for it is 's'. This will
+display an information string about the productivity of buildings or the
+progress of construction sites.]]
+   ) .. p(_
+[[Let me quickly enable those two for you. Remember: 'c' and 's' are the keys.
+Alternatively you can click on any field without a building on it, select the
+watch tab and then click on the corresponding buttons.]]
+   )
+)
+}
+
+census_and_statistics_01 = {
+   title = _ "Census and statistics",
+   body = rt(p(_
+[[Now we know what's going on. Let's wait for this quarry to finish.]]
+   )
+)
 }
 
 teaching_about_messages = {
@@ -281,24 +380,35 @@
    body = rt(h1(_"Messages") ..
       p(_
 [[Hi, it's me again! This time, I sent you a message. Messages are sent to you
- by Widelands to inform you about important events: empty mines, attacks on your
- tribe, won or lost military buildings, resources found...]]
+by Widelands to inform you about important events: empty mines, attacks on your
+tribe, won or lost military buildings, resources found...]]
       ) .. p(_
 [[The message window can be toggled by the button on the very right at the
- bottom of the screen. This button also changes appearance if new messages are
- available, but there is also a bell sound played whenever you receive a new
- message.]]
+bottom of the screen. This button also changes appearance if new messages are
+available, but there is also a bell sound played whenever you receive a new
+message.]]
       ) .. p(_
 [[Currently, you have two messages. This one which you are currently reading and
- the one that informed you that a new headquarters was added to your economy.
- Let's learn how to archive messages: You can check them off in your inbox so
- that they get a tick-symbol in front of them. Then, you can click the]]
+the one that informed you that a new headquarters was added to your economy.
+Let's learn how to archive messages: You can check them off in your inbox so
+that they get a tick-symbol in front of them. Then, you can click the]]
       )) .. rt("image=pics/message_archive.png", p(_
 [[archive message button to move them into your archive.]]
       )) .. rt(p(_
 [[Archive all messages, including this one, that you currently have in your
  inbox.]]
       )
+   ),
+   obj_name = "archive_all_messages",
+   obj_title = _"Archive all messages in your inbox",
+   obj_body = rt(h1(_"Archive our inbox messages") .. p(_
+[[The message window is central to fully control your tribe's fortune. But you
+get a lot of messages in a real game. To keep your head straight, you should
+try to keep the inbox empty. Archive all your messages in the inbox now. To do
+so, open the messages window by pressing 'n' or clicking the right most button
+at the very bottom of the screen. Then mark all messages by checking the check
+box in front of them. Then, click the archive all button]]
+      )
    )
 }
 
@@ -308,9 +418,17 @@
    title = _"Closing windows",
    body = rt(p(_
 [[Excellent. By the way: closing windows in Widelands is as easy as
- right-clicking on them. This works with all windows except for story message
- windows like this one. Go ahead and try it. Close the messages window,
- please.]]
+right-clicking on them. This works with all windows except for story message
+windows like this one. Go ahead and try it. First, close this window by pressing
+the button below, then right click into the messages window to close it.]]
+      )
+   ),
+   obj_name = "close_message_window",
+   obj_title = _ "Close the messages window",
+   obj_body = rt(h1(_"Close the messages window") .. p(_
+[[All windows in widelands can be closed by right clicking into them. Some
+windows can also be toggled with the buttons at the very bottom of the screen.
+Close the messages window now by right clicking into it.]]
       )
    )
 }
@@ -321,9 +439,9 @@
    title = _ "Closing windows",
    body = rt(p(_
 [[Well done! Let's see how messages work in the real game, shall we? For this,
- I'll take all stones away from the poor stonemason in the quarry. He will then
- send a message that he can't find any in his working area the next time he
- tries to do some work.]]
+I'll take all stones away from the poor stonemason in the quarry. He will then
+send a message that he can't find any in his working area the next time he
+tries to do some work.]]
       )
    )
 }
@@ -333,8 +451,9 @@
    title = _ "Message arrived!",
    body = rt(p(_
 [[A message has been sent to you. See how the button at the bottom of the
- screen has changed appearance? You should now burn this quarry down as it is
- no longer of any use and is just blocking space.]]
+screen has changed appearance? You should now burn this quarry down as it is
+no longer of any use and is just blocking space. To do that, click on the
+quarry and select the destroy button.]]
    ))
 }
 
@@ -342,23 +461,225 @@
    title = _ "Expanding your territory!",
    body = rt(p(_
 [[There is one more thing I'd like to teach you now: Expanding your territory.
- The place that we start with around our headquarters is barely enough for a
- basic build infrastructure and we do not have access to mountains which we
- need to mine minerals and coal. So we have to expand our territory]]
+The place that we start with around our headquarters is barely enough for a
+basic build infrastructure and we do not have access to mountains which we
+need to mine minerals and coal. So we have to expand our territory.]]
       ) .. p(_
 [[Expanding is as simple as building a military building at the corner of
- your territory. The barbarians have a few different military buildings:
- sentries, barriers, donjons, strongholds, fortresses and citadels. The bigger
- the building, the more expensive it is to build, the more land it conquers
- around itself and the more soldiers can be stationed there. The buildings also
- vary in their vision range: buildings with a tower see farther than others.]]
+your territory. The barbarians have a few different military buildings:
+sentries, barriers, donjons, strongholds, fortresses and citadels. The bigger
+the building, the more expensive it is to build, the more land it conquers
+around itself and the more soldiers can be stationed there. The buildings also
+vary in their vision range: buildings with a tower see farther than others.]]
       ) .. p(_
 [[As soon as a military building is manned, it extends your land. You can then
- burn it down again if you need the place. But note that your land is then
- vulnerable: any military site from another player can conquer the land. You
- therefore need military sites to keep military influence over your land.]]
-      ) .. p(_
-[[Let's try it out now: Build a military building on your eastern border.]]
+burn it down again if you need the place. But note that your land is then
+vulnerable: any military site from another player can conquer the land. You
+therefore need military sites to keep military influence over your land.]]
+      ) .. p(_
+[[Let's try it out now: Build a few military buildings on your south western
+border.  We want to capture some of this mountain, so we can search for
+resources there. Bigger buildings will conquer more land which can be beneficial
+close to mountains because you can't build houses in mountains.]]
+      )
+   ),
+   obj_name = "conquer_mountain",
+   obj_title = _ "Conquer an area were we can build mines",
+   obj_body = rt(h1(_"Conquer the mountain to the south west") .. p(_
+[[For a full-fledged economy, we need coal, iron and gold. These can be found
+in mountains. Conquer some area on the mountains to the south-west of your
+headquarters by building some military buildings close to your border.]]
+   ) .. p(_
+[[You can choose from the following military buildings: sentry, stronghold,
+donjon, barrier and fortress. The bigger the building, the more expensive it is
+to be built. But it will also conquer a bigger region. Sometimes, it is useful
+to build a big military building next to a mountain so that you can reach
+fields farther up.]]
+      )
+   )
+}
+
+mining_00 = {
+   pos = "topright",
+   title = _ "Searching for resources",
+   body = rt(p(_
+[[Okay, now we own some of the area on this mountain. Mountains are very
+important, because they contain resources: coal, iron ore, goldstone and
+granite.  Each tribe uses the resources differently, but all need mines to get
+the resources out of the ground.]]
+   ) .. p(_
+[[Let's search for resources in this mountain.  First, we'll build a road into
+the mountains and place a flag. Then, we click on the flag and call a geologist
+to it. I'll show you how it's done.]]
+   )
+)
+}
+
+mining_01 = {
+   pos = "topright",
+   title = _"Waiting for the geologist",
+   body = rt(p(_
+[[The geologist will arrive shortly to the flag and start investigating the
+area in his surroundings. He will place the following markers for the various
+resources:]]
+   )) ..
+   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_granit1/resi_00.png",
+      p(_ "a bit of granite")) ..
+   rt("image=tribes/barbarians/resi_granit2/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(_
+[[Let's wait and see what the geologist finds on the mountain.]]
+   )
+)
+}
+
+mining_02 = {
+   pos = "topright",
+   title = _ "Mining conclusion",
+   body = rt(p(_
+[[So our geologist found a lot of coal on this mountain. You should therefore
+build a coal mine here. Building a mine is like building a house. The build
+help symbol for where a mine can be built is]]
+   )) .. rt("image=pics/mine.png", p(_"this one.")) ..
+   rt(p(_
+[[Note that a mine needs rations to work. Rations are
+produced in taverns and taverns need meat, pitta bread, and fish to produce
+them. You will need a lot more infrastructure to get your mines working
+well. This infrastructure also varies from tribe to tribe. You'll get them
+explained in the introduction campaigns for the three tribes.]]
+   )
+)
+}
+
+warefare_and_training_00 = {
+   title = _ "Warfare and Training",
+   body = rt(h1(_ "Soldiers and Warefare") .. p(_
+[[On to the last topic now. We are going to talk about soldiers, their training
+and their profession: warfare. As mentioned, widelands is about building up,
+not burning down: therefore warfare is also more focused on the economics than
+the military strategies. Nevertheless, warfare offers one way to challenge
+other players and it has some game mechanics that deserve explanation. The
+economies of the tribes are explained in their individual tutorial campaigns.
+Ok, I am going to create us a little training ground with a training camp and a
+warehouse to the north east of here.]]) .. p(_
+[[If you want to come back to this eastern part of your realm, just scroll here
+via right-button scrolling or open the minimap by clicking on the]]
+         )) .. rt("image=pics/menu_toggle_minimap.png", p(_
+[[minimap button at the bottom of the screen. Alternatively you could also press
+'m' on your keyboard]]
+         )) .. (rt(p(_
+[[The minimap shows you the complete map in miniature. You can directly jump to
+any field by left-clicking on it. You can also toggle buildings, roads, flags
+and player indicators on and off inside the map.]]
+         ) .. p(_
+[[But I digress. Back to soldiers. What was I about to do? Oh yes, I wanted to
+build a small training scenario for you. Let's do that now.]]
+         )
+      )
+   )
+}
+
+warefare_and_training_01 = {
+   pos = "topright",
+   title = _ "Trainings camp and soldier stats",
+   body = rt(p(_
+[[There we go. Take a look at the soldiers that are on their way into our
+trainings camp. They look different than normal workers: they have a health bar
+over their head that displays their remaining hitpoints and they have four
+symbols which symbolize the individual soldier's current levels in the four
+different categories hitpoints, attack, defense and evade.]]
+      ) .. p(_
+[[A soldier is created as any normal worker: a carrier grabs a tool in a
+warehouse as soon as a request for a certain profession is not fulfilled. The
+tool to create a barbarian soldier is an axe. The newly created soldier is of
+level 0. To make the soldier better in any of the four categories, training is
+needed. Training happens in training sites like the trainings camp or the
+battle arena: soldiers go there (as our little fellows are currently doing),
+consume some wares and advance a level in one category. If a barbarian soldier
+is fully trained, he has level 3 hitpoints, level 5 attack, level 0 defense and
+level 2 evade. This is one fearsome warrior then! The individual statistics
+have the following meaning:]]
+      ) .. h2(_"Hitpoints:") .. p(_
+[[The total life of a soldier. A barbarian soldier starts with ~130 hitpoints,
+with each hitpoint level he gains 28 hitpoints.]]
+      ) .. h2(_"Attack:") .. p(_
+[[The amount of damage a soldier inflicts upon a successful attack on the
+enemy. A barbarian soldier with attack level 0 inflicts ~14 hitpoints damage
+when he succeeds to hit an enemy. For each attack level, he gains 7 damage.
+]]
+      ) .. h2(_"Defense:") .. p(_
+[[Defense is the value that is subtracted from the attack value. The barbarians
+can not train in this skill and therefore have always defense level 0 which
+means that they always get 3 hitpoints subtracted from the damage inflicted. If
+an attacker with an attack value of 15 hitpoints hits a barbarian soldier, the
+barbarian would lose 15 - 3 = 12 hitpoints. The 3 hitpoints that are subtracted
+are because of the defense ability.]]
+      ) .. h2(_"Evade:") .. p(_
+[[Evade is the chance that the soldier is able to dodge an attack. It is 25% for
+a level 0 evade barbarian and increases in steps of 15% for each level.]]
+      )
+   ) 
+}
+
+enhance_fortress = {
+   pos = "topright",
+   title = _ "Enhance this fortress",
+   body = rt(h1(_ "Enhancing buildings") .. p(_
+[[I will create an enemy for you soon, but let's make sure you are prepared.
+This fortress is already quite strong and conquers a lot of space. But there is
+an even bigger building: the citadel.]]
+      ) .. p(_
+[[Citadels can not be built directly. Instead, you have to construct a fortress
+first and then enhance it to a citadel. To do so, click on the fortress, then
+choose the enhance to citadel button. Your soldiers will leave the citadel
+while the construction is going on. This means that your fortress has no
+military influence any more. If an enemy builds a military building nearby,
+your construction site could burn down. No sweat, that won't happen here.]]
+      ) .. p(_
+[[Enhance your fortress to a citadel now. Remember that you can speed time up
+by using PAGE_UP, building a citadel takes a while.]]
+      )
+   ),
+   obj_name = "enhance_fortress", 
+   obj_title = _"Enhance your fortress to a citadel",
+   obj_body = rt(h1(_ "Enhance your fortress") .. p(_
+[[Enhance your fortress to a mighty citadel. The citadel can house 12 soldiers
+and is the biggest military building the barbarians can build. It also costs a
+lot and takes a long time to build. It is most suited to guard strategically
+important points like constricted points or mountains.]]
+      )
+   )
+}
+
+attack_enemey = {
+   pos = "topright", 
+   title = _ "Defeat your enemy",
+   body = rt(h1(_ "Defeat the enemy") .. p(_
+[[I created a sparring partner for you: It is an empire tribe close to your
+citadel. To attack its buildings, click on the door of your target building,
+choose the number of soldiers that you wish to send and click on the attack
+button. Your soldiers will come from all nearby military buildings. Likewise,
+the defenders will come from all nearby military buildings of the enemy and
+intercept your forces.]]
+      ) .. p(_
+[[Attack and conquer all military buildings of the enemy and destroy its
+headquarters.]]
+      )
+   ),
+   obj_name = "defeated_the_empire",
+   obj_title = _ "Defeat the enemy tribe",
+   obj_body = rt(h1(_"Defeat your enemy") ..  p(_
+[[Defeat the nearby enemy. To attack a building, click on its doors, choose the
+number of attacking soldiers, then send them via the attack button.]]
       )
    )
 }
@@ -367,24 +688,24 @@
    title = _ "Conclusion",
    body = rt(h1(_"Conclusion") ..
       p(_
-[[This concludes the tutorial. There is some stuff we have not covered: mining,
- training of soldiers, enhancing buildings, warfare, the statistics, the
- mini-map. We have not even build a single producing building even though
- producing wares is the most important thing in Widelands. But you can learn
- these while you go through the individual tribe's introduction campaigns. Each
- consists of some scenarios introducing the tribes and their economy while
- introducing the background story of Widelands.]]
+[[This concludes the tutorial. There is some stuff we have not covered here --
+we have not even built a single producing building even though producing wares
+is the most important thing in Widelands -- but you've learned the ropes. You
+can learn about the remaining stuff while you go through the individual tribe's
+introduction campaigns. Each consists of some scenarios explaining the tribes
+and their economy while introducing the background story of Widelands. Have fun
+playing!]]
       ) .. p(_
 [[You can continue playing this map or you can end this game whenever you like.
- To leave this game and return to the main menu click on the]]
+To leave this game and return to the main menu click on the]]
       )) .. rt("image=pics/menu_options_menu.png", p(_
 [[options menu button on the very left at the bottom of the screen.
- Then click the]]
+Then click the]]
       )) .. rt("image=pics/menu_exit_game.png", p(_
 [[exit game button.]]
       )) .. rt(p(_
 [[Thanks for playing this tutorial. Enjoy Widelands and remember
- to visit us at]]
+to visit us at]]
       )) .. rt("text-align=center",
    "<p font-size=24 font-decoration=underline>http://www.widelands.org</p>"
    )

=== modified file 'src/economy/flag.cc'
--- src/economy/flag.cc	2010-04-18 13:13:49 +0000
+++ src/economy/flag.cc	2010-04-30 14:39:36 +0000
@@ -243,6 +243,17 @@
 }
 
 /**
+ * Return all positions we occupy on the map. For a Flag, this is only one
+*/
+BaseImmovable::PositionList Flag::get_positions
+	(const Editor_Game_Base &) const throw ()
+{
+	PositionList rv;
+	rv.push_back(m_position);
+	return rv;
+}
+
+/**
  * Return neighbouring flags.
 */
 void Flag::get_neighbours(RoutingNodeNeighbours & neighbours)

=== modified file 'src/economy/flag.h'
--- src/economy/flag.h	2010-04-18 12:16:52 +0000
+++ src/economy/flag.h	2010-04-30 14:39:36 +0000
@@ -74,6 +74,7 @@
 	virtual Flag & base_flag();
 
 	Coords get_position() const {return m_position;}
+	virtual PositionList get_positions (const Editor_Game_Base &) const throw ();
 	void get_neighbours(RoutingNodeNeighbours &);
 	int32_t get_waitcost() const {return m_item_filled;}
 

=== modified file 'src/economy/road.cc'
--- src/economy/road.cc	2010-04-05 21:51:37 +0000
+++ src/economy/road.cc	2010-04-30 14:39:36 +0000
@@ -122,6 +122,24 @@
 	return true;
 }
 
+BaseImmovable::PositionList Road::get_positions
+	(const Editor_Game_Base & egbase) const throw()
+{
+	Map & map = egbase.map();
+	Coords curf = map.get_fcoords(m_path.get_start());
+
+	PositionList rv;
+	const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
+	for (Path::Step_Vector::size_type steps = 0; steps <  nr_steps + 1; ++steps)
+	{
+		if (steps > 0 && steps < m_path.get_nsteps())
+			rv.push_back(curf);
+
+		if (steps < m_path.get_nsteps())
+			map.get_neighbour(curf, m_path[steps], &curf);
+	}
+	return rv;
+}
 
 static std::string const road_name = "road";
 std::string const & Road::name() const throw () {return road_name;}

=== modified file 'src/economy/road.h'
--- src/economy/road.h	2010-03-28 09:39:54 +0000
+++ src/economy/road.h	2010-04-30 14:39:36 +0000
@@ -78,6 +78,7 @@
 	char const * type_name() const throw () {return "road";}
 	virtual int32_t  get_size    () const throw ();
 	virtual bool get_passable() const throw ();
+	virtual PositionList get_positions(const Editor_Game_Base &) const throw ();
 	std::string const & name() const throw ();
 
 	virtual Flag & base_flag();

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2010-04-01 10:59:34 +0000
+++ src/logic/building.cc	2010-04-30 14:39:36 +0000
@@ -459,6 +459,32 @@
 }
 
 
+/**
+ * Return all positions on the map that we occupy
+ */
+BaseImmovable::PositionList Building::get_positions
+	(const Editor_Game_Base & egbase) const throw ()
+{
+	PositionList rv;
+
+	rv.push_back(m_position);
+	if (get_size() == BIG) {
+		Map & map = egbase.map();
+		Coords neighb;
+
+		map.get_ln(m_position, &neighb);
+		rv.push_back(neighb);
+
+		map.get_tln(m_position, &neighb);
+		rv.push_back(neighb);
+
+		map.get_trn(m_position, &neighb);
+		rv.push_back(neighb);
+	}
+	return rv;
+}
+
+
 /*
 ===============
 Remove the building from the world now, and create a fire in its place if

=== modified file 'src/logic/building.h'
--- src/logic/building.h	2010-04-03 16:44:44 +0000
+++ src/logic/building.h	2010-04-30 14:39:36 +0000
@@ -165,7 +165,9 @@
 
 	virtual Flag & base_flag();
 	virtual uint32_t get_playercaps() const throw ();
+
 	virtual Coords get_position() const throw () {return m_position;}
+	virtual PositionList get_positions (const Editor_Game_Base &) const throw ();
 
 	std::string const & name() const throw ();
 	const std::string & descname() const throw () {return descr().descname();}

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2010-04-19 09:39:05 +0000
+++ src/logic/immovable.cc	2010-04-30 14:39:36 +0000
@@ -348,6 +348,15 @@
 	return IMMOVABLE;
 }
 
+BaseImmovable::PositionList Immovable::get_positions
+	(const Editor_Game_Base &) const throw ()
+{
+	PositionList rv;
+
+	rv.push_back(m_position);
+	return rv;
+}
+
 int32_t Immovable::get_size() const throw ()
 {
 	return descr().get_size();

=== modified file 'src/logic/immovable.h'
--- src/logic/immovable.h	2010-03-28 13:19:24 +0000
+++ src/logic/immovable.h	2010-04-30 14:39:36 +0000
@@ -56,6 +56,15 @@
 
 	virtual int32_t  get_size    () const throw () = 0;
 	virtual bool get_passable() const throw () = 0;
+
+	typedef std::vector<Coords> PositionList;
+	/**
+	 * Return all coordinates occupied by this Immovable. We gurantee that the
+	 * list always contains one entry and the first one is the main position
+	 * if one can be chosen as main.
+	 */
+	virtual PositionList get_positions
+		(const Editor_Game_Base &) const throw () = 0;
 	virtual void draw
 		(const Editor_Game_Base &, RenderTarget &, const FCoords, const Point)
 		= 0;
@@ -127,6 +136,7 @@
 	Immovable(const Immovable_Descr &);
 
 	Coords get_position() const {return m_position;}
+	virtual PositionList get_positions (const Editor_Game_Base &) const throw ();
 
 	virtual int32_t  get_type    () const throw ();
 	char const * type_name() const throw () {return "immovable";}

=== modified file 'src/logic/legacy.cc'
--- src/logic/legacy.cc	2010-01-14 18:22:23 +0000
+++ src/logic/legacy.cc	2010-04-30 14:39:36 +0000
@@ -352,6 +352,15 @@
 	virtual bool get_passable() const throw () {return true;}
 	virtual void draw (Editor_Game_Base const &, RenderTarget &, FCoords, Point)
 	{}
+	virtual PositionList get_positions (const Editor_Game_Base &) const throw ()
+	{
+		// This violates what I had in mind for get_positions, but since this is
+		// attic code and get_positions was added long after this code was gone
+		// I guess it is save to return an empty list here.
+		PositionList rv;
+		return rv;
+	}
+
 
 	struct Loader : public BaseImmovable::Loader {
 		virtual void load(FileRead & fr, uint8_t const version) {
@@ -425,6 +434,14 @@
 	virtual bool get_passable() const throw () {return true;}
 	virtual void draw (Editor_Game_Base const &, RenderTarget &, FCoords, Point)
 	{}
+	virtual PositionList get_positions (const Editor_Game_Base &) const throw ()
+	{
+		// This violates what I had in mind for get_positions, but since this is
+		// attic code and get_positions was added long after this code was gone
+		// I guess it is save to return an empty list here.
+		PositionList rv;
+		return rv;
+	}
 
 	struct Loader : public BaseImmovable::Loader {
 		virtual void load(FileRead & fr, uint8_t const version) {

=== modified file 'src/save_handler.cc'
--- src/save_handler.cc	2009-09-06 11:57:37 +0000
+++ src/save_handler.cc	2010-04-30 14:39:36 +0000
@@ -36,6 +36,9 @@
 void SaveHandler::think(Widelands::Game & game, int32_t realtime) {
 	initialize(realtime);
 
+	if (not m_allow_autosaving) // Is autosaving allowed atm?
+		return;
+
 	int32_t const autosaveInterval =
 		g_options.pull_section("global").get_int
 			("autosave", DEFAULT_AUTOSAVE_INTERVAL * 60);

=== modified file 'src/save_handler.h'
--- src/save_handler.h	2009-09-30 17:38:02 +0000
+++ src/save_handler.h	2010-04-30 14:39:36 +0000
@@ -33,11 +33,13 @@
 class SaveHandler {
 	int32_t m_lastSaveTime;
 	bool m_initialized;
+	bool m_allow_autosaving;
 
 	void initialize(int32_t currenttime);
 
+
 public:
-	SaveHandler() : m_initialized(false) {}
+	SaveHandler() : m_initialized(false), m_allow_autosaving(true) {}
 	void think(Widelands::Game &, int32_t currenttime);
 	std::string create_file_name(std::string dir, std::string filename);
 	bool save_game
@@ -46,6 +48,8 @@
 		 std::string       * error = 0);
 
 	static std::string get_base_dir() {return "save";}
+	void set_allow_autosaving(bool t) {m_allow_autosaving = t;}
+	bool get_allow_autosaving() {return m_allow_autosaving;}
 };
 
 #endif

=== modified file 'src/scripting/lua_game.cc'
--- src/scripting/lua_game.cc	2010-04-25 18:47:42 +0000
+++ src/scripting/lua_game.cc	2010-04-30 14:39:36 +0000
@@ -571,11 +571,14 @@
 	}
 #undef CHECK_ARG
 
+	std::string title = luaL_checkstring(L, 2);
+	std::string body =  luaL_checkstring(L, 3);
+
 	uint32_t cspeed = game.gameController()->desiredSpeed();
 	game.gameController()->setDesiredSpeed(0);
 
-	std::string title = luaL_checkstring(L, 2);
-	std::string body =  luaL_checkstring(L, 3);
+	game.save_handler().set_allow_autosaving(false);
+
 	Story_Message_Box * mb =
 		new Story_Message_Box
 				(game.get_ipl(), luaL_checkstring(L, 2), luaL_checkstring(L, 3),
@@ -586,9 +589,12 @@
 
 	// Manually force the game to reevaluate it's current state,
 	// especially time information.
-	game.think();
+	game.gameController()->think();
 
 	game.gameController()->setDesiredSpeed(cspeed);
+
+	game.save_handler().set_allow_autosaving(true);
+
 	return 1;
 }
 
@@ -1581,11 +1587,11 @@
 }
 
 /* RST
-	.. function:: get_speed(speed)
-
-		Gets the current game speed
-
-		:returns: :const:`nil`
+.. function:: get_speed(speed)
+
+	Gets the current game speed
+
+	:returns: :const:`nil`
 */
 // UNTESTED
 static int L_get_speed(lua_State * L) {
@@ -1593,11 +1599,43 @@
 	return 1;
 }
 
+/* RST
+	.. function:: set_allow_autosaving(b)
+
+		Disable or enable auto-saving. When you show off UI features in a
+		tutorial or scenario, you have to disallow auto-saving because UI
+		elements can now be saved.
+
+		:arg b: allow autosaving or disallow it
+		:type b: :class:`boolean`
+*/
+// UNTESTED
+static int L_set_allow_autosaving(lua_State * L) {
+	get_game(L).save_handler().set_allow_autosaving
+		(luaL_checkboolean(L, -1));
+	return 0;
+}
+
+/* RST
+	.. function:: get_allow_autosaving
+
+		Returns the current state of autosaving.
+
+		:returns: :class:`boolean`
+*/
+// UNTESTED
+static int L_get_allow_autosaving(lua_State * L) {
+	lua_pushboolean(L, get_game(L).save_handler().get_allow_autosaving());
+	return 1;
+}
+
 const static struct luaL_reg wlgame [] = {
 	{"run_coroutine", &L_run_coroutine},
 	{"get_time", &L_get_time},
 	{"get_speed", &L_get_speed},
 	{"set_speed", &L_set_speed},
+	{"set_allow_autosaving", &L_set_allow_autosaving},
+	{"get_allow_autosaving", &L_get_allow_autosaving},
 	{0, 0}
 };
 

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2010-04-25 12:56:53 +0000
+++ src/scripting/lua_map.cc	2010-04-30 14:39:36 +0000
@@ -74,12 +74,14 @@
 		case Map_Object::BUILDING:
 		{
 			const char * type_name = bi->type_name();
-			if (!strcmp(type_name, "warehouse"))
-				return CAST_TO_LUA(Warehouse);
+			if (!strcmp(type_name, "constructionsite"))
+				return CAST_TO_LUA(ConstructionSite);
 			else if (!strcmp(type_name, "productionsite"))
 				return CAST_TO_LUA(ProductionSite);
 			else if (!strcmp(type_name, "militarysite"))
 				return CAST_TO_LUA(MilitarySite);
+			else if (!strcmp(type_name, "warehouse"))
+				return CAST_TO_LUA(Warehouse);
 			else if (!strcmp(type_name, "trainingsite"))
 				return CAST_TO_LUA(TrainingSite);
 			else
@@ -914,6 +916,7 @@
 const PropertyType<L_BaseImmovable> L_BaseImmovable::Properties[] = {
 	PROP_RO(L_BaseImmovable, size),
 	PROP_RO(L_BaseImmovable, name),
+	PROP_RO(L_BaseImmovable, fields),
 	{0, 0, 0},
 };
 
@@ -964,6 +967,28 @@
 	return 1;
 }
 
+/* RST
+	.. attribute:: fields
+
+		(RO) An :class:`array` of :class:`~wl.map.Field` that is occupied by this
+		Immovable. If the immovable occupies more than one field (roads or big
+		buildings for example) the first entry in this list will be the main field
+*/
+int L_BaseImmovable::get_fields(lua_State * L) {
+	Editor_Game_Base & egbase = get_egbase(L);
+
+	BaseImmovable::PositionList pl = get(L, egbase)->get_positions(egbase);
+
+	lua_createtable(L, pl.size(), 0);
+	uint32_t idx = 1;
+	container_iterate_const(BaseImmovable::PositionList, pl, f) {
+		lua_pushuint32(L, idx++);
+		to_lua<L_Field>(L, new L_Field(f->x, f->y));
+		lua_rawset(L, -3);
+	}
+	return 1;
+}
+
 /*
  ==========================================================
  LUA METHODS
@@ -1352,6 +1377,55 @@
  ==========================================================
  */
 
+/* RST
+ConstructionSite
+-----------------
+
+.. class:: ConstructionSite
+
+	Child of: :class:`Building`
+
+	A ConstructionSite as it appears in Game. This is only a minimal wrapping at
+	the moment
+*/
+const char L_ConstructionSite::className[] = "ConstructionSite";
+const MethodType<L_ConstructionSite> L_ConstructionSite::Methods[] = {
+	{0, 0},
+};
+const PropertyType<L_ConstructionSite> L_ConstructionSite::Properties[] = {
+	PROP_RO(L_ConstructionSite, building),
+	{0, 0, 0},
+};
+
+/*
+ ==========================================================
+ PROPERTIES
+ ==========================================================
+ */
+/* RST
+	.. attribute:: building
+
+		(RO) The name of the building that is constructed here
+*/
+int L_ConstructionSite::get_building(lua_State * L) {
+	lua_pushstring(L, get(L, get_game(L))->building().name());
+	return 1;
+}
+
+/*
+ ==========================================================
+ LUA METHODS
+ ==========================================================
+ */
+
+/*
+ ==========================================================
+ C METHODS
+ ==========================================================
+ */
+
+
+
 
 /* RST
 Warehouse
@@ -2255,6 +2329,13 @@
 	add_parent<L_Road, L_MapObject>(L);
 	lua_pop(L, 1); // Pop the meta table
 
+	register_class<L_ConstructionSite>(L, "map", true);
+	add_parent<L_ConstructionSite, L_Building>(L);
+	add_parent<L_ConstructionSite, L_PlayerImmovable>(L);
+	add_parent<L_ConstructionSite, L_BaseImmovable>(L);
+	add_parent<L_ConstructionSite, L_MapObject>(L);
+	lua_pop(L, 1); // Pop the meta table
+
 	register_class<L_Warehouse>(L, "map", true);
 	add_parent<L_Warehouse, L_Building>(L);
 	add_parent<L_Warehouse, L_PlayerImmovable>(L);

=== modified file 'src/scripting/lua_map.h'
--- src/scripting/lua_map.h	2010-04-08 13:22:53 +0000
+++ src/scripting/lua_map.h	2010-04-30 14:39:36 +0000
@@ -26,11 +26,12 @@
 
 #include "economy/flag.h"
 #include "economy/road.h"
+#include "logic/constructionsite.h"
 #include "logic/game.h"
-#include "logic/warehouse.h"
+#include "logic/militarysite.h"
 #include "logic/productionsite.h"
-#include "logic/militarysite.h"
 #include "logic/trainingsite.h"
+#include "logic/warehouse.h"
 
 #include "luna.h"
 
@@ -120,6 +121,7 @@
 	 */
 	int get_size(lua_State * L);
 	int get_name(lua_State * L);
+	int get_fields(lua_State * L);
 
 	/*
 	 * Lua Methods
@@ -348,6 +350,33 @@
 };
 
 
+class L_ConstructionSite : public L_Building
+{
+public:
+	LUNA_CLASS_HEAD(L_ConstructionSite);
+
+	L_ConstructionSite() {}
+	L_ConstructionSite(Widelands::ConstructionSite & mo) : L_Building(mo) {
+	}
+	L_ConstructionSite(lua_State * L) : L_Building(L) {}
+	virtual ~L_ConstructionSite() {}
+
+	/*
+	 * Properties
+	 */
+	int get_building(lua_State *);
+
+	/*
+	 * Lua Methods
+	 */
+
+	/*
+	 * C Methods
+	 */
+	CASTED_GET(ConstructionSite);
+};
+
+
 class L_Warehouse : public L_Building,
 	public L_HasWares, public L_HasWorkers, public L_HasSoldiers
 {

=== modified file 'src/scripting/lua_ui.cc'
--- src/scripting/lua_ui.cc	2010-04-26 15:18:43 +0000
+++ src/scripting/lua_ui.cc	2010-04-30 14:39:36 +0000
@@ -503,6 +503,8 @@
 	PROP_RW(L_MapView, viewpoint_x),
 	PROP_RW(L_MapView, viewpoint_y),
 	PROP_RW(L_MapView, buildhelp),
+	PROP_RW(L_MapView, census),
+	PROP_RW(L_MapView, statistics),
 	{0, 0, 0},
 };
 
@@ -559,6 +561,37 @@
 	return 0;
 }
 
+/* RST
+	.. attribute:: census
+
+		(RW) True if the census strings are shown on buildings, false otherwise
+*/
+int L_MapView::get_census(lua_State * L) {
+	lua_pushboolean(L, get()->get_display_flag(Interactive_Base::dfShowCensus));
+	return 1;
+}
+int L_MapView::set_census(lua_State * L) {
+	get()->set_display_flag
+		(Interactive_Base::dfShowCensus, luaL_checkboolean(L, -1));
+	return 0;
+}
+
+/* RST
+	.. attribute:: statistics
+
+		(RW) True if the statistics strings are shown on buildings, false
+		otherwise
+*/
+int L_MapView::get_statistics(lua_State * L) {
+	lua_pushboolean(L, get()->get_display_flag
+			(Interactive_Base::dfShowStatistics));
+	return 1;
+}
+int L_MapView::set_statistics(lua_State * L) {
+	get()->set_display_flag
+		(Interactive_Base::dfShowStatistics, luaL_checkboolean(L, -1));
+	return 0;
+}
 
 /*
  * Lua Functions
@@ -589,7 +622,37 @@
  * ========================================================================
  */
 
+/* RST
+.. function:: set_user_input_allowed(b)
+
+	Allow or disallow user input. Be warned, setting this will make that
+	mouse movements and keyboard presses are completely ignored. Only
+	scripted stuff will still happen.
+
+	:arg b: :const:`true` or :const:`false`
+	:type b: :class:`boolean`
+*/
+static int L_set_user_input_allowed(lua_State * L) {
+	UI::Panel::set_allow_user_input(luaL_checkboolean(L, -1));
+	return 0;
+}
+/* RST
+.. method:: get_user_input_allowed
+
+	Return the current state of this flag.
+
+	:returns: :const:`true` or :const:`false`
+	:rtype: :class:`boolean`
+*/
+static int L_get_user_input_allowed(lua_State * L) {
+	lua_pushboolean(L, UI::Panel::allow_user_input());
+	return 1;
+}
+
+
 const static struct luaL_reg wlui [] = {
+	{"set_user_input_allowed", &L_set_user_input_allowed},
+	{"get_user_input_allowed", &L_get_user_input_allowed},
 	{0, 0}
 };
 

=== modified file 'src/scripting/lua_ui.h'
--- src/scripting/lua_ui.h	2010-04-26 15:18:43 +0000
+++ src/scripting/lua_ui.h	2010-04-30 14:39:36 +0000
@@ -188,6 +188,10 @@
 	int set_viewpoint_y(lua_State *);
 	int get_buildhelp(lua_State * L);
 	int set_buildhelp(lua_State * L);
+	int get_census(lua_State * L);
+	int set_census(lua_State * L);
+	int get_statistics(lua_State * L);
+	int set_statistics(lua_State * L);
 
 	/*
 	 * Lua Methods

=== modified file 'src/scripting/scripting.cc'
--- src/scripting/scripting.cc	2010-04-25 18:47:42 +0000
+++ src/scripting/scripting.cc	2010-04-30 14:39:36 +0000
@@ -40,6 +40,11 @@
 #endif
 
 // TODO: add wl.editor to documentation
+// TODO: position or field should be on the immovable classes.
+// Check out what this BaseImmovable <-> Immovable thing is all about.
+// TODO: road must offer some access to it's fields for this to work.
+// TODO: also big buildings occupy more space: i suggest some occupied fields property
+// TODO: and also a field property
 
 /*
 ============================================

=== modified file 'src/scripting/test/ts.wmf/scripting/test_baseimmovables.lua'
--- src/scripting/test/ts.wmf/scripting/test_baseimmovables.lua	2010-04-08 14:04:31 +0000
+++ src/scripting/test/ts.wmf/scripting/test_baseimmovables.lua	2010-04-30 14:39:36 +0000
@@ -94,6 +94,8 @@
 -- -- ==============
 -- -- Property tests
 -- -- ==============
+-- TODO: add tests for immovable.fields
+-- TODO: add also tests for big buildings
 immovable_property_tests = lunit.TestCase("Immovable sizes")
 function immovable_property_tests:setup()
    self.none = wl.map.create_immovable("pebble1", wl.map.Field(19, 10))

=== added file 'src/scripting/test/ts.wmf/scripting/test_constructionsite.lua'
--- src/scripting/test/ts.wmf/scripting/test_constructionsite.lua	1970-01-01 00:00:00 +0000
+++ src/scripting/test/ts.wmf/scripting/test_constructionsite.lua	2010-04-30 14:39:36 +0000
@@ -0,0 +1,46 @@
+-- =========================
+-- Constructionsite Functionality 
+-- =========================
+constructionsite_tests = lunit.TestCase("constructionsite tests")
+function constructionsite_tests:setup()
+   self.f1 = wl.map.Field(8,10)
+   self.f2 = wl.map.Field(12,10)
+   self.p = wl.game.Player(1)
+
+   self.p:place_building("lumberjacks_hut", self.f1, true)
+   self.p:place_building("fortress", self.f2, true)
+
+   self.l = self.f1.immovable
+   self.f = self.f2.immovable
+end
+
+function constructionsite_tests:test_upcasting_from_immovable_to_building()
+   local i = self.f1.immovable
+   assert_equal(i, self.l)
+   assert_not_equal(nil, i.building)
+end
+
+function constructionsite_tests:teardown()
+   pcall(function() self.f1.brn.immovable:remove() end)
+   pcall(function() self.f2.brn.immovable:remove() end)
+end
+
+function constructionsite_tests:test_name()
+   assert_equal("constructionsite", self.l.name)
+   assert_equal("constructionsite", self.f.name)
+end
+function constructionsite_tests:test_type()
+   assert_equal("constructionsite", self.l.type)
+   assert_equal("constructionsite", self.f.type)
+end
+
+function constructionsite_tests:test_size()
+   assert_equal("small", self.l.size)
+   assert_equal("big", self.f.size)
+end
+
+function constructionsite_tests:test_building()
+   assert_equal("lumberjacks_hut", self.l.building)
+   assert_equal("fortress", self.f.building)
+end
+

=== modified file 'src/scripting/test/ts.wmf/scripting/test_flag.lua'
--- src/scripting/test/ts.wmf/scripting/test_flag.lua	2010-03-24 12:08:42 +0000
+++ src/scripting/test/ts.wmf/scripting/test_flag.lua	2010-04-30 14:39:36 +0000
@@ -9,7 +9,8 @@
 flag_tests = lunit.TestCase("flag tests")
 function flag_tests:setup()
    self.p = wl.game.Player(1)
-   self.f = self.p:place_flag(wl.map.Field(13,10), 1)
+   self.field = wl.map.Field(13,10)
+   self.f = self.p:place_flag(self.field, 1)
 end
 function flag_tests:teardown()
    pcall(self.f.remove, self.f)
@@ -21,6 +22,11 @@
 function flag_tests:test_type()
    assert_equal("flag", self.f.type)
 end
+function flag_tests:test_fields()
+   local f = self.f.fields
+   assert_equal(1, #f)
+   assert_equal(self.field, f[1])
+end
 function flag_tests:test_no_wares_on_creation()
    local rv = self.f:get_wares("all")
    cnt = 0

=== modified file 'src/scripting/test/ts.wmf/scripting/test_immovables.lua'
--- src/scripting/test/ts.wmf/scripting/test_immovables.lua	2010-04-08 14:04:31 +0000
+++ src/scripting/test/ts.wmf/scripting/test_immovables.lua	2010-04-30 14:39:36 +0000
@@ -9,6 +9,7 @@
    include "test_road"
 
    -- Buildings
+   include "test_constructionsite"
    include "test_warehouse"
    include "test_productionsite"
    include "test_militarysite"

=== modified file 'src/scripting/test/ts.wmf/scripting/test_road.lua'
--- src/scripting/test/ts.wmf/scripting/test_road.lua	2010-03-24 12:08:42 +0000
+++ src/scripting/test/ts.wmf/scripting/test_road.lua	2010-04-30 14:39:36 +0000
@@ -76,8 +76,8 @@
 
    self.start_flag = self.p:place_flag(self.f)
 
-   self.r = self.p:place_road(self.start_flag, "r", "r")
-   self.end_flag = self.f.rn.rn.immovable
+   self.r = self.p:place_road(self.start_flag, "r", "r", "br", "br")
+   self.end_flag = self.f.rn.rn.brn.brn.immovable
 end
 function road_tests:teardown()
    flags = {self.start_flag, self.end_flag}
@@ -87,7 +87,14 @@
 end
 
 function road_tests:test_length()
-   assert_equal(2, self.r.length)
+   assert_equal(4, self.r.length)
+end
+function road_tests:test_field()
+   local f = self.r.fields
+   assert_equal(#f, 3)
+   assert_equal(self.f.rn, f[1])
+   assert_equal(self.f.rn.rn, f[2])
+   assert_equal(self.f.rn.rn.brn, f[3])
 end
 function road_tests:test_roadtype()
    assert_equal("normal", self.r.road_type)
@@ -110,7 +117,7 @@
 function road_tests:test_road_upcasting()
    i = self.f.rn.immovable
    assert_equal(i, self.r)
-   assert_equal(2, i.length)
+   assert_equal(4, i.length)
 end
 
 -- ====================

=== modified file 'src/scripting/test/ts.wmf/scripting/test_ui.lua'
--- src/scripting/test/ts.wmf/scripting/test_ui.lua	2010-04-26 15:18:43 +0000
+++ src/scripting/test/ts.wmf/scripting/test_ui.lua	2010-04-30 14:39:36 +0000
@@ -161,6 +161,8 @@
 mv_tests = lunit.TestCase("MapView tests")
 function mv_tests:setup()
    self.mv = wl.ui.MapView()
+   self.mv.census = false
+   self.mv.buildhelp = false
    for n,w in pairs(self.mv.windows) do w:close() end
 end
 
@@ -169,4 +171,18 @@
    assert_not_equal(nil, self.mv.windows.field_action)
 end
 
+function mv_tests:test_census()
+   self.mv.census = 1
+   assert_equal(true, self.mv.census)
+   assert_equal(false, self.mv.statistics)
+end
+
+function mv_tests:test_statistics()
+   self.mv.statistics = 1
+   assert_equal(true, self.mv.statistics)
+   assert_equal(false, self.mv.census)
+end
+
+
+
 

=== modified file 'src/ui_basic/panel.cc'
--- src/ui_basic/panel.cc	2010-04-20 20:50:37 +0000
+++ src/ui_basic/panel.cc	2010-04-30 14:39:36 +0000
@@ -31,6 +31,11 @@
 Panel * Panel::_modal       = 0;
 Panel * Panel::_g_mousegrab = 0;
 Panel * Panel::_g_mousein   = 0;
+
+// The following variable can be set to false. If so, all mouse and keyboard
+// events are ignored and not passed on to any widget. This is only useful
+// for scripts that want to show off functionality without the user interfering.
+bool Panel::_g_allow_user_input = true;
 PictureID Panel::s_default_cursor = g_gr->get_no_picture();
 
 
@@ -824,6 +829,9 @@
  */
 void Panel::do_mousein(bool const inside)
 {
+	if (not _g_allow_user_input)
+		return;
+
 	if (!inside && _mousein) {
 		_mousein->do_mousein(false);
 		_mousein = false;
@@ -837,6 +845,9 @@
  * Returns whether the event was processed.
  */
 bool Panel::do_mousepress(const Uint8 btn, int32_t x, int32_t y) {
+	if (not _g_allow_user_input)
+		return true;
+
 	x -= _lborder;
 	y -= _tborder;
 	if (_flags & pf_top_on_click)
@@ -851,6 +862,9 @@
 	return handle_mousepress(btn, x, y);
 }
 bool Panel::do_mouserelease(const Uint8 btn, int32_t x, int32_t y) {
+	if (not _g_allow_user_input)
+		return true;
+
 	x -= _lborder;
 	y -= _tborder;
 	if (_g_mousegrab != this)
@@ -866,6 +880,9 @@
 	(Uint8 const state,
 	 int32_t x, int32_t y, int32_t const xdiff, int32_t const ydiff)
 {
+	if (not _g_allow_user_input)
+		return true;
+
 	x -= _lborder;
 	y -= _tborder;
 	if (_g_mousegrab != this)
@@ -886,6 +903,9 @@
  */
 bool Panel::do_key(bool const down, SDL_keysym const code)
 {
+	if (not _g_allow_user_input)
+		return true;
+
 	if (_focus) {
 		if (_focus->do_key(down, code))
 			return true;
@@ -950,10 +970,16 @@
  * panel.
 */
 void Panel::ui_mousepress(const Uint8 button, int32_t x, int32_t y) {
+	if (not _g_allow_user_input)
+		return;
+
 	if (Panel * const p = ui_trackmouse(x, y))
 		p->do_mousepress(button, x, y);
 }
 void Panel::ui_mouserelease(const Uint8 button, int32_t x, int32_t y) {
+	if (not _g_allow_user_input)
+		return;
+
 	if (Panel * const p = ui_trackmouse(x, y))
 		p->do_mouserelease(button, x, y);
 }
@@ -966,6 +992,9 @@
 	(Uint8 const state,
 	 int32_t x, int32_t y, int32_t const xdiff, int32_t const ydiff)
 {
+	if (not _g_allow_user_input)
+		return;
+
 	if (!xdiff && !ydiff)
 		return;
 
@@ -988,6 +1017,9 @@
  */
 void Panel::ui_key(bool const down, SDL_keysym const code)
 {
+	if (not _g_allow_user_input)
+		return;
+
 	_modal->do_key(down, code);
 }
 

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2010-04-26 15:06:30 +0000
+++ src/ui_basic/panel.h	2010-04-30 14:39:36 +0000
@@ -208,6 +208,8 @@
 	void set_snapparent(bool snapparent);
 	bool get_snapparent() const {return _flags & pf_snap_parent_size;}
 
+	inline static void set_allow_user_input(bool t) {_g_allow_user_input=t;}
+	inline static bool allow_user_input(void) {return _g_allow_user_input;}
 
 protected:
 	void die();
@@ -230,6 +232,7 @@
 		(const Uint8 state, int32_t x, int32_t y, int32_t xdiff, int32_t ydiff);
 	bool do_key(bool down, SDL_keysym code);
 
+
 	Panel * _parent;
 	Panel * _next, * _prev;
 	Panel * _fchild, * _lchild; //  first, last child
@@ -269,6 +272,7 @@
 	static Panel * _modal;
 	static Panel * _g_mousegrab;
 	static Panel * _g_mousein;
+	static bool _g_allow_user_input;
 	static PictureID s_default_cursor;
 };
 

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2010-04-24 13:39:38 +0000
+++ src/wlapplication.cc	2010-04-30 14:39:36 +0000
@@ -622,8 +622,6 @@
 			break;
 
 		case SDL_MOUSEMOTION:
-			// All the interesting stuff is now in Sys_PollEvent()
-
 			m_mouse_position = Point(ev.motion.x, ev.motion.y);
 
 			if ((ev.motion.xrel or ev.motion.yrel) and cb and cb->mouse_move)

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2010-04-25 18:47:42 +0000
+++ src/wui/interactive_base.cc	2010-04-30 14:39:36 +0000
@@ -301,7 +301,7 @@
 	// If one of the arrow keys is pressed, scroll here
 	const uint32_t scrollval = 10;
 
-	if (keyboard_free()) {
+	if (keyboard_free() && Panel::allow_user_input()) {
 		if (get_key_state(SDLK_UP))
 			set_rel_viewpoint(Point(0, -scrollval));
 		if (get_key_state(SDLK_DOWN))
@@ -590,7 +590,10 @@
 		// Build the path as requested
 		ref_cast<Game, Editor_Game_Base>(egbase()).send_player_build_road
 			(m_road_build_player, *new Widelands::Path(*m_buildroad));
-		if (get_key_state(SDLK_LCTRL) || get_key_state(SDLK_RCTRL)) {
+		if
+			(allow_user_input() and
+			 (get_key_state(SDLK_LCTRL) or get_key_state(SDLK_RCTRL)))
+		{
 			//  place flags
 			Map const & map = egbase().map();
 			std::vector<Coords>         const &       c_vector =