widelands-dev team mailing list archive

[hessenfarmer <stephan-lutz@xxxxxx>]

hessenfarmer has proposed merging lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

Commit message:
Some balancing fixes:

- Fixed the bug that barbarian trading outposts, villages and fortified villages start with zero master-miners instead of 4 (like the headquarter does)

- Removed superfluous economy settings of imperial wine

- Fixed the bug that Frisian clay pits ignore economy settings. They do so now only if the economy needs fish, because Fish-producing aqua farms can stop working if the clay pits do so

- Reduced the problem that Frisian scrap metal tends to pile up: Recycling centers will not skipping anymore if the economy doesn't need coal. (If they would never skip there would be cases in which they use precious coal which is currently needed elsewhere - which could be bad even though recycling saves coal after a while)

- Reduced the costs for frisian Helmet to 1 coal and 1 iron. Adopted the scrap return as well

- Increased frisian farm workspace to radius 3

Requested reviews:
  Widelands Developers (widelands-dev)

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

Some balancing fixes from Worldsavior. Note:

Unfortunately there is a little problem: If the recycling center skips and you mouse over it it says something like "skipped because economy doesn't need iron and"  instead of "skipped because economy doesn't need iron and economy needs coal". I don't know how to solve that, but I guess that the problem is that a building normally doesn't skip if a ware is needed instead of being not needed.

When we merge this branch, we need to record that problem in a bug, because it needs an engine fix.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/frisian_balancing_2 into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua'
--- data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/armor_smithy_small/init.lua	2018-09-19 19:54:15 +0000
@@ -105,7 +105,7 @@
          actions = {
             -- time total: 67 + 3.6
             "return=skipped unless economy needs helmet",
-            "consume=coal iron:2",
+            "consume=coal iron",
             "sleep=30000",
             "playsound=sound/smiths smith 192",
             "animate=working 37000",

=== modified file 'data/tribes/buildings/productionsites/frisians/clay_pit/init.lua'
--- data/tribes/buildings/productionsites/frisians/clay_pit/init.lua	2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/clay_pit/init.lua	2018-09-19 19:54:15 +0000
@@ -59,7 +59,7 @@
          descname = _"making clay",
          actions = {
             "sleep=20000",
-            "return=skipped unless economy needs clay or site has water",
+            "return=skipped unless economy needs clay or economy needs fish", -- Fish-producing aqua farms can stop working if the clay pits do so
             "return=failed unless site has water",
             "callworker=dig",
             "consume=water",

=== modified file 'data/tribes/buildings/productionsites/frisians/hunters_house/init.lua'
--- data/tribes/buildings/productionsites/frisians/hunters_house/init.lua	2018-07-17 10:13:49 +0000
+++ data/tribes/buildings/productionsites/frisians/hunters_house/init.lua	2018-09-19 19:54:15 +0000
@@ -56,6 +56,10 @@
             "callworker=hunt",
             "sleep=35000",
             "callworker=hunt",
+            "sleep=35000",
+            "callworker=hunt",
+            "sleep=35000",
+            "callworker=hunt",
             "produce=fur"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/frisians/recycling_center/init.lua'
--- data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/recycling_center/init.lua	2018-09-19 19:54:15 +0000
@@ -95,10 +95,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start recycling iron because ...
          descname = pgettext("frisians_building", "recycling iron"),
          actions = {
-            "return=skipped unless economy needs iron",
+            "return=skipped unless economy needs iron or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal
+            "sleep=40000",
             "consume=scrap_iron:2 coal",
             "animate=working_metal 40000",
-            "sleep=40000",
             "produce=iron:2"
          }
       },
@@ -106,10 +106,10 @@
          -- TRANSLATORS: Completed/Skipped/Did not start recycling iron and gold because ...
          descname = pgettext("frisians_building", "recycling iron and gold"),
          actions = {
-            "return=skipped unless economy needs iron or economy needs gold",
+            "return=skipped unless economy needs iron or economy needs gold or not economy needs coal", -- if the economy doesn't need coal the situation gets even improved because recycling saves coal
+            "sleep=40000",
             "consume=scrap_metal_mixed:2 coal",
             "animate=working_metal 40000",
-            "sleep=40000",
             "produce=iron gold"
          }
       },

=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-07-25 19:54:53 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-09-19 19:54:15 +0000
@@ -172,7 +172,7 @@
             "checksoldier=soldier health 1", -- Because the soldier can be expelled by the player
             "consume=helmet_golden honey_bread,mead smoked_fish,smoked_meat",
             "train=soldier health 1 2",
-            "produce=scrap_iron:2"
+            "produce=scrap_iron"
          }
       },
    },

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2018-07-15 10:32:12 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2018-09-19 19:54:15 +0000
@@ -58,6 +58,7 @@
             barbarians_geologist = 4,
             barbarians_lumberjack = 2,
             barbarians_miner = 4,
+            barbarians_miner_master = 4,
             barbarians_ranger = 1,
             barbarians_stonemason = 2,
             barbarians_trainer = 3,

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2018-07-15 10:32:12 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2018-09-19 19:54:15 +0000
@@ -63,6 +63,7 @@
             barbarians_lime_burner = 1,
             barbarians_lumberjack = 3,
             barbarians_miner = 4,
+            barbarians_miner_master = 4,
             barbarians_ranger = 1,
             barbarians_stonemason = 2,
             barbarians_trainer = 4,

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/village.lua	2017-11-21 09:26:16 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/village.lua	2018-09-19 19:54:15 +0000
@@ -60,6 +60,7 @@
             barbarians_geologist = 4,
             barbarians_lumberjack = 2,
             barbarians_miner = 4,
+            barbarians_miner_master = 4,
             barbarians_ranger = 1,
             barbarians_stonemason = 2,
             barbarians_ox = 5,

=== modified file 'data/tribes/scripting/starting_conditions/frisians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/frisians/fortified_village.lua	2018-05-23 05:13:49 +0000
+++ data/tribes/scripting/starting_conditions/frisians/fortified_village.lua	2018-09-19 19:54:15 +0000
@@ -50,7 +50,7 @@
             bread_paddle = 2,
             kitchen_tools = 2,
             felling_ax = 3,
-            needles = 2,
+            needles = 1,
             basket = 2,
             pick = 5,
             shovel = 5,
@@ -81,6 +81,7 @@
              frisians_stonemason = 2,
              frisians_reindeer = 5,
              frisians_trainer = 3,
+             frisians_seamstress_master = 1,
          },
          soldiers = {
             [{0,0,0,0}] = 33,

=== modified file 'data/tribes/scripting/starting_conditions/frisians/headquarters.lua'
--- data/tribes/scripting/starting_conditions/frisians/headquarters.lua	2018-05-23 05:13:49 +0000
+++ data/tribes/scripting/starting_conditions/frisians/headquarters.lua	2018-09-19 19:54:15 +0000
@@ -54,7 +54,7 @@
          bread_paddle = 2,
          kitchen_tools = 2,
          felling_ax = 3,
-         needles = 2,
+         needles = 1,
          basket = 2,
          pick = 5,
          shovel = 5,
@@ -86,6 +86,7 @@
          frisians_stonemason = 2,
          frisians_reindeer = 5,
          frisians_trainer = 3,
+         frisians_seamstress_master = 1,
       },
       soldiers = {
          [{0,0,0,0}] = 45,

=== modified file 'data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua	2018-07-11 16:45:28 +0000
+++ data/tribes/scripting/starting_conditions/frisians/trading_outpost.lua	2018-09-19 19:54:15 +0000
@@ -54,7 +54,7 @@
              bread_paddle = 2,
              kitchen_tools = 2,
              felling_ax = 3,
-             needles = 2,
+             needles = 1,
              basket = 2,
              pick = 5,
              shovel = 5,
@@ -85,6 +85,7 @@
              frisians_stonemason = 2,
              frisians_reindeer = 5,
              frisians_trainer = 4,
+             frisians_seamstress_master = 1,
          },
          -- Max health: 2, Max attack: 6, Max defense: 2, Max evade: 0
          soldiers = {

=== modified file 'data/tribes/scripting/starting_conditions/frisians/village.lua'
--- data/tribes/scripting/starting_conditions/frisians/village.lua	2018-05-23 05:13:49 +0000
+++ data/tribes/scripting/starting_conditions/frisians/village.lua	2018-09-19 19:54:15 +0000
@@ -55,7 +55,7 @@
          bread_paddle = 2,
          kitchen_tools = 2,
          felling_ax = 3,
-         needles = 2,
+         needles = 1,
          basket = 2,
          pick = 5,
          shovel = 5,
@@ -83,6 +83,7 @@
          frisians_forester = 2,
          frisians_stonemason = 2,
          frisians_reindeer = 5,
+         frisians_seamstress_master = 1,
       },
       soldiers = {
          [{0,0,0,0}] = 5,

=== modified file 'data/tribes/wares/wine/init.lua'
--- data/tribes/wares/wine/init.lua	2015-12-11 16:54:00 +0000
+++ data/tribes/wares/wine/init.lua	2018-09-19 19:54:15 +0000
@@ -7,9 +7,7 @@
    descname = pgettext("ware", "Wine"),
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
-   default_target_quantity = {
-      empire = 20
-   },
+   default_target_quantity = {},
    preciousness = {
       empire = 8
    },

=== modified file 'data/tribes/workers/frisians/farmer/init.lua'
--- data/tribes/workers/frisians/farmer/init.lua	2018-07-08 18:32:58 +0000
+++ data/tribes/workers/frisians/farmer/init.lua	2018-09-19 19:54:15 +0000
@@ -40,7 +40,7 @@
 
    programs = {
       plant = {
-         "findspace=size:any radius:2 space",
+         "findspace=size:any radius:3 space",
          "walk=coords",
          "animate=planting 8000",
          "plant=attrib:seed_barley",
@@ -48,7 +48,7 @@
          "return"
       },
       harvest = {
-         "findobject=attrib:ripe_barley radius:2",
+         "findobject=attrib:ripe_barley radius:3",
          "walk=object",
          "animate=harvesting 10000",
          "callobject=harvest",