Merge lp:~lcsand/widelands/bug-787508 into lp:~hjd/widelands/remove-strongholds-bug-787508

[Leif Sandstede]

Removed all strongholds from the campaign.

[Hans Joachim Desserud (hjd)]

I have now played through the maps in question with your changes, and as far as I can see, they work.

Though I would like to see both in barbarian #2 and empire #2, that the stronghold is replaced with barrier rather than removed all together. This way, the players would still be able to build medium-sized military buildings, and something other than just sentries.
The AI in empire #2 didn't seem like much of a threat and rather repeating with only sentries, and a medium-sized building in barbarian #2 makes it easier to explore the entire map (hint, hint).

Nice work. :)

[Hans Joachim Desserud (hjd)]

This branch was merged to trunk a while back, and as such does not need to be merged with my branch. Though it is still listed among active reviews in Widelands, even though it has been resolved. I know changing status to "Rejected" is a bit misleading, but it seems to be the only status which describes "this branch was not merged into this."

=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
--- campaigns/emp02.wmf/scripting/starting_conditions.lua	2011-05-10 13:32:28 +0000
+++ campaigns/emp02.wmf/scripting/starting_conditions.lua	2011-05-27 18:21:14 +0000
@@ -83,7 +83,6 @@
    "rangers_hut",
    "sentry",
    "lime_kiln",
-   "stronghold",
    "tavern",
    "well",
 }

=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua'
--- campaigns/t02.wmf/scripting/mission_thread.lua	2011-03-19 13:40:16 +0000
+++ campaigns/t02.wmf/scripting/mission_thread.lua	2011-05-27 18:21:14 +0000
@@ -183,10 +183,10 @@
 function build_materials_thread()
    local plr = wl.Game().players[1]
 
-   -- Wait for a barrier or a sentry to be build
+   -- Wait for a sentry to be build
    while true do
-      local rv = plr:get_buildings{"sentry", "stronghold"}
-      if #rv.sentry + #rv.stronghold > 0 then
+      local rv = plr:get_buildings{"sentry"}
+      if #rv.sentry > 0 then
          break
       end
       sleep(5421)

=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
--- campaigns/t02.wmf/scripting/mission_thread_texts.lua	2010-11-15 21:23:02 +0000
+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua	2011-05-27 18:21:14 +0000
@@ -82,7 +82,7 @@
    name = "mission quarry",
    title =_"Expand north-east and build a quarry",
    body = obj_text(_"Expand north-east to the stones", _
-[[Build military buildings (like sentries and strongholds) to expand your
+[[Build military buildings (like sentries) to expand your
 territory. Get to the rocks northeast from you and build a quarry there.]]
    ),
 }

=== modified file 'campaigns/t02.wmf/scripting/starting_conditions.lua'
--- campaigns/t02.wmf/scripting/starting_conditions.lua	2010-10-24 09:49:23 +0000
+++ campaigns/t02.wmf/scripting/starting_conditions.lua	2011-05-27 18:21:14 +0000
@@ -8,8 +8,7 @@
    "lumberjacks_hut",
    "quarry", 
    "rangers_hut", 
-   "sentry",
-   "stronghold"
+   "sentry"
 }
 
 -- Place hq and fill it with wares

=== modified file 'campaigns/t03.wmf/scripting/mission_thread.lua'
--- campaigns/t03.wmf/scripting/mission_thread.lua	2010-10-09 21:34:52 +0000
+++ campaigns/t03.wmf/scripting/mission_thread.lua	2011-05-27 18:21:14 +0000
@@ -87,7 +87,7 @@
    send_msg(order_msg_3_explore_further)
    o = add_obj(obj_explore_further)
    
-   p1:allow_buildings{"sentry", "stronghold", "barrier"}
+   p1:allow_buildings{"sentry", "barrier"}
 
    -- Wait till we see the mountain and at least one frontier
    while true do
@@ -265,8 +265,8 @@
    do sleep(6834) end
 
    prefilled_buildings(p1, 
-      {"stronghold", 118, 100, soldiers = 
-         {[{0,0,0,0}]=1, [{1,1,0,1}] = 1, [{0,1,0,0}] = 1}
+      {"barrier", 118, 100, soldiers = 
+         {[{0,0,0,0}]= 1, [{1,1,0,1}] = 1, [{0,1,0,0}] = 1}
       }, 
       {"citadel", 117, 97, soldiers = {
          [{0,0,0,0}]=3, [{1,1,0,0}]=1, [{0,0,0,1}]=2,

=== modified file 'campaigns/t03.wmf/scripting/starting_conditions.lua'
--- campaigns/t03.wmf/scripting/starting_conditions.lua	2010-11-16 16:05:08 +0000
+++ campaigns/t03.wmf/scripting/starting_conditions.lua	2011-05-27 18:21:14 +0000
@@ -78,11 +78,11 @@
    {"barrier", 104, 18, soldiers = {[{0,0,0,0}]=4}},
    {"barrier", 102, 103, soldiers = {[{0,0,0,0}]=2, [{0,1,0,1}]=1}},
    {"barrier", 103, 96, soldiers = {[{0,0,0,0}]=3}}, 
-   {"stronghold", 104, 110, soldiers = {[{0,0,0,0}]=2}},
-   {"stronghold", 104, 30, soldiers = {
+   {"barrier", 104, 110, soldiers = {[{0,0,0,0}]=2}},
+   {"barrier", 104, 30, soldiers = {
       [{0,1,0,1}]=1, [{1,0,0,0}]=1, [{0,0,0,0}]=1
    }},
-   {"stronghold", 102, 90, soldiers = {[{0,0,0,0}]=1}},
+   {"barrier", 102, 90, soldiers = {[{0,0,0,0}]=1}},
    {"sentry", 108, 3, soldiers = {[{0,0,0,0}]=2}},
    {"sentry", 107, 104, soldiers = {[{0,0,0,0}]=1}},
    {"sentry", 110, 19, soldiers = {[{0,0,0,0}]=2}},
@@ -101,7 +101,7 @@
    {"fortress", 135, 85, soldiers = {
       [{0,0,0,0}]=4, [{1,0,0,0}]=2, [{1,1,0,0}]=2,
    }},
-   {"stronghold", 132, 78, soldiers = {
+   {"barrier", 132, 78, soldiers = {
       [{0,0,0,0}]=1, [{1,1,0,1}]=1, [{0,1,0,0}]=1,
    }}
 )
@@ -125,7 +125,7 @@
    {"donjon", 132, 7, soldiers = {
       [{0,0,0,0}]=2, [{1,1,0,0}]=1, [{1,0,0,1}]=1,
    }},
-   {"stronghold", 132, 3, soldiers = {
+   {"barrier", 132, 3, soldiers = {
       [{0,0,0,0}]=1, [{1,0,0,1}]=1, [{0,1,0,1}]=1, 
    }},
    {"warmill", 135, 7}