Merge lp:~widelands-dev/widelands/unlock-all-campaigns into lp:widelands

Proposed by GunChleoc on 2019-05-13
Status: Merged
Merged at revision: 9108
Proposed branch: lp:~widelands-dev/widelands/unlock-all-campaigns
Merge into: lp:widelands
Diff against target: 37 lines (+3/-10)
1 file modified
data/campaigns/campaigns.lua (+3/-10)
To merge this branch: bzr merge lp:~widelands-dev/widelands/unlock-all-campaigns
Reviewer Review Type Date Requested Status
hessenfarmer review 2019-05-13 Approve on 2019-05-14
Review via email: mp+367371@code.launchpad.net

Commit message

Unlock all campaigns

Description of the change

See discussion on the forum:

https://wl.widelands.org/forum/topic/4515/

To post a comment you must log in.
hessenfarmer (stephan-lutz) wrote :

Code LGTM.

review: Approve (review)
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4968. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/531939662.
Appveyor build 4749. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_unlock_all_campaigns-4749.

hessenfarmer (stephan-lutz) wrote :

Travis failure is transient (once again a download of a resource failed)

@bunnybot merge

bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4968. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/531939662.

hessenfarmer (stephan-lutz) wrote :

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/campaigns.lua'
2--- data/campaigns/campaigns.lua 2018-12-13 23:32:55 +0000
3+++ data/campaigns/campaigns.lua 2019-05-13 18:33:36 +0000
4@@ -76,9 +76,9 @@
5 -- If `prerequisites` is present, the campaign is greyed out by default.
6 -- The campaign will become unlocked when any of the referenced scenarios
7 -- have been solved.
8- prerequisites = {
9- "bar01.wmf",
10- },
11+ -- prerequisites = {
12+ -- "bar01.wmf",
13+ -- },
14 scenarios = {
15 "emp01.wmf",
16 "emp02.wmf",
17@@ -96,9 +96,6 @@
18 difficulty = { level=3, description=_"Introduces the Atlanteans." },
19 -- TRANSLATORS: A long description of a campign
20 description = _"When their God lost faith in the Atlanteans and drowned their island, one woman’s struggle for justice and a second chance for her people would become the stuff of legends. Leading the remaining Atlanteans into a new future in a new part of the World, Jundlina became the most powerful human of her time, but at a high cost: her humanity and soul.",
21- prerequisites = {
22- "emp02.wmf",
23- },
24 scenarios = {
25 "atl01.wmf",
26 "dummy.wmf"
27@@ -113,10 +110,6 @@
28 difficulty = { level=4, description=_"Introduces the Frisians." },
29 -- TRANSLATORS: A long description of a campign
30 description = _"Living off the ocean is a constant struggle, and even more so for the inhabitants of the Frisian North Sea shore. Was the last storm flood, the most devastating one in human memory, really nothing more than yet another example for the hardships all Frisians have to face – or a sign from the gods that a tribe that only just settled here must seek out an entirely new home?",
31- prerequisites = {
32- "emp04.wmf",
33- "atl01.wmf",
34- },
35 scenarios = {
36 "fri01.wmf",
37 "fri02.wmf",