Merge lp:~widelands-dev/widelands/bug-1803602-reveal-frisian-campaign into lp:widelands

Proposed by GunChleoc
Status: Merged
Merged at revision: 8926
Proposed branch: lp:~widelands-dev/widelands/bug-1803602-reveal-frisian-campaign
Merge into: lp:widelands
Diff against target: 47 lines (+4/-1)
4 files modified
data/campaigns/atl01.wmf/scripting/mission_thread.lua (+1/-1)
data/campaigns/bar01.wmf/scripting/mission_thread.lua (+1/-0)
data/campaigns/emp02.wmf/scripting/mission_thread.lua (+1/-0)
data/campaigns/emp04.wmf/scripting/mission_thread.lua (+1/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug-1803602-reveal-frisian-campaign
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+358894@code.launchpad.net

Commit message

Reveal Frisian campaign after Atlanteans scenario 1 or Empire scenario 4. Reveal Empire and Atlanteans earlier.

To post a comment you must log in.
Revision history for this message
hessenfarmer (stephan-lutz) wrote :

from a linear point of view it makes no sense to have this in both in this config cause it can't be revealed twice. and atlanteans is only visible after empire.

so either we do it after atlantean, which I would prefer (due to being confronted with rising water the first time) or we do it after empire which means atlantean and empire are revealed simultaneously

other option is to have all 4 campaigns visible from the beginning as thea are clearly indicated for difficulty

review: Needs Fixing
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4233. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/455845698.
Appveyor build 4029. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1803602_reveal_frisian_campaign-4029.

Revision history for this message
GunChleoc (gunchleoc) wrote :

I think we can reveal it whenever the player has the necessary skills to play it.

I think we could also reveal the Atlanteans earlier, after Empire scenario 2, like I suggested on the forum https://wl.widelands.org/forum/topic/4327/?page=3#post-26178

Having 2 chances to reveal the Frisian campaign also solves the problem that players who already have played all Build 19 campaign scenarios will get access to the Frisians after playing Empire 4. Otherwise, they will have to know to replay Atlanteans 1 or to manually manipulate the campviz just to get at it. At the same time, new players can get still access after playing Atlanteans 1.

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

Ok having your suggestions from the forum would be a first step towards the final goal which arty described. I would support this.
bar1 --> emp1
emp2 --> atl1
emp4 --> fri1
atl1 --> fri1

8926. By GunChleoc

Reveal Empire after Barbarians 1 and Atlanteans after Empire 2.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Done. I have only added code, since having it again in a later scenario won't hurt.

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

Looks good for the moment being. ;-)
Thanks

review: Approve
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks for the review :)

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/campaigns/atl01.wmf/scripting/mission_thread.lua'
--- data/campaigns/atl01.wmf/scripting/mission_thread.lua 2017-12-09 19:06:07 +0000
+++ data/campaigns/atl01.wmf/scripting/mission_thread.lua 2018-11-19 08:10:54 +0000
@@ -234,7 +234,7 @@
234 -- Success234 -- Success
235 msg_boxes(scenario_won)235 msg_boxes(scenario_won)
236 p1:reveal_scenario("atlanteans01")236 p1:reveal_scenario("atlanteans01")
237237 p1:reveal_campaign("campsect3")
238end238end
239239
240240
241241
=== modified file 'data/campaigns/bar01.wmf/scripting/mission_thread.lua'
--- data/campaigns/bar01.wmf/scripting/mission_thread.lua 2018-08-13 16:44:58 +0000
+++ data/campaigns/bar01.wmf/scripting/mission_thread.lua 2018-11-19 08:10:54 +0000
@@ -328,6 +328,7 @@
328328
329 message_box_objective(plr, msg_mission_complete)329 message_box_objective(plr, msg_mission_complete)
330 plr:reveal_scenario("barbariantut01")330 plr:reveal_scenario("barbariantut01")
331 p1:reveal_campaign("campsect1")
331end332end
332333
333334
334335
=== modified file 'data/campaigns/emp02.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp02.wmf/scripting/mission_thread.lua 2018-01-30 14:32:39 +0000
+++ data/campaigns/emp02.wmf/scripting/mission_thread.lua 2018-11-19 08:10:54 +0000
@@ -266,6 +266,7 @@
266 campaign_message_box(diary_page_11)266 campaign_message_box(diary_page_11)
267267
268 p1:reveal_scenario("empiretut02")268 p1:reveal_scenario("empiretut02")
269 p1:reveal_campaign("campsect2")
269end270end
270271
271run(building_materials)272run(building_materials)
272273
=== modified file 'data/campaigns/emp04.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp04.wmf/scripting/mission_thread.lua 2018-09-09 17:58:55 +0000
+++ data/campaigns/emp04.wmf/scripting/mission_thread.lua 2018-11-19 08:10:54 +0000
@@ -390,6 +390,7 @@
390 campaign_message_box(diary_page_4)390 campaign_message_box(diary_page_4)
391391
392 p1:reveal_campaign("campsect2")392 p1:reveal_campaign("campsect2")
393 p1:reveal_campaign("campsect3")
393 p1:reveal_scenario("empiretut04")394 p1:reveal_scenario("empiretut04")
394end395end
395396

Subscribers

People subscribed via source and target branches

to status/vote changes: