Merge lp:~widelands-dev/widelands/fh1-barbarians2 into lp:widelands

[GunChleoc]

Converted Barbarians Scenario 2 to new font renderer.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3098. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/333839919.
Appveyor build 2905. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_barbarians2-2905.

[Klaus Halfmann (klaus-halfmann)]

OK, see only obvious changes.

going to compile and testplay now

[Klaus Halfmann (klaus-halfmann)]

Took me some time to play this to the very End,
but now its done.

Gun: you know that the Building help is all garbelde HTML, do you?

all else fine.

@bunnybot merge.

review: Approve (review, compile, testplay)

[kaputtnik (franku)]

> Gun: you know that the Building help is all garbelde HTML, do you?

Yes thats a known bug 1744583 I look into it...

[GunChleoc (gunchleoc)]

Thanks for testing :)

=== modified file 'data/campaigns/bar02.wmf/scripting/texts.lua'
--- data/campaigns/bar02.wmf/scripting/texts.lua	2017-07-09 08:19:45 +0000
+++ data/campaigns/bar02.wmf/scripting/texts.lua	2018-01-26 17:06:13 +0000
@@ -1,5 +1,4 @@
-include "scripting/formatting.lua"
-include "scripting/format_scenario.lua"
+include "scripting/richtext_scenarios.lua"
 
 function thron(title, text)
    return speech("map:chieftain.png", "2F9131", title, text)
@@ -21,14 +20,13 @@
    title = _"Build up a basic economy",
    number = 5,
    body = objective_text(_"Build up a basic economy",
-      _"Start collecting basic building materials, and fortify the camp."
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a lumberjack’s hut") ..
-      listitem_bullet(_"Build a ranger’s hut") ..
-      listitem_bullet(_"Build a quarry") ..
-      listitem_bullet(_"Build a wood hardener") ..
-      listitem_bullet(_"Build a sentry on the eastern border") ..
-      listitem_arrow(_"You should eventually also build a reed yard and a lime kiln."))
+      p(_"Start collecting basic building materials, and fortify the camp.") ..
+      li(_"Build a lumberjack’s hut") ..
+      li(_"Build a ranger’s hut") ..
+      li(_"Build a quarry") ..
+      li(_"Build a wood hardener") ..
+      li(_"Build a sentry on the eastern border") ..
+      li_arrow(_"You should eventually also build a reed yard and a lime kiln."))
 }
 
 obj_build_small_food_economy = {
@@ -36,13 +34,12 @@
    title = _"Build up a small food economy",
    number = 5,
    body = objective_text(_"Build up a small food economy",
-      _"Build up a basic food economy to provide your people with food."
-      .. paragraphdivider() ..
-      listitem_bullet(_"Build a fisher’s hut") ..
-      listitem_bullet(_"Build a hunter’s hut") ..
-      listitem_bullet(_"Build a well") ..
-      listitem_bullet(_"Build a farm") ..
-      listitem_bullet(_"Build a bakery"))
+      p(_"Build up a basic food economy to provide your people with food.") ..
+      li(_"Build a fisher’s hut") ..
+      li(_"Build a hunter’s hut") ..
+      li(_"Build a well") ..
+      li(_"Build a farm") ..
+      li(_"Build a bakery"))
 }
 
 obj_build_cattlefarm = {
@@ -50,9 +47,8 @@
    title = _"Build a cattle farm",
    number = 1,
    body = objective_text(_"Remember to build a cattle farm",
-      _"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly."
-      .. paragraphdivider () ..
-      listitem_bullet(_"Remember to build a cattle farm")
+      p(_"As your roads grow longer and your economy bigger, you should make good use of your oxen to help transport wares more quickly.") ..
+      li(_"Remember to build a cattle farm")
    ),
 }
 
@@ -61,7 +57,7 @@
    title = _"Build a tower",
    number = 1,
    body = objective_text(_"Build a tower",
-      listitem_bullet(_"Build a tower at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
+      li(_"Build a tower at the north-east border of your territory to get greater visual range and to protect your people from sudden attacks by enemies."))
 }
 
 obj_explore_further = {
@@ -69,7 +65,7 @@
    title = _"Explore further",
    number = 1,
    body = objective_text(_"Explore further",
-      listitem_bullet(_"Build more military buildings to explore the area around the headquarters and to ensure the safety of your people."))
+      li(_"Build more military buildings to explore the area around the headquarters and to ensure the safety of your people."))
 }
 
 obj_build_mining_economy = {
@@ -77,7 +73,7 @@
    title = _"Build a mining infrastructure",
    number = 6,
    body = objective_text(_"Build a mining infrastructure",
-      listitem_bullet(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop."))
+      li(_"Expand your territory to the mountains, send geologists to search for ore and coal and build a mining economy with mines, taverns, smelting works and metal workshop."))
 }
 
 obj_build_a_fortress = {
@@ -85,7 +81,7 @@
    title = _"Build a fortress",
    number = 1,
    body = objective_text(_"Build a fortress",
-      listitem_bullet(_"Build a fortress to the east of the mountains."))
+      li(_"Build a fortress to the east of the mountains."))
 }
 
 obj_build_training_infrastructure = {
@@ -93,10 +89,10 @@
    title = _"Build a training infrastructure",
    number = 4,
    body = objective_text(_"Build a training infrastructure",
-      listitem_bullet(_"Build a barracks to train some basic soldiers.") ..
-      listitem_bullet(_"Build a battle arena and a training camp to the west of the mountains.") ..
-      listitem_bullet(_"Enhance your metal workshop to an ax workshop in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the ax workshop to a war mill, which will produce additional weapons.") ..
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+      li(_"Build a barracks to train some basic soldiers.") ..
+      li(_"Build a battle arena and a training camp to the west of the mountains.") ..
+      li(_"Enhance your metal workshop to an ax workshop in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the ax workshop to a war mill, which will produce additional weapons.") ..
+      li(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 
@@ -105,8 +101,8 @@
    title = _"Build a warehouse",
    number = 1,
    body = objective_text(_"Build a warehouse",
-      listitem_bullet(_"Build a warehouse to the west of the mountains.") ..
-      listitem_arrow(_"Warehouses are similar to your headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer."))
+      li(_"Build a warehouse to the west of the mountains.") ..
+      li_arrow(_"Warehouses are similar to your headquarters, with the only difference that they aren’t defended by soldiers. It is often wise to build a warehouse when your territory is growing and the paths to your headquarters get longer and longer."))
 }
 
 obj_build_trainingssites = {
@@ -114,8 +110,8 @@
    title = _"Build training sites",
    number = 2,
    body = objective_text(_"Build training sites",
-      listitem_bullet(_"Build a barracks, a battle arena and a training camp to the west of the mountains.") ..
-      listitem_arrow(_"Barracks train basic soldiers while training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight."
+      li(_"Build a barracks, a battle arena and a training camp to the west of the mountains.") ..
+      li_arrow(_"Barracks train basic soldiers while training sites like a training camp or a battle arena are used for training soldiers in their different attributes. These attributes are important in fights and the better a soldier is, the higher is the chance to win a fight."
       .. "<br>" ..
       _"The attributes are: health, attack, defense and evade."))
 }
@@ -125,7 +121,7 @@
    title = _"Build weapons production",
    number = 3,
    body = objective_text(_"Build weapons production",
-      listitem_bullet(_"Enhance your metal workshop to an ax workshop in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the ax workshop to a war mill, which will produce additional weapons."))
+      li(_"Enhance your metal workshop to an ax workshop in order to produce weapons, and build up a second metal workshop to ensure the production of tools. When the blacksmith reaches his next level (master blacksmith), you can even enhance the ax workshop to a war mill, which will produce additional weapons."))
 }
 
 obj_build_a_helmsmithy = {
@@ -133,7 +129,7 @@
    title=_"Build a helm smithy",
    number = 1,
    body = objective_text(_"Build a helm smithy",
-      listitem_bullet(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
+      li(_"Build a helm smithy to the west of the mountains to provide your soldiers with better armor."))
 }
 
 obj_destroy_kalitaths_army = {
@@ -141,8 +137,8 @@
    title = _"Destroy Kalitath’s army",
    number = 2,
    body = objective_text(_"Destroy Kalitath’s army",
-      listitem_bullet(_"Destroy Kalitath’s army and expand your territory to the east.") ..
-      listitem_arrow(_"To attack an enemy, you must click on the door of an adversary’s military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross (‘Start Attack’)."))
+      li(_"Destroy Kalitath’s army and expand your territory to the east.") ..
+      li_arrow(_"To attack an enemy, you must click on the door of an adversary’s military building. A menu will pop up allowing you to select the number of soldiers that should attack. When you are ready with setting the number, click on the cross (‘Start Attack’)."))
 }
 
 obj_military_assault_on_althunran = {
@@ -150,7 +146,7 @@
    title = _"Military assault on Al’thunran",
    number = 1,
    body = objective_text(_"Military assault on Al’thunran",
-      listitem_bullet(_"Destroy all forces of Thron’s two brothers to liberate the throne-circle."))
+      li(_"Destroy all forces of Thron’s two brothers to liberate the throne-circle."))
 }
 
 -- =======================================================================