Merge lp:~f-thiessen/widelands/barbarian3 into lp:widelands

[Ferdinand T.]

This fixes some bugs with the third barbarian campaign:
* Now it is needed to conquer all military buildings of the enemies (bug 1298411)
* Event "Build a Donjohn" triggers now not so early (bug 1276247)
* "explore further" is now active until the "Boldreth shouts out!" event (bug 674839)

[SirVer (sirver)]

Couple of nits.

review: Needs Fixing

[SirVer (sirver)]

Tangent for you too: I added you to the team now. Please push future branches to ~widelands-dev/widelands/ instead of your private user space. This allows others to add in-source comment and collaborate on your work.

Welcome to the team :)

[GunChleoc (gunchleoc)]

I have an idea for check_player_completly_defeated - see inline comment

[Ferdinand T. (f-thiessen)]

Thank you for adding to the group ;)
I think I fixed the issues, sorry for the weird English.
The check_player_completely_defeated function is in my opinion ok, because this are the building the enemies have (hard-coded in start conditions of this campaign, and the AI is not allowed to build new and/or other buildings).
But for a flexible function your suggestion would be helpful!

[SirVer (sirver)]

Looks good! Thanks for fixing this issues.

review: Approve

=== modified file 'campaigns/t03.wmf/scripting/mission_thread.lua'
--- campaigns/t03.wmf/scripting/mission_thread.lua	2014-03-15 13:36:42 +0000
+++ campaigns/t03.wmf/scripting/mission_thread.lua	2014-07-21 14:49:19 +0000
@@ -2,11 +2,22 @@
 --                          Various mission threads
 -- =======================================================================
 
+game = wl.Game()
 -- Mountain and frontier fields
-mountain = wl.Game().map:get_field(71,14)
-fr1 = wl.Game().map:get_field(81,108)
-fr2 = wl.Game().map:get_field(85,1)
-fr3 = wl.Game().map:get_field(85,11)
+mountain = game.map:get_field(71,14)
+fr1 = game.map:get_field(81,108)
+fr2 = game.map:get_field(85,1)
+fr3 = game.map:get_field(85,11)
+
+function check_conquered_footprints()
+    if p1:seen_field(game.map:get_field(65, 28))
+    then
+        sleep(2129)
+        if p1:sees_field(game.map:get_field(65, 28))
+        then return true end
+    end
+    return false
+end
 
 function remember_cattlefarm()
    sleep(100)
@@ -16,7 +27,7 @@
    p1:allow_buildings{"cattlefarm"}
    local o = add_obj(obj_build_cattlefarm)
    while not check_for_buildings(p1, {cattlefarm = 1}) do
-      sleep(1234) end
+      sleep(1223) end
    o.done = true
 
 end
@@ -36,7 +47,9 @@
       "farm",
       "well",
       "bakery",
+      "sentry",
    }
+
    local o = add_obj(obj_build_small_food_economy)
    while not check_for_buildings(p1, {
          fishers_hut = 1,
@@ -44,7 +57,7 @@
          well = 1,
          farm = 1,
          bakery = 1,
-      }) do sleep(3412) end
+      }) do sleep(3413) end
    o.done = true
    send_msg(story_note_1)
 
@@ -54,22 +67,22 @@
 
 function foottracks()
    -- Hunter build and some time passed or expanded east
-   local game = wl.Game()
    while true do
-      if (game.time > 900000 and #p1:get_buildings("hunters_hut") > 0)
-         or p1:seen_field(wl.Game().map:get_field(65, 28))
+      if game.time > 900000 and #p1:get_buildings("hunters_hut") > 0
+      then break end
+      if check_conquered_footprints()
       then break end
       sleep(4239)
    end
 
    local fields = array_combine(
-      wl.Game().map:get_field(67, 19):region(2),
-      wl.Game().map:get_field(65, 19):region(2),
-      wl.Game().map:get_field(69, 18):region(2)
+      game.map:get_field(67, 19):region(2),
+      game.map:get_field(65, 19):region(2),
+      game.map:get_field(69, 18):region(2)
    )
    p1:reveal_fields(fields)
 
-   local pts = scroll_smoothly_to(wl.Game().map:get_field(67,19))
+   local pts = scroll_smoothly_to(game.map:get_field(67,19))
 
    send_msg(order_msg_2_build_a_donjon)
    local o = add_obj(obj_build_a_donjon)
@@ -79,13 +92,14 @@
    timed_scroll(array_reverse(pts), 10)
 
    -- Hide the tracks again
-   sleep(5000)
+   sleep(5003)
    p1:hide_fields(fields)
 
    while not check_for_buildings(p1, {donjon=1}) do sleep(2341) end
    o.done = true
    send_msg(order_msg_3_explore_further)
-   o = add_obj(obj_explore_further)
+   -- "explore further" is active untill "Boldreth shout out", so the player always has one open objectve.
+   exploration_objective = add_obj(obj_explore_further)
 
    p1:allow_buildings{"sentry", "barrier"}
 
@@ -99,7 +113,6 @@
 
       sleep(3244)
    end
-   o.done = true
 end
 
 function mining_and_trainingsites()
@@ -107,12 +120,12 @@
 
    -- Show the other mountains permanently
    p1:reveal_fields(array_combine(
-      wl.Game().map:get_field(77, 98):region(7),
-      wl.Game().map:get_field(79, 6):region(5),
-      wl.Game().map:get_field(82, 20):region(6))
+      game.map:get_field(77, 98):region(7),
+      game.map:get_field(79, 6):region(5),
+      game.map:get_field(82, 20):region(6))
    )
 
-   local pts = scroll_smoothly_to(wl.Game().map:get_field(82,20))
+   local pts = scroll_smoothly_to(game.map:get_field(82,20))
 
    send_msg(order_msg_4_build_mining_economy)
    local o = add_obj(obj_build_mining_economy)
@@ -125,6 +138,7 @@
       "smelting_works",
       "metalworks",
       "burners_house",
+      "micro-brewery",
    }
 
    timed_scroll(array_reverse(pts), 10)
@@ -163,7 +177,6 @@
       "deeper_goldmine",
       "deeper_oremine",
       "warehouse",
-      "micro-brewery",
       "brewery",
    }
    run(check_warehouse_obj, add_obj(obj_build_a_warehouse))
@@ -215,10 +228,10 @@
 function expansion()
    -- While enemy has not been seen
    while not (
-      p1:seen_field(wl.Game().map:get_field(95, 91)) or
-      p1:seen_field(wl.Game().map:get_field(96, 107)) or
-      p1:seen_field(wl.Game().map:get_field(96, 8)) or
-      p1:seen_field(wl.Game().map:get_field(96, 19))
+      p1:seen_field(game.map:get_field(95, 91)) or
+      p1:seen_field(game.map:get_field(96, 107)) or
+      p1:seen_field(game.map:get_field(96, 8)) or
+      p1:seen_field(game.map:get_field(96, 19))
       )
    do sleep(8374) end
 
@@ -231,9 +244,20 @@
    send_msg(story_msg_6)
 end
 
+-- checks if all military buildings are drestroyed (the build-in function "defeated" only checks if all warehouses are destroyed)
+function check_player_completely_defeated(dp)
+    if #dp:get_buildings("fortress")  > 0 then return false end
+    if #dp:get_buildings("citadel")   > 0 then return false end
+    if #dp:get_buildings("donjon")    > 0 then return false end
+    if #dp:get_buildings("barrier")   > 0 then return false end
+    if #dp:get_buildings("sentry")    > 0 then return false end
+    if #dp:get_buildings("warehouse") > 0 then return false end
+    return true
+end
+
 function kalitath()
    -- While no contact with kalithat
-   local map = wl.Game().map
+   local map = game.map
    while not (
       p1:seen_field(map:get_field( 92,  91)) or
       p1:seen_field(map:get_field(102, 103)) or
@@ -242,18 +266,22 @@
       p1:seen_field(map:get_field(103,  17)) or
       p1:seen_field(map:get_field( 96,  30))
       )
-   do sleep(7834) end
+   do sleep(7829) end
+   -- "explore further" is done
+   exploration_objective.done = true
 
    send_msg(order_msg_7_destroy_kalitaths_army)
    local o = add_obj(obj_destroy_kalitaths_army)
 
-   while not p2.defeated do sleep(7837) end
+   while not check_player_completely_defeated(p2) do
+        sleep(7837)
+   end
    o.done = true
 end
 
 function renegade_fortresses()
    -- Wait till we see the fortresses
-   local map = wl.Game().map
+   local map = game.map
    while not (
       p1:seen_field(map:get_field(111, 88 )) or
       p1:seen_field(map:get_field(110, 97 )) or
@@ -262,7 +290,7 @@
       p1:seen_field(map:get_field(114, 14 )) or
       p1:seen_field(map:get_field(116, 21 ))
       )
-   do sleep(6834) end
+   do sleep(6833) end
 
    prefilled_buildings(p1,
       {"barrier", 118, 100, soldiers =
@@ -285,18 +313,21 @@
    local o = add_obj(obj_military_assault_on_althunran)
 
    timed_scroll(array_reverse(pts))
-   sleep(500)
+   sleep(503)
 
-   while not (p3.defeated and p4.defeated) do
-      sleep(6734)
+   while not (check_player_completely_defeated(p3) and check_player_completely_defeated(p4)) do
+      sleep(6733)
    end
 
    o.done = true
 end
 
 function mission_complete()
-   local map = wl.Game().map
-   while not (p2.defeated and p3.defeated and p4.defeated) do
+   local map = game.map
+   while not (
+      check_player_completely_defeated(p2) and
+      check_player_completely_defeated(p3) and
+      check_player_completely_defeated(p4)) do
       sleep(8923)
    end