Merge lp:~widelands-dev/widelands/casern_campaign into lp:widelands
Proposed by
Notabilis
Status: | Merged |
---|---|
Merged at revision: | 8239 |
Proposed branch: | lp:~widelands-dev/widelands/casern_campaign |
Merge into: | lp:widelands |
Diff against target: |
106 lines (+10/-6) 7 files modified
data/campaigns/bar02.wmf/scripting/mission_thread.lua (+2/-1) data/campaigns/bar02.wmf/scripting/texts.lua (+3/-2) data/campaigns/emp02.wmf/scripting/mission_thread.lua (+1/-1) data/campaigns/emp02.wmf/scripting/starting_conditions.lua (+1/-1) data/campaigns/emp02.wmf/scripting/texts.lua (+1/-0) data/campaigns/tutorial02_warfare.wmf/scripting/starting_conditions.lua (+1/-0) data/campaigns/tutorial02_warfare.wmf/scripting/texts.lua (+1/-1) |
To merge this branch: | bzr merge lp:~widelands-dev/widelands/casern_campaign |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
GunChleoc | Approve | ||
Review via email: mp+314208@code.launchpad.net |
Description of the change
Adapted the tutorials and campaigns for the future implementation of barracks.
While the campaigns are currently playable some of them will (partially) break when barracks are required for soldier creation. This branch modifies some dialogs and objectives so barracks have/can be build where required / where it makes sense.
Please check the NOCOM in data/campaigns/
To post a comment you must log in.
LGTM - just 1 nit as to phrasing.
Not tested.