Merge lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands

Proposed by hessenfarmer
Status: Merged
Merged at revision: 9062
Proposed branch: lp:~widelands-dev/widelands/bug1823471-empire3-4-victory
Merge into: lp:widelands
Diff against target: 45 lines (+7/-7)
3 files modified
data/campaigns/emp02.wmf/scripting/texts.lua (+1/-1)
data/campaigns/emp03.wmf/scripting/texts.lua (+3/-3)
data/campaigns/emp04.wmf/scripting/texts.lua (+3/-3)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug1823471-empire3-4-victory
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+365640@code.launchpad.net

Commit message

fixes bug 1823471

this is for b21

Description of the change

in the final message of empire 3 and 4 a victory section (formatted as objective) is added

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

Code LGTM. Not tested.

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

Continuous integration builds have changed state:

Travis build 4686. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/516959535.
Appveyor build 4472. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug1823471_empire3_4_victory-4472.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/emp02.wmf/scripting/texts.lua'
2--- data/campaigns/emp02.wmf/scripting/texts.lua 2018-08-13 16:44:58 +0000
3+++ data/campaigns/emp02.wmf/scripting/texts.lua 2019-04-07 19:35:55 +0000
4@@ -267,7 +267,7 @@
5 .. paragraphdivider() ..
6 -- TRANSLATORS: Lutius - Diary
7 _([[There are still a few Barbarians hiding on our island, but I am sure that we will find them soon. Every Barbarian who doesn’t attack us will be put in a boat with the other peaceful ones, and sent back to their country.]]))
8- .. objective_text(_"Victory",
9+ .. objective_text(_"Victory",
10 _[[You have established a working economy, trained new soldiers and driven the Barbarians from the island.]])
11 }
12
13
14=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
15--- data/campaigns/emp03.wmf/scripting/texts.lua 2019-04-05 07:28:50 +0000
16+++ data/campaigns/emp03.wmf/scripting/texts.lua 2019-04-07 19:35:55 +0000
17@@ -620,9 +620,9 @@
18 title=_"Time to get Home Again",
19 body= lutius(_"Diary of Lutius",
20 -- TRANSLATORS: Lutius - Diary
21- _([[Yes my fellow soldiers, we have done it! We have met all the challenges that were put in front of us. But my heart is still with our home. We shall set sail as soon as possible to help defend the Empire from the Barbarian tribe.]])
22- .. paragraphdivider() ..
23- _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
24+ _([[Yes my fellow soldiers, we have done it! We have met all the challenges that were put in front of us. But my heart is still with our home. We shall set sail as soon as possible to help defend the Empire from the Barbarian tribe.]]))
25+ .. objective_text(_"Victory",
26+ _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]),
27 posy=1,
28 w=500,
29 }
30
31=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
32--- data/campaigns/emp04.wmf/scripting/texts.lua 2018-09-24 20:12:38 +0000
33+++ data/campaigns/emp04.wmf/scripting/texts.lua 2019-04-07 19:35:55 +0000
34@@ -226,9 +226,9 @@
35 title=_"The Battle is Won",
36 body= lutius(_"Diary of Lutius",
37 -- TRANSLATORS: Lutius - Diary
38- _([[Praise the gods, we have succeeded. We managed all the challenges that were imposed on us. We even expelled the Barbarians out of our country. However, our victory is only temporary, as this is still just the beginning of the war. Let’s see what the future still holds for us.]])
39- .. paragraphdivider() ..
40- _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
41+ _([[Praise the gods, we have succeeded. We managed all the challenges that were imposed on us. We even expelled the Barbarians out of our country. However, our victory is only temporary, as this is still just the beginning of the war. Let’s see what the future still holds for us.]]))
42+ .. objective_text(_"Victory",
43+ _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]),
44 posy=1,
45 }
46

Subscribers

People subscribed via source and target branches

to status/vote changes: