Merge lp:~widelands-dev/widelands/show_barbarian_not_yet_implemented into lp:widelands

Proposed by kaputtnik
Status: Merged
Merged at revision: 8562
Proposed branch: lp:~widelands-dev/widelands/show_barbarian_not_yet_implemented
Merge into: lp:widelands
Diff against target: 28 lines (+6/-1)
2 files modified
data/campaigns/bar02.wmf/scripting/mission_thread.lua (+2/-1)
data/campaigns/campaigns.conf (+4/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/show_barbarian_not_yet_implemented
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+336399@code.launchpad.net

Commit message

Show Not yet implemented after completing the barbarians campaign

Description of the change

Show dummy map "Not yet implemented" in the campaign screen after the barbarians campaign has been completed.

Although the last message do inform the player that this was the last campaign for barbarians, it confuses a player if the "Not yet implemented" message does not show up.

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

Continuous integration builds have changed state:

Travis build 3080. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/331423818.
Appveyor build 2887. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_show_barbarian_not_yet_implemented-2887.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

changes look fine for me

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks :-)

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/campaigns/bar02.wmf/scripting/mission_thread.lua'
--- data/campaigns/bar02.wmf/scripting/mission_thread.lua 2017-07-12 06:13:59 +0000
+++ data/campaigns/bar02.wmf/scripting/mission_thread.lua 2018-01-21 10:31:21 +0000
@@ -375,7 +375,8 @@
375 scroll_to_field(map:get_field(4,5))375 scroll_to_field(map:get_field(4,5))
376376
377 campaign_message_box(story_msg_7)377 campaign_message_box(story_msg_7)
378378
379 p1:reveal_scenario("barbariantut02")
379 p1:reveal_campaign("campsect1")380 p1:reveal_campaign("campsect1")
380end381end
381382
382383
=== modified file 'data/campaigns/campaigns.conf'
--- data/campaigns/campaigns.conf 2017-12-14 07:55:19 +0000
+++ data/campaigns/campaigns.conf 2018-01-21 10:31:21 +0000
@@ -73,6 +73,10 @@
73visible=073visible=0
74path="campaigns/bar02.wmf"74path="campaigns/bar02.wmf"
7575
76[barbariantut02]
77name=_"Not yet implemented"
78visible=0
79path="campaigns/dummy.wmf"
7680
77[empiretut00]81[empiretut00]
78name=_"The Strands of Malac’ Mor"82name=_"The Strands of Malac’ Mor"

Subscribers

People subscribed via source and target branches

to status/vote changes: