widelands-dev team mailing list archive

[Leif Sandstede <widelands@xxxxxxxxxxxx>]

Leif Sandstede has proposed merging lp:~widelands-sandstede/widelands/fix-bug-741142 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #741142 in widelands: "Empire Tut 2 - missing event when barbarians are detected"
  https://bugs.launchpad.net/widelands/+bug/741142
  Bug #780409 in widelands: "Scenario does not continue in empire 2 campaign"
  https://bugs.launchpad.net/widelands/+bug/780409

For more details, see:
https://code.launchpad.net/~widelands-sandstede/widelands/fix-bug-741142/+merge/60508

This fixes Bug 780409 and possibly Bug 741142 wich are both in Empire tut 2.
Very simple changes.
-- 
https://code.launchpad.net/~widelands-sandstede/widelands/fix-bug-741142/+merge/60508
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-sandstede/widelands/fix-bug-741142 into lp:widelands.

=== modified file 'campaigns/emp02.wmf/scripting/mission_thread.lua'
--- campaigns/emp02.wmf/scripting/mission_thread.lua	2011-01-04 12:17:44 +0000
+++ campaigns/emp02.wmf/scripting/mission_thread.lua	2011-05-10 13:53:30 +0000
@@ -202,10 +202,10 @@
    -- Wait for various buildings to go up
    while true do
       local rv = p1:get_buildings{
-         "marblemine", "oremine", "deep_oremine", 
+         "marblemine", "deep_marblemine", "oremine", "deep_oremine",
          "coalmine", "deep_coalmine", "burners_house"
       }
-      local mm = #rv.marblemine
+      local mm = #rv.marblemine + #rv.deep_marblemine
       local ore = #rv.oremine + #rv.deep_oremine
       local coal = #rv.coalmine + #rv.deep_coalmine + #rv.burners_house
 
@@ -225,6 +225,7 @@
    send_msg(diary_page_8)
    local o = add_obj(obj_build_bigger_military_buildings)
    p1:allow_buildings{"outpost", "barrier", "tower"}
+   p2:allow_buildings{"quarry"}
 
    -- Wait for one of the buildings to go up
    while true do

=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- campaigns/emp02.wmf/scripting/starting_conditions.lua	2010-03-14 13:04:53 +0000
+++ campaigns/emp02.wmf/scripting/starting_conditions.lua	2011-05-10 13:53:30 +0000
@@ -80,7 +80,6 @@
    "hunters_hut",
    "lumberjacks_hut",
    "micro-brewery",
-   "quarry",
    "rangers_hut",
    "sentry",
    "lime_kiln",