[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands
Continuous integration builds have changed state: Travis build 3054. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/328811067. Appveyor build 2862. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bugfix_empire_campaign-2862. -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bugfix-empire-campaign 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/bug-1574379-forester-wit into lp:widelands
Continuous integration builds have changed state: Travis build 3053. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/328793965. Appveyor build 2861. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1574379_forester_wit-2861. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1574379-forester-wit. ___ 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/bug-1574379-forester-wit into lp:widelands
Hello, Klaus, Since you asked: Does the line like "return forester_cache[mi] = correct_val;" bring any performance benefits? I know it is valid and all, but the old way (separate assignment and returning) is more intuitive. Not everybody reading the source are professionals, especially C/C++ professionals. Apart from that, the changes improve. I have a bad habit of dropping magic numbers in. About magical constants: The comparison (cache_entry > kInvalidForesterEntry) looks weird. It makes sense when one knows that the numeric value of the constant is -1. Would inequality comparison look better? No other negative values should be around. Thanks for the review. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1574379-forester-wit. ___ 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/bugfix-empire-campaign into lp:widelands
have playtested the scenarios. They all worked fine. Now the texts should be consistent with each other as well as with mission 1 and 2 -- https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bugfix-empire-campaign 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/bugfix-empire-campaign into lp:widelands
hessenfarmer has proposed merging
lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1742273 in widelands: "wrong strings and errors in empire mission 4"
https://bugs.launchpad.net/widelands/+bug/1742273
Bug #1742295 in widelands: "wrong background image in empire 03"
https://bugs.launchpad.net/widelands/+bug/1742295
Bug #1742534 in widelands: "Objective Strings in empire Mission 3 not
consistent with other Missions"
https://bugs.launchpad.net/widelands/+bug/1742534
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bugfix-empire-campaign/+merge/336074
textual and map fixes for empire Missions 3 and 4
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bugfix-empire-campaign into lp:widelands.
=== modified file 'data/campaigns/emp03.wmf/pics/background.jpg'
Binary files data/campaigns/emp03.wmf/pics/background.jpg 2017-03-16 21:54:07 + and data/campaigns/emp03.wmf/pics/background.jpg 2018-01-14 19:23:03 + differ
=== modified file 'data/campaigns/emp03.wmf/scripting/texts.lua'
--- data/campaigns/emp03.wmf/scripting/texts.lua 2017-06-25 07:08:38 +
+++ data/campaigns/emp03.wmf/scripting/texts.lua 2018-01-14 19:23:03 +
@@ -48,7 +48,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.]])
+ listitem_bullet(_[[Build a quarry close to the abundant rocks to free some building plots and get some valuable resources.]])
),
}
@@ -63,10 +63,10 @@
obj_lower_marble_column_demand = {
name = "lower_marble_column_demand",
- title=_"Lower the demand for marble columns",
+ title=_"Lower the demand for marble columns to 4",
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_bullet(_[[Lower the demand for marble columns in the economy settings to four. This will help to save some marble for buildings.]]) ..
listitem_arrow(_[[Remember that you can access the economy settings by clicking on any flag.]])
),
}
@@ -76,7 +76,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.]])
+ listitem_bullet(_[[Search for a port space in order to regain access to the sea.]])
),
}
@@ -86,15 +86,15 @@
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.]])),
+ listitem_bullet(_[[Build a shipyard to produce the ships to sail on.]])),
}
obj_produce_wheat = {
name = "produce_50_wheat",
- title=_"Produce at least 50 sheaves of wheat",
+ title=_"Produce wheat",
number = 1,
body = objective_text(_"Wheat Production",
- listitem_bullet(_[[To get our wool production started, we need at least 50 sheaves of wheat.]])
+ listitem_bullet(_[[Produce at least 50 sheaves of wheat to get your wool production started.]])
),
}
@@ -103,7 +103,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.]])
+ listitem_bullet(_[[Now turn all the wheat into at least 50 bales of wool and then use the wool to weave cloth in order to build a ship.]])
),
}
@@ -112,9 +112,9 @@
title=_"Build 2 ports on distant islands",
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.]])
+ body = objective_text(_"Build two Expedition Ports",
+ listitem_bullet(_[[Explore the island in the south. Use an expedition to build a port there. Afterwards, try to find some mining resources.]]) ..
+ listitem_bullet(_[[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 +123,7 @@
title=_"Produce gold to send out expeditions",
number = 1,
body =
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1574379-forester-wit into lp:widelands
Review: Approve rerview, compile debug, test Hello Teppo, I did some small changes, I hope you agree. I assume this will improve efiicency of tree planting quite a lot, thus chnageing the balance of existing maps. To stick to the ideas of widelands a "tree planter" should become a "power planter" only after gaining some experience :-) So our mircomanaging friends get another toy to play with ;-) Gun: as of the code this change can go in As it changes gameplay I am not sure. I will continue playing my current map till the end. And then try some dester Maps or such .. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1574379-forester-wit. ___ 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/bug-1574379-forester-wit into lp:widelands
You shoud make the -1 a constexpr, e.g. > constexpr int16_t kInvalidForesterEntry = -1; Now, after more thinking, forester_cache_ must be member of some gameobject. Otherwise it may happen, that * a cache from some previous game is used for a different map. * In case of a network game bothe side may have diffenter caches depending of the game they played before. I checked out that code now and will think about a good location for that cache and the functions. As I do not have much time dont expect me to come around with a solution soon. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1574379-forester-wit/+merge/336068 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1574379-forester-wit 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-website/better_notification_mail into lp:widelands-website
I've made a failure recently by updating django-messages to a wrong version. https://wl.widelands.org/forum/topic/4196/ I fixed it in trunk and also in this branch, which means we need to keep the templates in templates/notification/messages_*/full_text -- https://code.launchpad.net/~widelands-dev/widelands-website/better_notification_mail/+merge/335028 Your team Widelands Developers is subscribed to branch lp:widelands-website. ___ 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
