[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
Continuous integration builds have changed state: Travis build 3721. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/407778348. Appveyor build 3521. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3521. -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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/no-hardcoded-resources into lp:widelands
Continuous integration builds have changed state: Travis build 3720. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/407776857. Appveyor build 3520. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_no_hardcoded_resources-3520. -- https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/no-hardcoded-resources 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/no-hardcoded-resources into lp:widelands
Benedikt Straub has proposed merging
lp:~widelands-dev/widelands/no-hardcoded-resources into lp:widelands.
Commit message:
Removed hardcoding for resources
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1713706 in widelands: "Remove hard-coding for resource types from the
engine"
https://bugs.launchpad.net/widelands/+bug/1713706
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/no-hardcoded-resources/+merge/350750
No resources are hardcoded anymore. Geologists can discover any resource set as
discoverable in Lua. Messages have been adjusted to handle the timeout in a
different way.
As a side effect, resource timeout radius and duration can now be set via Lua.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/no-hardcoded-resources into lp:widelands.
=== modified file 'data/world/resources/init.lua'
--- data/world/resources/init.lua 2017-08-30 17:07:20 +
+++ data/world/resources/init.lua 2018-07-24 19:34:27 +
@@ -50,6 +50,18 @@
--
--detectable = true,
--
+--**timeout_millis**
+--*Mandatory*. Defines the time for which geologists messages for this
+--resource will be muted within this area after a find, e.g.::
+--
+--timeout_millis = 3,
+--
+--**timeout_radius**
+--*Mandatory*. Defines the radius within which geologists messages for this
+--resource will be muted after a find, e.g.::
+--
+--timeout_radius = 8,
+--
--**representative_image**
--*Mandatory*. Path to an image file that will represent the resource in menus
--etc., e.g.::
@@ -72,6 +84,8 @@
descname = _ "Coal",
max_amount = 20,
detectable = true,
+ timeout_millis = 3,
+ timeout_radius = 8,
representative_image = pics_dir .. "coal4.png",
editor_pictures = {
[5] = pics_dir .. "coal1.png",
@@ -86,6 +100,8 @@
descname = _ "Gold",
max_amount = 20,
detectable = true,
+ timeout_millis = 3,
+ timeout_radius = 8,
representative_image = pics_dir .. "gold4.png",
editor_pictures = {
[5] = pics_dir .. "gold1.png",
@@ -100,6 +116,8 @@
descname = _ "Iron",
max_amount = 20,
detectable = true,
+ timeout_millis = 3,
+ timeout_radius = 8,
representative_image = pics_dir .. "iron4.png",
editor_pictures = {
[5] = pics_dir .. "iron1.png",
@@ -114,6 +132,8 @@
descname = _ "Stones",
max_amount = 20,
detectable = true,
+ timeout_millis = 3,
+ timeout_radius = 8,
representative_image = pics_dir .. "stones4.png",
editor_pictures = {
[5] = pics_dir .. "stones1.png",
@@ -128,6 +148,8 @@
descname = _ "Water",
max_amount = 50,
detectable = true,
+ timeout_millis = 3,
+ timeout_radius = 8,
representative_image = pics_dir .. "water4.png",
editor_pictures = {
[10] = pics_dir .."water1.png",
@@ -142,6 +164,8 @@
descname = _ "Fish",
max_amount = 20,
detectable = false,
+ timeout_millis = 0,
+ timeout_radius = 0,
representative_image = pics_dir .. "fish.png",
editor_pictures = {
[5] = pics_dir .. "fish1.png",
=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc 2018-07-13 10:35:16 +
+++ src/logic/map_objects/tribes/worker.cc 2018-07-24 19:34:27 +
@@ -975,16 +975,6 @@
.str();
Message::Type message_type = Message::Type::kGeologists;
- if (rdescr->name() == "coal")
-message_type = Message::Type::kGeologistsCoal;
- else if (rdescr->name() == "gold")
-message_type = Message::Type::kGeologistsGold;
- else if (rdescr->name() == "stones")
-message_type = Message::Type::kGeologistsStones;
- else if (rdescr->name() == "iron")
-message_type = Message::Type::kGeologistsIron;
- else if (rdescr->name() == "water")
-message_type = Message::Type::kGeologistsWater;
// We should add a message to the player's message queue - but only,
// if there is not already a similar one in list.
@@ -992,8 +982,8 @@
game, std::unique_ptr(
new Message(message_type, game.get_gametime(), rdescr->descname(),
ri.descr().representative_image_filename(), rdescr->descname(),
- message, position, serial_)),
- 30, 8);
+ message, position, serial_, rdescr->name().c_str())),
+ rdescr->timeout_millis(), rdescr->timeout_radius());
}
}
=== modified file 'src/logic/map_objects/world/resource_description.cc'
--- src/logic/map_objects/world/resource_description.cc 2018-04-07 16:59:00 +
+++ src/logic/map_objects/world/resource_description.cc 2018-07-24 19:34:27 +
@@ -31,6 +31,8 @@
: name_(table.get_string("name")),
descname_(table.get_string("descname")),
detectable_(table.get_bool("detectable")),
+
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/fri-01-portspace into lp:widelands
Continuous integration builds have changed state: Travis build 3719. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/407640491. Appveyor build 3519. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fri_01_portspace-3519. -- https://code.launchpad.net/~widelands-dev/widelands/fri-01-portspace/+merge/350729 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-01-portspace. ___ 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/mines-worldsavior into lp:widelands
found an error which prevented playtesting
will fix the errors and upload within an hour so please do not upload anything
until then.
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/rockmine_deep/init.lua
> 2018-07-24 09:41:57 +
> @@ -63,18 +63,24 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining granite
> because ...
> descname = _"mining granite",
> actions = {
> -"sleep=4",
> +"sleep=39800",
> "return=skipped unless economy needs granite",
> "consume=meal",
> -"animate=working 12000",
> -"mine=stones 3 100 10 5",
> -"produce=granite",
> -"animate=working 12000",
> -"mine=stones 3 100 10 5",
> -"produce=granite",
> -"animate=working 12000",
> -"mine=stones 3 100 10 5",
> -"produce=granite"
> +"animate=working 19000",
> +"animate=working 19000",
> +"animate=working 19000",
> +"mine=granite 3 100 70 5",
> +"produce=granite",
error should be mine=stones
> +"sleep=2000",
> +"mine=granite 3 100 1 5",
> +"mine=granite 3 100 1 5",
> +"mine=granite 3 100 1 5",
> +"produce=granite:3",
> +"sleep=2000",
> +"mine=granite 3 100 1 5",
> +"mine=granite 3 100 1 5",
> +"mine=granite 3 100 1 5",
> +"produce=granite:3"
> }
>},
> },
--
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
___
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/mines-worldsavior into lp:widelands
I agree to Nordfrieses last comment.
Just ignore my commet about worker experience didn't see that it is the
upgraded building.
We should document the new philosophy of the mines preferably in the RST
section:
- now one ressource on the map delivers exactly one ware
- the probability is now calculated over the complete work cycle and
implemented in the first mine command
- all working animations are put at the beginning of the command cycle.
I will try to playtest These values with the AI as this Change might have an
Impact on AI due to different stats if depleted.
Thanks to WorldSavior for the changes
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2017-09-03 07:59:51 +
> +++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -57,17 +57,23 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because
> ...
> descname = _"mining coal",
> actions = {
> -"sleep=45000",
> +"sleep=4",
> "return=skipped unless economy needs coal",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> +"animate=working 2",
> +"animate=working 2",
> +"mine=coal 4 100 35 2",
after or in this line a comment explaining the math behind the 35% Chance if
depleted would be helpful for other developers. Alternatively we should add
some Explanation to the RST section to get it into the Website documentation as
well.
> +"produce=coal",
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"produce=coal:3",
Yes commenting would be fine.
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> "produce=coal:3"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua'
> --- data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua
> 2018-07-09 11:34:23 +
> +++ data/tribes/buildings/productionsites/frisians/mead_brewery/init.lua
> 2018-07-24 09:41:57 +
> @@ -80,7 +80,7 @@
> -- TRANSLATORS: Completed/Skipped/Did not start brewing beer
> because ...
> descname = _"brewing beer",
> actions = {
> -"return=skipped unless economy needs beer or workers need
> experience",
> +"return=skipped unless economy needs beer",
> "sleep=3",
Forget this comment I got this wrong. everything in the code here is fine
> "consume=barley water",
> "animate=working 3",
--
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
___
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/fri-01-portspace into lp:widelands
Benedikt Straub has proposed merging lp:~widelands-dev/widelands/fri-01-portspace into lp:widelands. Commit message: Adds another port space to scenario fri01 to fix difficulties with finding and reaching the port space Requested reviews: MP (pagel-d) Related bugs: Bug #1783115 in widelands: "Frisians 1: relocate port space" https://bugs.launchpad.net/widelands/+bug/1783115 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fri-01-portspace/+merge/350729 The "old" port space still exists. This branch changes the map´s geography slightly and adds a port space directly under the enemy HQ. The player can choose which one to use. The advisor says this in the text, and the objective now mentions the port space location. Not tested, but there should be nothing that can go wrong here. -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/fri-01-portspace. === modified file 'data/campaigns/fri01.wmf/binary/mapobjects' Binary files data/campaigns/fri01.wmf/binary/mapobjects 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/mapobjects 2018-07-24 13:59:44 + differ === modified file 'data/campaigns/fri01.wmf/binary/resource' Binary files data/campaigns/fri01.wmf/binary/resource 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/resource 2018-07-24 13:59:44 + differ === modified file 'data/campaigns/fri01.wmf/binary/terrain' Binary files data/campaigns/fri01.wmf/binary/terrain 2018-02-19 08:50:22 + and data/campaigns/fri01.wmf/binary/terrain 2018-07-24 13:59:44 + differ === modified file 'data/campaigns/fri01.wmf/elemental' --- data/campaigns/fri01.wmf/elemental 2018-02-23 09:25:47 + +++ data/campaigns/fri01.wmf/elemental 2018-07-24 13:59:44 + @@ -1,13 +1,13 @@ -# Automatically created by Widelands bzr8485[frisians] (Release) +# Automatically created by Widelands bzr8766[widelands] (Release) [global] packet_version="1" map_w="224" map_h="128" nr_players="2" -name=_"The Great Stormflood" +name="The Great Stormflood" author="Nordfriese" -descr=_"In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here?" -hint=_"This scenario is set in a historical context, but most of the story line is fiction." +descr="In 1362, the quiet, peaceful life of the inhabitants of the Northern Frisian Islands was disrupted by one of the greatest storm floods in human memory: Saint Marcellus’ Flood. Is it really nothing more than yet another storm, or a sign from the Gods that the Frisian community on the island of Langeness is not wanted here?" +hint="This scenario is set in a historical context, but most of the story line is fiction." background="campaigns/fri01.wmf/pics/background.jpg" tags="seafaring" === modified file 'data/campaigns/fri01.wmf/objective' --- data/campaigns/fri01.wmf/objective 2018-02-19 08:50:22 + +++ data/campaigns/fri01.wmf/objective 2018-07-24 13:59:44 + @@ -1,4 +1,4 @@ -# Automatically created by Widelands bzr8485[frisians] (Release) +# Automatically created by Widelands bzr8766[widelands] (Release) [global] packet_version="2" === modified file 'data/campaigns/fri01.wmf/player_names' --- data/campaigns/fri01.wmf/player_names 2018-02-19 08:50:22 + +++ data/campaigns/fri01.wmf/player_names 2018-07-24 13:59:44 + @@ -1,4 +1,4 @@ -# Automatically created by Widelands bzr8485[frisians] (Release) +# Automatically created by Widelands bzr8766[widelands] (Release) [global] packet_version="2" === modified file 'data/campaigns/fri01.wmf/player_position' --- data/campaigns/fri01.wmf/player_position 2018-02-19 08:50:22 + +++ data/campaigns/fri01.wmf/player_position 2018-07-24 13:59:44 + @@ -1,6 +1,6 @@ -# Automatically created by Widelands bzr8485[frisians] (Release) +# Automatically created by Widelands bzr8766[widelands] (Release) [global] packet_version="2" player_1="24 108" -player_2="204 18" +player_2="203 20" === modified file 'data/campaigns/fri01.wmf/port_spaces' --- data/campaigns/fri01.wmf/port_spaces 2018-02-19 08:50:22 + +++ data/campaigns/fri01.wmf/port_spaces 2018-07-24 13:59:44 + @@ -1,9 +1,10 @@ -# Automatically created by Widelands bzr8485[frisians] (Release) +# Automatically created by Widelands bzr8766[widelands] (Release) [global] packet_version="1" -number_of_port_spaces="2" +number_of_port_spaces="3" [port_spaces] 0="210 10" -1="22 109" +1="203 20" +2="22 109" === modified file 'data/campaigns/fri01.wmf/scripting/init.lua' --- data/campaigns/fri01.wmf/scripting/init.lua 2018-04-03 15:12:46 + +++ data/campaigns/fri01.wmf/scripting/init.lua 2018-07-24 13:59:44 + @@ -16,7 +16,6 @@ first_to_flood = map:get_field(9, 89) expansion_mark = map:get_field(68, 68)
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
Found another issue: For the buildings where the penalty for missing wares has
been removed, the program order is now:
"return=skipped unless economy needs ",
"consume=",
"animate=working ",
"sleep=",
"produce="
The last two lines should be switched here for all those buildings. It´ll look
strange if the building works, then nothing happens, much later after some
sleeptime a ware is produced.
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2017-09-03 07:59:51 +
> +++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -57,17 +57,23 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because
> ...
> descname = _"mining coal",
> actions = {
> -"sleep=45000",
> +"sleep=4",
> "return=skipped unless economy needs coal",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> +"animate=working 2",
> +"animate=working 2",
> +"mine=coal 4 100 35 2",
> +"produce=coal",
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"produce=coal:3",
There are two sets of three commands each, so the chance that a given mine will
encounter the bug is high. But as it can happen only once per mine, I guess
you´re right, it´s acceptable.
A comment should be put in the code to document this.
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> "produce=coal:3"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/frisians/coalmine/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -69,6 +69,7 @@
> "consume=ration",
> "animate=working 4",
+1
I wouldn´t make it faster than 3 though
> "mine=coal 3 50 5 20",
> +"mine=coal 3 50 100 20",
> "produce=coal:2"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
> 2018-07-24 09:41:57 +
> @@ -63,15 +63,22 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because
> ...
> descname = _"mining gold",
> actions = {
> -"sleep=4",
> -"return=skipped unless economy needs gold_ore",
> +"sleep=39800",
> +"return=skipped unless economy needs coal",
> "consume=meal",
> -"animate=working 18000",
> -"mine=gold 3 100 10 5",
> -"produce=gold_ore:2",
> -"animate=working 18000",
> -"mine=gold 3 100 10 5",
> -"produce=gold_ore:2"
> +"animate=working 19000",
> +"animate=working 19000",
> +"animate=working 19000",
> +"mine=gold 3 100 50 5",
> +"produce=gold",
> +"sleep=2000",
> +"mine=gold 3 100 1 5",
> +"mine=gold 3 100 1 5",
> +"produce=gold:2",
> +"sleep=2000",
> +"mine=gold 3 100 1 5",
> +"mine=gold 3 100 1 5",
> +"produce=gold:2"
+1
> }
>},
> },
--
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/mines-worldsavior.
___
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/mines-worldsavior into lp:widelands
Continuous integration builds have changed state: Travis build 3718. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/407539420. Appveyor build 3518. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_mines_worldsavior-3518. -- https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/mines-worldsavior. ___ 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/mines-worldsavior into lp:widelands
Agree to most of Nordfrieses Comments
stats are looking much better now in the Excel. will upload them to the bug ASAP
Diff comments:
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2017-09-03 07:59:51 +
> +++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -57,17 +57,23 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because
> ...
> descname = _"mining coal",
> actions = {
> -"sleep=45000",
> +"sleep=4",
> "return=skipped unless economy needs coal",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> +"animate=working 2",
> +"animate=working 2",
> +"mine=coal 4 100 35 2",
> +"produce=coal",
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"produce=coal:3",
I think this is a tradeoff to have the tooltip read "has produced 3 coal" Your
Scenario only happens if the mine is depleted directly between step 2 and step
3 (i.e. step 2 mines the last coal) so I think it is worth the pain
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
+1
> "produce=coal:3"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/frisians/coalmine/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -69,6 +69,7 @@
> "consume=ration",
> "animate=working 4",
I would vote to lower this value to 3 or even 25000 to boost coal
production per Minute a bit. as this is the last open Point in the current stats
> "mine=coal 3 50 5 20",
> +"mine=coal 3 50 100 20",
> "produce=coal:2"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/goldmine_deep/init.lua
> 2018-07-24 09:41:57 +
> @@ -63,15 +63,22 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining gold because
> ...
> descname = _"mining gold",
> actions = {
> -"sleep=4",
> -"return=skipped unless economy needs gold_ore",
> +"sleep=39800",
> +"return=skipped unless economy needs coal",
> "consume=meal",
> -"animate=working 18000",
> -"mine=gold 3 100 10 5",
> -"produce=gold_ore:2",
> -"animate=working 18000",
> -"mine=gold 3 100 10 5",
> -"produce=gold_ore:2"
> +"animate=working 19000",
> +"animate=working 19000",
> +"animate=working 19000",
> +"mine=gold 3 100 50 5",
> +"produce=gold",
> +"sleep=2000",
> +"mine=gold 3 100 1 5",
> +"mine=gold 3 100 1 5",
> +"produce=gold:2",
> +"sleep=2000",
> +"mine=gold 3 100 1 5",
> +"mine=gold 3 100 1 5",
> +"produce=gold:2"
should be gold_ore.
Furthermore I wouzld prefer to have a cycle of 1 Gold, 1 Gold, 3 Gold as the
tooltip would read much better.
> }
>},
> },
>
> === modified file
> 'data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua'
> --- data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua
> 2018-07-19 09:40:06 +
> +++ data/tribes/buildings/productionsites/frisians/ironmine_deep/init.lua
> 2018-07-24 09:41:57 +
> @@ -63,15 +63,24 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining iron because
> ...
> descname = _"mining iron",
> actions = {
> -"sleep=4",
> -"return=skipped unless economy needs iron_ore",
> + "sleep=62000",
> +"return=skipped unless economy needs iron",
should be iron_ore from my side
> "consume=meal",
> -"animate=working 18000",
> -"mine=iron 3 100 10 5",
> -"produce=iron_ore:2",
> -
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
Review: Needs Fixing review
Reviewed the code, added a lot of small comments for code style. Feel free to
ignore.
Also found a typo in the frisian deep gold mine and a possible bug in the
design of all mines, please fix.
Is it really intended that the frisian deep gold and iron mines produce gold
and iron directly now, rather than ores???
Diff comments:
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
> 2017-09-03 07:59:51 +
> +++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua
> 2018-07-24 09:41:57 +
> @@ -151,11 +151,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging a steel
> shield because ...
> descname = _"forging a steel shield",
> actions = {
> --- time total: 90
> +-- time total: 67+3,6
Please consistently use decimal points here (3.6).
> "return=skipped unless economy needs shield_steel",
> -"sleep=45000", -- +13 enlarge
> +"sleep=32000",
> "consume=iron:2 coal:2",
> -"animate=working 45000", -- +10 enlarge
> +"animate=working 35000",
> "produce=shield_steel"
> }
>},
> @@ -163,11 +163,11 @@
> -- TRANSLATORS: Completed/Skipped/Did not start forging an advanced
> shield because ...
> descname = _"forging an advanced shield",
> actions = {
> --- time total: 110
> +-- time total: 77+3,6
decimal points
> "return=skipped unless economy needs shield_advanced",
> "consume=iron:2 coal:2 gold",
> -"sleep=5", -- +18 enlarge
> -"animate=working 6", -- +15 enlarge
> +"sleep=32000",
> +"animate=working 45000",
> "produce=shield_advanced"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2017-09-03 07:59:51 +
> +++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -57,17 +57,23 @@
> -- TRANSLATORS: Completed/Skipped/Did not start mining coal because
> ...
> descname = _"mining coal",
> actions = {
> -"sleep=45000",
> +"sleep=4",
> "return=skipped unless economy needs coal",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> -"produce=coal:2",
> -"animate=working 2",
> -"mine=coal 4 100 5 2",
> +"animate=working 2",
> +"animate=working 2",
Please summarize those working commands to "animate=working 6". This is
more logical and makes the code much easier to read.
> +"mine=coal 4 100 35 2",
> +"produce=coal",
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"produce=coal:3",
Bug alert: If the first two "mine" commands succeed but the third one fails
because the mine is empty now, two units have been mined but are not produced.
For _all_ mines, better change this to something like:
"mine=coal 4 100 1 2",
"produce=coal",
"mine=coal 4 100 1 2",
"produce=coal",
"mine=coal 4 100 1 2",
"produce=coal",
> +"sleep=2500",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
> +"mine=coal 4 100 1 2",
We should consider adding a parameter to the "mine" program to make
programs like this cleaner
> "produce=coal:3"
> }
>},
>
> === modified file
> 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
> --- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
> 2018-03-04 14:11:19 +
> +++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua
> 2018-07-24 09:41:57 +
> @@ -71,20 +71,23 @@
> descname = _"mining granite",
> actions = {
> "return=skipped unless economy needs granite",
> -"sleep=45000",
> +"sleep=4",
> "consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
> "animate=working 2",
> -"mine=stones 4 100 5 2",
> -"produce=granite:2",
> -"animate=working 2",
> -"mine=stones 4 100 5 2",
> -"produce=granite:2",
> -"animate=working 2",
> -"mine=stones 4 100 5 2",
> +
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands has been updated. Commit message changed to: Diverse balancing tweaks for productionsites - Honey Bread Bakery now only ignores economy requirements when producing Honeybread and the workers need experience. Same goes for Mead Brewery. - All Smelting Works, Furnaces, Smokeries, Recycling Center, Altantean and Frisian Toolsmithies, Taverns, Inns and Drinking Halls no longer waste time if a ware is missing and they ave to skip a program. - Tweaked programs for Weapon/Armor producing buildings - Imperial Armor Smithy produces 1 more Helm per run to balance the amount of armor types for training. - Changed the order of programs in the Atlantean Toolsmithy - Improved efficiency for Frisian Deep Mines to align with the efficiency of the corresponding Barbarian mines - Gave the Barbarian Deep Gold Mine the same stats as the Deep Iron Mine For more details, see: https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/mines-worldsavior 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/mines-worldsavior into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/mines-worldsavior
into lp:widelands.
Commit message:
Diverse balancing tweaks for productionsites
- Honey Bread Bakery now only ignores economy requirements when producing
Honeybread and the workers need experience. Same goes for Mead Brewery.
- All Smelting Works, Furnaces, Smokeries, Recycling Center, Altantean and
Frisian Toolsmithies, Taverns, Inns and Drinking Halls no longer waste time
if a ware is missing and they ave to skip a program.
- Tweaked programs for Weapon/Armor producing buildings
- Imperial Armor Smithy produces 1 more Helm per run to balance the amount of
armor types for training.
- Changed the order of programs in the Atlantean Toolsmithy
- Improved efficiency for Frisian Deep Mines to align with the efficiency of
the corresponding Barbarian mines
- Gave the Barbarian Deep Gold Mine the same stats as the Deep Iron Mine
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/mines-worldsavior/+merge/350716
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/mines-worldsavior into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2017-09-03 07:59:51 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2018-07-24 09:41:57 +
@@ -151,11 +151,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
descname = _"forging a steel shield",
actions = {
--- time total: 90
+-- time total: 67+3,6
"return=skipped unless economy needs shield_steel",
-"sleep=45000", -- +13 enlarge
+"sleep=32000",
"consume=iron:2 coal:2",
-"animate=working 45000", -- +10 enlarge
+"animate=working 35000",
"produce=shield_steel"
}
},
@@ -163,11 +163,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
descname = _"forging an advanced shield",
actions = {
--- time total: 110
+-- time total: 77+3,6
"return=skipped unless economy needs shield_advanced",
"consume=iron:2 coal:2 gold",
-"sleep=5", -- +18 enlarge
-"animate=working 6", -- +15 enlarge
+"sleep=32000",
+"animate=working 45000",
"produce=shield_advanced"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2017-09-03 07:59:51 +
+++ data/tribes/buildings/productionsites/atlanteans/coalmine/init.lua 2018-07-24 09:41:57 +
@@ -57,17 +57,23 @@
-- TRANSLATORS: Completed/Skipped/Did not start mining coal because ...
descname = _"mining coal",
actions = {
-"sleep=45000",
+"sleep=4",
"return=skipped unless economy needs coal",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"animate=working 2",
-"mine=coal 4 100 5 2",
-"produce=coal:2",
-"animate=working 2",
-"mine=coal 4 100 5 2",
-"produce=coal:2",
-"animate=working 2",
-"mine=coal 4 100 5 2",
+"animate=working 2",
+"animate=working 2",
+"mine=coal 4 100 35 2",
+"produce=coal",
+"sleep=2500",
+"mine=coal 4 100 1 2",
+"mine=coal 4 100 1 2",
+"mine=coal 4 100 1 2",
+"produce=coal:3",
+"sleep=2500",
+"mine=coal 4 100 1 2",
+"mine=coal 4 100 1 2",
+"mine=coal 4 100 1 2",
"produce=coal:3"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-03-04 14:11:19 +
+++ data/tribes/buildings/productionsites/atlanteans/crystalmine/init.lua 2018-07-24 09:41:57 +
@@ -71,20 +71,23 @@
descname = _"mining granite",
actions = {
"return=skipped unless economy needs granite",
-"sleep=45000",
+"sleep=4",
"consume=smoked_fish,smoked_meat:2 atlanteans_bread:2",
"animate=working 2",
-"mine=stones 4 100 5 2",
-"produce=granite:2",
-"animate=working 2",
-"mine=stones 4 100 5 2",
-"produce=granite:2",
-"animate=working 2",
-"mine=stones 4 100 5 2",
+"animate=working
