GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-empire3 into lp:widelands.
Commit message: Converted Empire Scenario 3 to new font renderer Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-empire3/+merge/336851 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-empire3 into lp:widelands.
=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua' --- data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 07:08:38 +0000 +++ data/campaigns/emp03.wmf/scripting/texts.lua 2018-01-30 14:39:13 +0000 @@ -2,8 +2,7 @@ -- Some formating functions -- ========================= -include "scripting/formatting.lua" -include "scripting/format_scenario.lua" +include "scripting/richtext_scenarios.lua" function lutius(title, text) return speech("map:Lutius.png", "2F9131", title, text) @@ -26,6 +25,16 @@ function amalea3(title, text) return speech("map:Amalea3.png", "AF7511", title, text) end + + +function holy_shrine(text, image) + return + div("width=100%", + div("width=50%", p(text)) .. + div("width=*", p("align=right", img(image))) + ) +end + -- ======================================================================= -- Texts - No logic here -- ======================================================================= @@ -39,7 +48,7 @@ title=_"Build your first outpost", number = 1, body = objective_text(_"First Outpost", - listitem_bullet(_[[Build an outpost at the yellow house symbol to the east of your provisional headquarters.]]) + li(_[[Build an outpost at the yellow house symbol to the east of your provisional headquarters.]]) ), } @@ -48,7 +57,7 @@ title=_"Build a quarry", number = 1, body = objective_text(_"Quarry", - listitem_bullet(_[[Build a quarry close to the abundant rocks, so we can free some building plots and get some valuable resources.]]) + li(_[[Build a quarry close to the abundant rocks, so we can free some building plots and get some valuable resources.]]) ), } @@ -57,7 +66,7 @@ title=_"Build a lumberjack’s house, a sawmill and a stonemason’s house", number = 3, body = objective_text(_"Lumberjack, Sawmill and Stonemason", - listitem_bullet(_[[Build a lumberjack’s house, a sawmill and a stonemason’s house as soon as there is enough space for them. This will complete the basic building material supply chain.]]) + li(_[[Build a lumberjack’s house, a sawmill and a stonemason’s house as soon as there is enough space for them. This will complete the basic building material supply chain.]]) ), } @@ -66,8 +75,8 @@ title=_"Lower the demand for marble columns", number = 1, body = objective_text(_"Lower Demand for Marble Columns", - listitem_bullet(_[[We should save some marble for buildings. So, please lower the demand for marble columns in the economy settings to four.]]) .. - listitem_arrow(_[[Remember that you can access the economy settings by clicking on any flag.]]) + li(_[[We should save some marble for buildings. So, please lower the demand for marble columns in the economy settings to four.]]) .. + li_arrow(_[[Remember that you can access the economy settings by clicking on any flag.]]) ), } @@ -76,7 +85,7 @@ title=_"Find a port space on the small island", number = 1, body = objective_text(_"Port Space", - listitem_bullet(_[[In order to regain access to the sea, we first must discover a port space.]]) + li(_[[In order to regain access to the sea, we first must discover a port space.]]) ), } @@ -85,8 +94,8 @@ title=_"Build a port and a shipyard on the Island", number = 2, body = objective_text(_"Ship Industry", - listitem_bullet(_[[Build a port to set sail from this island.]]).. - listitem_bullet(_[[Build a shipyard to produce the ships to sail on.]])), + li(_[[Build a port to set sail from this island.]]).. + li(_[[Build a shipyard to produce the ships to sail on.]])), } obj_produce_wheat = { @@ -94,7 +103,7 @@ title=_"Produce at least 50 sheaves of wheat", number = 1, body = objective_text(_"Wheat Production", - listitem_bullet(_[[To get our wool production started, we need at least 50 sheaves of wheat.]]) + li(_[[To get our wool production started, we need at least 50 sheaves of wheat.]]) ), } @@ -103,7 +112,7 @@ title=_"Produce cloth for building our first ship", number = 1, body = objective_text(_"Cloth Production", - listitem_bullet(_[[Now let’s turn all the wheat into wool (at least 50 bales) and then use the wool to weave cloth in order to build a ship.]]) + li(_[[Now let’s turn all the wheat into wool (at least 50 bales) and then use the wool to weave cloth in order to build a ship.]]) ), } @@ -113,8 +122,8 @@ number = 1, -- TRANSLATORS: Objective - create 2 expeditions and found new colonies with them body = objective_text(_"Build 2 Expedition Ports", - listitem_bullet(_[[We should explore the island in the south. Use an expedition to build a port there. Afterwards, let’s try to find some mining resources.]]) .. - listitem_bullet(_[[We should send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]]) + li(_[[We should explore the island in the south. Use an expedition to build a port there. Afterwards, let’s try to find some mining resources.]]) .. + li(_[[We should send a ship northwards to gather some intelligence about the Barbarians. Try to build a port on the island and found an outpost.]]) ), } @@ -123,7 +132,7 @@ title=_"Produce gold to send out expeditions", number = 1, body = objective_text(_"Gold Production", - listitem_bullet(_[[We need to produce at least 6 gold to be able to colonize our vicinity.]]) + li(_[[We need to produce at least 6 gold to be able to colonize our vicinity.]]) ), } @@ -132,7 +141,7 @@ title=_"Defeat the Barbarians", number = 1, body = objective_text(_"Defeat the Enemy", - listitem_bullet(_[[We should end the Barbarians’ existence in this part of the world.]]) + li(_[[We should end the Barbarians’ existence in this part of the world.]]) ), } @@ -141,7 +150,7 @@ title=_"Explore further and build ports", number = 1, body = objective_text(_"Explore Additional Islands and Search for Port Spaces", - listitem_bullet(_[[We should discover more land and build as many ports as we can.]]) + li(_[[We should discover more land and build as many ports as we can.]]) ), } @@ -150,8 +159,13 @@ -- TRANSLATORS: Objective header title=_"Recover the shrine", number = 1, - body = text_line("</p>".. h2(_"Find the Holy Shrine"), - listitem_bullet(_[[We need to find and secure all six pieces of the holy shrine of Neptune.]]), "map:artifacts_models.png") + body = holy_shrine( + objective_text( + _"Find the Holy Shrine", + _[[We need to find and secure all six pieces of the holy shrine of Neptune.]] + ), + "map:artifacts_models.png" + ) } obj_training = { @@ -159,7 +173,7 @@ title=_"Build a training infrastructure", number = 3, body = objective_text(_"Training Infrastructure", - listitem_bullet(_[[Build a training camp, some barracks and an arena or colosseum to train our soldiers.]]) + li(_[[Build a training camp, some barracks and an arena or colosseum to train our soldiers.]]) ), }
_______________________________________________ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp