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

[hessenfarmer]

Small improvements of scenario empire03 due to forum remarks

building plot where to build the port is conquered now after being found, so the port will be buildable in any case if the center field is conquered.
well is available earlier (comes with the melt gold objective) to start brewing beer.
melting gold objective is triggered a minute after the port building plot is discovered.
Texts have been changed slightly to reflect new trigger of gold objective

[GunChleoc (gunchleoc)]

LGTM, I just added a small string fix.

@bunnybot merge

review: Approve

[hessenfarmer (stephan-lutz)]

Thanks. I'm afraid I will never get these issues right ;-)

[GunChleoc (gunchleoc)]

No problem, the finer points of the English languages aren't exactly easy.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3973. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/428600771.
Appveyor build 3771. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_empire03_improve-3771.

=== modified file 'data/campaigns/emp03.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp03.wmf/scripting/mission_thread.lua	2018-07-07 10:53:30 +0000
+++ data/campaigns/emp03.wmf/scripting/mission_thread.lua	2018-09-14 11:31:04 +0000
@@ -132,10 +132,11 @@
 function ship_industry()
    local objective = add_campaign_objective(obj_build_port_and_shipyard)
 
-   -- Check for port built to realize we need gold
-   while not check_for_buildings(p1, {empire_port = 1}) do sleep(2434) end
+   -- Wait a minute to realize we need more gold to build expeditions
+   sleep(60000)
    campaign_message_box(amalea_6)
    p1:allow_buildings{
+      "empire_well",
       "empire_brewery",
       "empire_coalmine",
       "empire_coalmine_deep",
@@ -194,7 +195,6 @@
    -- We need to turn the wheat into cloth for building ships
    objective = add_campaign_objective(obj_produce_cloth)
    p1:allow_buildings{
-      "empire_well",
       "empire_sheepfarm",
       "empire_weaving_mill",
       "empire_charcoal_kiln",
@@ -369,6 +369,7 @@
 
    local port = map:get_field(17, 17)
    while port.owner ~= p1 do sleep(3000) end
+   p1:conquer(port,4)
 
    sleep(3213)
    objective.done = true

=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua	2018-01-31 15:30:53 +0000
+++ data/campaigns/emp03.wmf/scripting/texts.lua	2018-09-14 11:31:04 +0000
@@ -434,7 +434,7 @@
    title=_"Amalea Advises",
    body= amalea3(_"Amalea looks thoughtful…",
       -- TRANSLATORS: Amalea
-      _([[Salve Lutius. While talking to all our brave builders, they told me that they had to use up all our remaining gold for building the port. Now we don’t have any gold left.]])
+      _([[Salve Lutius. While talking to all our brave builders, they told me that they have to use all our remaining gold for building the port. So, we won’t have any gold left after our port is build.]])
       .. paragraphdivider() ..
       -- TRANSLATORS: Amalea
       _([[But the problem is that for sending out an expedition, we need some gold.]])