Merge lp:~hjd/widelands/adding-barriers-bug-787508 into lp:widelands

Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 5943
Proposed branch: lp:~hjd/widelands/adding-barriers-bug-787508
Merge into: lp:widelands
Diff against target: 56 lines (+7/-5)
4 files modified
campaigns/emp02.wmf/scripting/starting_conditions.lua (+1/-0)
campaigns/t02.wmf/scripting/mission_thread.lua (+3/-3)
campaigns/t02.wmf/scripting/mission_thread_texts.lua (+1/-1)
campaigns/t02.wmf/scripting/starting_conditions.lua (+2/-1)
To merge this branch: bzr merge lp:~hjd/widelands/adding-barriers-bug-787508
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+70653@code.launchpad.net

Description of the change

When strongholds were removed, this left some of the missions without any medium-sized military buildings at all. I think it would be better to replace the strongholds with barriers than just remove them. See also my comment on https://code.launchpad.net/~lcsand/widelands/bug-787508/+merge/62722

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

I agree to your fixes. They have been merged to 5943. Sorry for taking ages again :/.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'campaigns/emp02.wmf/scripting/starting_conditions.lua'
2--- campaigns/emp02.wmf/scripting/starting_conditions.lua 2011-05-27 18:09:33 +0000
3+++ campaigns/emp02.wmf/scripting/starting_conditions.lua 2011-08-06 16:51:07 +0000
4@@ -73,6 +73,7 @@
5 p2:forbid_buildings("all")
6 p2:allow_buildings{
7 "bakery",
8+ "barrier",
9 "farm",
10 "fernery",
11 "fishers_hut",
12
13=== modified file 'campaigns/t02.wmf/scripting/mission_thread.lua'
14--- campaigns/t02.wmf/scripting/mission_thread.lua 2011-05-27 18:09:33 +0000
15+++ campaigns/t02.wmf/scripting/mission_thread.lua 2011-08-06 16:51:07 +0000
16@@ -183,10 +183,10 @@
17 function build_materials_thread()
18 local plr = wl.Game().players[1]
19
20- -- Wait for a sentry to be build
21+ -- Wait for a barrier or sentry to be build
22 while true do
23- local rv = plr:get_buildings{"sentry"}
24- if #rv.sentry > 0 then
25+ local rv = plr:get_buildings{"sentry", "barrier"}
26+ if #rv.sentry + #rv.barrier > 0 then
27 break
28 end
29 sleep(5421)
30
31=== modified file 'campaigns/t02.wmf/scripting/mission_thread_texts.lua'
32--- campaigns/t02.wmf/scripting/mission_thread_texts.lua 2011-05-27 18:09:33 +0000
33+++ campaigns/t02.wmf/scripting/mission_thread_texts.lua 2011-08-06 16:51:07 +0000
34@@ -82,7 +82,7 @@
35 name = "mission quarry",
36 title =_"Expand north-east and build a quarry",
37 body = obj_text(_"Expand north-east to the stones", _
38-[[Build military buildings (like sentries) to expand your
39+[[Build military buildings (like sentries or barriers) to expand your
40 territory. Get to the rocks northeast from you and build a quarry there.]]
41 ),
42 }
43
44=== modified file 'campaigns/t02.wmf/scripting/starting_conditions.lua'
45--- campaigns/t02.wmf/scripting/starting_conditions.lua 2011-05-27 18:09:33 +0000
46+++ campaigns/t02.wmf/scripting/starting_conditions.lua 2011-08-06 16:51:07 +0000
47@@ -8,7 +8,8 @@
48 "lumberjacks_hut",
49 "quarry",
50 "rangers_hut",
51- "sentry"
52+ "sentry",
53+ "barrier"
54 }
55
56 -- Place hq and fill it with wares

Subscribers

People subscribed via source and target branches

to status/vote changes: