Merge lp://qastaging/~widelands-dev/widelands/emp_4_fixes into lp://qastaging/widelands

Proposed by hessenfarmer
Status: Merged
Merged at revision: 9194
Proposed branch: lp://qastaging/~widelands-dev/widelands/emp_4_fixes
Merge into: lp://qastaging/widelands
Diff against target: 86 lines (+21/-8)
4 files modified
data/campaigns/emp04.wmf/scripting/mission_thread.lua (+2/-1)
data/campaigns/emp04.wmf/scripting/texts.lua (+8/-5)
data/campaigns/emp04.wmf/scripting/tribes/trainingcamp1.lua (+10/-1)
data/campaigns/emp04.wmf/scripting/tribes/well1.lua (+1/-1)
To merge this branch: bzr merge lp://qastaging/~widelands-dev/widelands/emp_4_fixes
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+372196@code.qastaging.launchpad.net

Commit message

Fixes to Empire scenario 4

- small trainingcamp is now buildable although at very high costs. (it is not intended the player should stay with them)
- first objective done with 2 buildings still standing (although you miss the woodcutter in the new building then)
- wells have only 5 percent chance to mine water
- added some texts to not dismantle bigger buildings until we know what we are doing.

Description of the change

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

Continuous integration builds have changed state:

Travis build 5384. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/580250613.
Appveyor build 5154. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_emp_4_fixes-5154.

Revision history for this message
GunChleoc (gunchleoc) wrote :

LGTM :)

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: