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 > +0000 > +++ data/campaigns/emp02.wmf/scripting/texts.lua 2018-01-30 14:38:46 > +0000 > @@ -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 : [email protected] Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
