Merge lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands

[kaputtnik]

Hide wares from configure economy which does not need prerequisites and therefor are produced 'endless'

Solves bug 1480961

[GunChleoc (gunchleoc)]

Not tested yet, but code LGTM.

@Tibor: does this affect the AI in any way?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1004. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/122593739.
Appveyor build 837. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1480961_configure_economy-837.

[TiborB (tiborb95)]

I would say it is safe for AI

However I am not sure that it is good for granite and marble - they can be mined also in mine (correct?) and a mine can decide that no further mining is needed...

[GunChleoc (gunchleoc)]

Good point - granite and marble need to stay in. I have tested this now, so once you have made the change, this can be merged.

review: Approve

[kaputtnik (franku)]

Thanks Tibor and GunChleoc :-)

Hopefully i didn't forgot any other ware.

@bunnybot merge

=== modified file 'data/tribes/wares/blackroot/init.lua'
--- data/tribes/wares/blackroot/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/blackroot/init.lua	2016-04-13 15:50:42 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Blackroot"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 20
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 10
    },
 
=== modified file 'data/tribes/wares/corn/init.lua'
--- data/tribes/wares/corn/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/corn/init.lua	2016-04-13 15:50:42 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Corn"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 25
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 12
    },
 
=== modified file 'data/tribes/wares/fish/init.lua'
--- data/tribes/wares/fish/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/fish/init.lua	2016-04-13 15:50:42 +0000
@@ -7,11 +7,7 @@
    descname = pgettext("ware", "Fish"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 20,
-      barbarians = 20,
-      empire = 10
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 4,
       barbarians = 3,
 
=== modified file 'data/tribes/wares/grape/init.lua'
--- data/tribes/wares/grape/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/grape/init.lua	2016-04-13 15:50:42 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Grape"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      empire = 20
-   },
+   default_target_quantity = {},
    preciousness = {
       empire = 10
    },
 
=== modified file 'data/tribes/wares/log/init.lua'
--- data/tribes/wares/log/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/log/init.lua	2016-04-13 15:50:42 +0000
@@ -7,11 +7,7 @@
    descname = pgettext("ware", "Log"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 40,
-      barbarians = 40,
-      empire = 40
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 14,
       barbarians = 14,
 
=== modified file 'data/tribes/wares/thatch_reed/init.lua'
--- data/tribes/wares/thatch_reed/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/thatch_reed/init.lua	2016-04-13 15:50:42 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Thatch Reed"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      barbarians = 10
-   },
+   default_target_quantity = {},
    preciousness = {
       barbarians = 5
    },
 
=== modified file 'data/tribes/wares/water/init.lua'
--- data/tribes/wares/water/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/water/init.lua	2016-04-13 15:50:42 +0000
@@ -7,11 +7,7 @@
    descname = pgettext("ware", "Water"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 25,
-      barbarians = 25,
-      empire = 25
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 7,
       barbarians = 8,
 
=== modified file 'data/tribes/wares/wheat/init.lua'
--- data/tribes/wares/wheat/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/wheat/init.lua	2016-04-13 15:50:42 +0000
@@ -7,10 +7,7 @@
    descname = pgettext("ware", "Wheat"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      barbarians = 25,
-      empire = 25
-   },
+   default_target_quantity = {},
    preciousness = {
       barbarians = 12,
       empire = 12