Merge lp:~widelands-dev/widelands/barbarians2-starting-objective into lp:widelands

[GunChleoc]

Barbarian Campaign 2: Added an objective to the first message.

Some players find it confusing that the second Barbarian scenario has no instructions in the first message. So, I have added some. This also requires the player to expand to the east a bit, which will get them closer to the tracks.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

The read operation timed out

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

The read operation timed out

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1083. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/127258989.
Appveyor build 914. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_barbarians2_starting_objective-914.

[Miroslav Remák (miroslavr256)]

LGTM.

review: Approve (code, testing)

[GunChleoc (gunchleoc)]

Thanks!

@bunnybot merge

=== modified file 'data/campaigns/bar02.wmf/scripting/mission_thread.lua'
--- data/campaigns/bar02.wmf/scripting/mission_thread.lua	2016-01-28 05:24:34 +0000
+++ data/campaigns/bar02.wmf/scripting/mission_thread.lua	2016-05-02 15:51:07 +0000
@@ -38,7 +38,19 @@
    wake_me(2000)
    campaign_message_box(story_msg_1)
 
-   wake_me(120000)
+   local o = add_campaign_objective(obj_build_basic_economy)
+   while not check_for_buildings(p1, {
+         barbarians_lumberjacks_hut = 1,
+         barbarians_rangers_hut = 1,
+         barbarians_quarry = 1,
+         barbarians_wood_hardener = 1,
+      }) do sleep(3413) end
+   while not check_for_buildings(p1, {barbarians_sentry=1}, game.map:get_field(57,36):region(6)) do
+      sleep(1500)
+   end
+   o.done = true
+   sleep(3000)
+   
    campaign_message_box(briefing_msg_1)
    campaign_message_box(order_msg_1_small_food_economy)
 
@@ -53,7 +65,7 @@
       "barbarians_sentry",
    }
 
-   local o = add_campaign_objective(obj_build_small_food_economy)
+   o = add_campaign_objective(obj_build_small_food_economy)
    while not check_for_buildings(p1, {
          barbarians_fishers_hut = 1,
          barbarians_hunters_hut = 1,

=== modified file 'data/campaigns/bar02.wmf/scripting/texts.lua'
--- data/campaigns/bar02.wmf/scripting/texts.lua	2016-01-28 05:24:34 +0000
+++ data/campaigns/bar02.wmf/scripting/texts.lua	2016-05-02 15:51:07 +0000
@@ -16,6 +16,21 @@
 -- =======================================================================
 
 
+obj_build_basic_economy = {
+   name = "build_basic_food_economy",
+   title = _"Build up a basic economy",
+   number = 5,
+   body = objective_text(_"Build up a basic economy",
+      _"Start collecting basic building materials, and fortify the camp."
+      .. paragraphdivider() ..
+      listitem_bullet(_"Build a lumberjack’s hut") ..
+      listitem_bullet(_"Build a ranger’s hut") ..
+      listitem_bullet(_"Build a quarry") ..
+      listitem_bullet(_"Build a wood hardener") ..
+      listitem_bullet(_"Build a sentry on the eastern border") ..
+      listitem_arrow(_"You should eventually also build a reed yard and a lime kiln."))
+}
+
 obj_build_small_food_economy = {
    name = "build_small_food_economy",
    title = _"Build up a small food economy",
@@ -149,6 +164,7 @@
       .. paragraphdivider() ..
       -- TRANSLATORS: Thron
       _([[For now, we are resting at the borders of the old forest and preparing for the coming days.]]))
+      .. new_objectives(obj_build_basic_economy)
 }
 
 story_msg_2 = {