Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands
Thanks for the review :) I think it's a separate issue, so I have created a new bug report: https://bugs.launchpad.net/widelands/+bug/1748855 I have assigned you, but do feel free to unassign yourself. @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/fh1-empire2/+merge/336850 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands
in principal the branch looks good, except one thing which I commented inline. If this should be fixed in a different branch. This branch can go in. Otherwise it should be fixed before, as it is just a minor fix. Diff comments: > > === modified file 'data/campaigns/emp02.wmf/scripting/texts.lua' > --- data/campaigns/emp02.wmf/scripting/texts.lua 2017-06-25 20:03:32 > + > +++ data/campaigns/emp02.wmf/scripting/texts.lua 2018-01-30 14:38:46 > + > @@ -73,10 +72,10 @@ > title =_"Provide your miners with food", > number = 1, > body = objective_text(_"Food For Your Miners", > - listitem_bullet(_[[To produce some sustaining food for our miners, we > could build up a tavern. To supply them with some good and strong drinks, we > could build up a brewery and a winery.]]) .. > - listitem_bullet(_[[Of course this means we will need more resources > for preparing this food – like fish, meat or bread. To provide these > foodstuffs, you would have to build a fisher’s house, a farm, a mill and a > bakery.]]) .. > - listitem_bullet(_[[Maybe you will also need a hunter’s house, a > piggery, a vineyard and some wells.]]) .. > - listitem_arrow(_[[It’s up to you what you want to build. But remember > – coal and iron mines need beer, marble and gold mines need wine and all > mines need at least rations, which are produced out of bread OR meat OR > fish.]]) > + li(_[[To produce some sustaining food for our miners, we could build > up a tavern. To supply them with some good and strong drinks, we could build > up a brewery and a winery.]]) .. > + li(_[[Of course this means we will need more resources for preparing > this food – like fish, meat or bread. To provide these foodstuffs, you would > have to build a fisher’s house, a farm, a mill and a bakery.]]) .. > + li(_[[Maybe you will also need a hunter’s house, a piggery, a vineyard > and some wells.]]) .. > + li_arrow(_[[It’s up to you what you want to build. But remember – coal > and iron mines need beer, marble and gold mines need wine and all mines need > at least rations, which are produced out of bread OR meat OR fish.]]) > ), > } The above para does not fit really well into the rules how to express objectives developed together with Venatrix in empire 4 and which we harmonized empire 3 with. Rules are roughly: 1. Always begin with a clear objective expressed in imperative. 2. Adress the player always with you, avoid we and our and so on. 3. Additional info and explanation can be given after the imperative or in an li_arrow item. I would find it useful to harmonize at least all empire scenarios with this guidelines to ensure they hae the same look and feel or the same "tone" or "sound". > -- https://code.launchpad.net/~widelands-dev/widelands/fh1-empire2/+merge/336850 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands
Continuous integration builds have changed state: Travis build 3116. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/335191405. Appveyor build 2923. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fh1_empire2-2923. -- https://code.launchpad.net/~widelands-dev/widelands/fh1-empire2/+merge/336850 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands has been updated. Commit Message changed to: Converted Empire Scenario 2 to new font renderer. Also, allow warehouse and donkeyfarm so that players can speed up the scenario if they want. For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fh1-empire2/+merge/336850 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fh1-empire2 into
lp:widelands.
Commit message:
Converted Empire Scenario 2 to new font renderer
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1-empire2/+merge/336850
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/fh1-empire2 into lp:widelands.
=== modified file 'data/campaigns/emp02.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp02.wmf/scripting/mission_thread.lua 2017-07-12 06:13:59 +
+++ data/campaigns/emp02.wmf/scripting/mission_thread.lua 2018-01-30 14:38:46 +
@@ -227,7 +227,12 @@
campaign_message_box(diary_page_8)
local o = add_campaign_objective(obj_build_bigger_military_buildings)
- p1:allow_buildings{"empire_outpost", "empire_barrier", "empire_tower"}
+ p1:allow_buildings{
+ "empire_outpost",
+ "empire_barrier",
+ "empire_tower",
+ "empire_warehouse",
+ "empire_donkeyfarm"}
p2:allow_buildings{"barbarians_quarry"}
-- Wait for one of the buildings to go up
=== modified file 'data/campaigns/emp02.wmf/scripting/texts.lua'
--- data/campaigns/emp02.wmf/scripting/texts.lua 2017-06-25 20:03:32 +
+++ data/campaigns/emp02.wmf/scripting/texts.lua 2018-01-30 14:38:46 +
@@ -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)
@@ -28,7 +27,7 @@
title =_"Build up a wood economy",
number = 5,
body = objective_text(_"Wood Economy",
- listitem_bullet(_[[Build three lumberjack’s houses, a forester’s house and a sawmill.]])
+ li(_[[Build three lumberjack’s houses, a forester’s house and a sawmill.]])
),
}
@@ -37,7 +36,7 @@
title =_"Build a quarry",
number = 1,
body = objective_text(_"Quarry",
- listitem_bullet(_[[Build a quarry to the south of your headquarters.]])
+ li(_[[Build a quarry to the south of your headquarters.]])
),
}
@@ -46,7 +45,7 @@
title =_"Protect your colony",
number = 1,
body = objective_text(_"Protect Your Colony",
- listitem_bullet(_[[Build some blockhouses and sentries around the colony.]])
+ li(_[[Build some blockhouses and sentries around the colony.]])
),
}
@@ -55,7 +54,7 @@
title =_"Start mining marble",
number = 1,
body = objective_text(_"Marble",
- listitem_bullet(_[[Expand to the east, to start mining marble from the mountain.]])
+ li(_[[Expand to the east, to start mining marble from the mountain.]])
),
}
@@ -64,7 +63,7 @@
title =_"Build a stonemason’s house and mining infrastructure",
number = 7,
body = objective_text(_"Stonemason’s house and Mining Infrastructure",
- listitem_bullet(_[[Build a stonemason’s house and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
+ li(_[[Build a stonemason’s house and then a complete mining and production infrastructure (coal mine and / or charcoal kiln, iron mine, toolsmithy, weapon smithy, armor smithy and smelting works).]])
),
}
@@ -73,10 +72,10 @@
title =_"Provide your miners with food",
number = 1,
body = objective_text(_"Food For Your Miners",
- listitem_bullet(_[[To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) ..
- listitem_bullet(_[[Of course this means we will need more resources for preparing this food – like fish, meat or bread. To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) ..
- listitem_bullet(_[[Maybe you will also need a hunter’s house, a piggery, a vineyard and some wells.]]) ..
- listitem_arrow(_[[It’s up to you what you want to build. But remember – coal and iron mines need beer, marble and gold mines need wine and all mines need at least rations, which are produced out of bread OR meat OR fish.]])
+ li(_[[To produce some sustaining food for our miners, we could build up a tavern. To supply them with some good and strong drinks, we could build up a brewery and a winery.]]) ..
+ li(_[[Of course this means we will need more resources for preparing this food – like fish, meat or bread. To provide these foodstuffs, you would have to build a fisher’s house, a farm, a mill and a bakery.]]) ..
+
