widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands.

Commit message:
fixes bug 1823471

this is for b21


Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1823471 in widelands: "Empire 3 +4 victory messages are spoken by Lutius"
  https://bugs.launchpad.net/widelands/+bug/1823471

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug1823471-empire3-4-victory/+merge/365640

in the final message of empire 3 and 4 a victory section (formatted as objective) is added 
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug1823471-empire3-4-victory into lp:widelands.

=== modified file 'data/campaigns/emp02.wmf/scripting/texts.lua'
--- data/campaigns/emp02.wmf/scripting/texts.lua	2018-08-13 16:44:58 +0000
+++ data/campaigns/emp02.wmf/scripting/texts.lua	2019-04-07 19:35:55 +0000
@@ -267,7 +267,7 @@
       .. paragraphdivider() ..
       -- TRANSLATORS: Lutius - Diary
       _([[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.]]))
-      ..  objective_text(_"Victory",
+      .. objective_text(_"Victory",
       _[[You have established a working economy, trained new soldiers and driven the Barbarians from the island.]])
 }
 

=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua	2019-04-05 07:28:50 +0000
+++ data/campaigns/emp03.wmf/scripting/texts.lua	2019-04-07 19:35:55 +0000
@@ -620,9 +620,9 @@
    title=_"Time to get Home Again",
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-      _([[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.]])
-      .. paragraphdivider() ..
-      _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
+      _([[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.]]))
+      .. objective_text(_"Victory",
+      _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]),
    posy=1,
    w=500,
 }

=== modified file 'data/campaigns/emp04.wmf/scripting/texts.lua'
--- data/campaigns/emp04.wmf/scripting/texts.lua	2018-09-24 20:12:38 +0000
+++ data/campaigns/emp04.wmf/scripting/texts.lua	2019-04-07 19:35:55 +0000
@@ -226,9 +226,9 @@
    title=_"The Battle is Won",
    body= lutius(_"Diary of Lutius",
       -- TRANSLATORS: Lutius - Diary
-      _([[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.]])
-      .. paragraphdivider() ..
-      _([[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]])),
+      _([[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.]]))
+      .. objective_text(_"Victory",
+      _[[You have completed this mission. You may continue playing if you wish, otherwise move on to the next mission.]]),
    posy=1,
 }