widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands.

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

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1480961 in widelands: "Buildings produce more than set in "configure economy""
  https://bugs.launchpad.net/widelands/+bug/1480961

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug_1480961_configure_economy/+merge/291669

Solves bug 1480961 

-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug_1480961_configure_economy into lp:widelands.

=== 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-12 18:32:13 +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-12 18:32:13 +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-12 18:32:13 +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/granite/init.lua'
--- data/tribes/wares/granite/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/granite/init.lua	2016-04-12 18:32:13 +0000
@@ -7,11 +7,7 @@
    descname = pgettext("ware", "Granite"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      atlanteans = 20,
-      barbarians = 20,
-      empire = 30
-   },
+   default_target_quantity = {},
    preciousness = {
       atlanteans = 5,
       barbarians = 5,

=== 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-12 18:32:13 +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-12 18:32:13 +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/marble/init.lua'
--- data/tribes/wares/marble/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/marble/init.lua	2016-04-12 18:32:13 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Marble"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      empire = 30
-   },
+   default_target_quantity = {},
    preciousness = {
       empire = 3
    },

=== 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-12 18:32:13 +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-12 18:32:13 +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-12 18:32:13 +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