widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-maps-plateau into lp:widelands.

Commit message:
Converted "The Green Plateau" single player scenario to new font renderer

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-maps-plateau/+merge/337505
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-maps-plateau into lp:widelands.

=== modified file 'data/maps/The_Green_Plateau.wmf/scripting/texts.lua'
--- data/maps/The_Green_Plateau.wmf/scripting/texts.lua	2016-03-21 19:29:24 +0000
+++ data/maps/The_Green_Plateau.wmf/scripting/texts.lua	2018-02-10 11:54:10 +0000
@@ -2,10 +2,7 @@
 --                     TEXTS - No logic inside this file
 -- =======================================================================
 
-include "scripting/formatting.lua"
-include "scripting/format_scenario.lua"
-include "scripting/messages.lua"
-
+include "scripting/richtext_scenarios.lua"
 
 -- ===========
 -- Objectives
@@ -26,7 +23,7 @@
    title = _"Capture the Ancient Castle",
    number = 1,
    body = objective_text(_"Capture the Ancient Castle",
-      listitem_bullet(_[[Defeat Lanissa and capture the ancient castle.]])
+      li(_[[Defeat Lanissa and capture the ancient castle.]])
    ),
 }
 
@@ -35,7 +32,7 @@
    title = _"Defeat Erwyn",
    number = 1,
    body = objective_text(_"Defeat Erwyn",
-      listitem_bullet(_[[Defeat Erwyn. He commands the strongest opposing military force left on this island.]])
+      li(_[[Defeat Erwyn. He commands the strongest opposing military force left on this island.]])
    ),
 }
 obj_defeat_jomo = {
@@ -43,7 +40,7 @@
    title = _"Defeat Jomo",
    number = 1,
    body = objective_text(_"Defeat Jomo",
-      listitem_bullet(_[[Defeat Jomo. He is taking care of the soldiers’ food supply.]])
+      li(_[[Defeat Jomo. He is taking care of the soldiers’ food supply.]])
    ),
 }
 
@@ -51,21 +48,12 @@
 -- Messages to the User
 -- =====================
 
-function obj_message(title, text)
-   return
-      rt("<p font-size=20 font-weight=bold font-face=serif font-color=3333FF>"
-         .. title ..
-         "</p><p font-size=10> <br></p>"
-         .. p(text)
-         )
-end
-
 briefing_1_the_forbidden_island = {
    title = _"First Briefing",
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"The Forbidden Island",
+   body = objective_text(_"The Forbidden Island",
       _([[Finally! We have just taken our first step towards victory! Last night, we landed on the forbidden island and defeated the few guards that were watching the north-western part of the island. I am quite sure that none of the other warlords has detected us so far, so we should keep quiet and build up our infrastructure. Soon we will be strong enough to raid their positions.]])
    ),
 }
@@ -75,9 +63,9 @@
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"An Ancient Castle",
-      _([[By the Gods! One of our scouts has discovered a mighty castle at the center of the old plateau. The castle must be quite old and seems to have been built in a foreign style. It’s quite obvious that this is not barbarian craft.]]) .. paragraphdivider() ..
-      _([[Let’s hope that Lanissa – the warlord holding sway over that castle – has not discovered our movements yet. Perhaps we have a chance of conquering that mighty building without a bigger fight! However, it is essential that we capture it. It will be the key to our reign over this island!]]))
+   body = objective_text(_"An Ancient Castle",
+      p(_([[By the Gods! One of our scouts has discovered a mighty castle at the center of the old plateau. The castle must be quite old and seems to have been built in a foreign style. It’s quite obvious that this is not barbarian craft.]])) ..
+      p(_([[Let’s hope that Lanissa – the warlord holding sway over that castle – has not discovered our movements yet. Perhaps we have a chance of conquering that mighty building without a bigger fight! However, it is essential that we capture it. It will be the key to our reign over this island!]])))
       .. new_objectives(obj_capture_ancient_castle)
 }
 
@@ -86,9 +74,9 @@
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"Ancient Castle Captured",
-      _([[Wonderful! Our troops have finally defeated Lanissa and her soldiers. The ancient castle is ours!]]) .. paragraphdivider() ..
-      _([[It is amazing how far one can see from the highest tower of the castle. We can watch the whole island. So now I wonder why Lanissa did not see us and thus did not prepare. Be that as it may, some things will never come to the light of day. The only important issue at the moment are the opposing troops still left. We have discovered enemy positions held by Erwyn to the north and east of the castle. He is known to be a strong warlord and surely commands the strongest warriors. In the south, we caught sight of some food infrastructures guarded by Jomo – a younger warlord – and we should take care of those infrastructures so we can cut off our enemies’ food supply.]]))
+   body = objective_text(_"Ancient Castle Captured",
+      p(_([[Wonderful! Our troops have finally defeated Lanissa and her soldiers. The ancient castle is ours!]])) ..
+      p(_([[It is amazing how far one can see from the highest tower of the castle. We can watch the whole island. So now I wonder why Lanissa did not see us and thus did not prepare. Be that as it may, some things will never come to the light of day. The only important issue at the moment are the opposing troops still left. We have discovered enemy positions held by Erwyn to the north and east of the castle. He is known to be a strong warlord and surely commands the strongest warriors. In the south, we caught sight of some food infrastructures guarded by Jomo – a younger warlord – and we should take care of those infrastructures so we can cut off our enemies’ food supply.]])))
       .. new_objectives(obj_defeat_erwyn) .. new_objectives(obj_defeat_jomo)
 }
 
@@ -97,7 +85,7 @@
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"Erwyn Defeated",
+   body = objective_text(_"Erwyn Defeated",
       _([[Great! Erwyn gave up when he saw his last buildings burning down. That’s one less strong warlord on this island!]]))
 }
 
@@ -106,7 +94,7 @@
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"Jomo Defeated",
+   body = objective_text(_"Jomo Defeated",
       _([[Great! Jomo gave up when he saw his last buildings burning down. That’s one less warlord on this island!]]))
 }
 
@@ -115,7 +103,7 @@
    width = 400,
    height = 300,
    posy = 1,
-   body = obj_message(_"Victory!",
-      _([[Finally! The island is completely ours. Now we just have to defend it better than the warlords did.]]) .. paragraphdivider() ..
-      _("Congratulations! You have mastered this scenario. You may play on if you like!"))
+   body = objective_text(_"Victory!",
+      p(_([[Finally! The island is completely ours. Now we just have to defend it better than the warlords did.]])) ..
+      p(_("Congratulations! You have mastered this scenario. You may play on if you like!")))
 }