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

[GunChleoc]

Various balancing changes for Frisian production.

[Benedikt Straub (nordfriese)]

I´m fine with the changes to training camp and tavern.
Having the aqua farm consume just 1 water is illogical, because the water is needed to fill a pond. It should be at least 2 water per cycle.

I am *very* unhappy about the experience changes, since large experience demands are part of the tribe´s character. Just 10 XP for the brewer?!? That´s much to few, and he must need more XP than the baker. Perhaps lowering the baker from 16 to 13 (that´s already very few!) and the brewer from 19 to 15? No more than that please. And the decrease for the blacksmith is _far_ too great as well. Perhaps to 18 or even 17, but not more.

review: Needs Fixing

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4084. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/435511178.
Appveyor build 3880. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_balancing_worldsavior_201809-3880.

[Benedikt Straub (nordfriese)]

All right, I can agree with that

review: Approve (diff)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4092. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/437007517.
Appveyor build 3888. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_frisian_balancing_worldsavior_201809-3888.

[GunChleoc (gunchleoc)]

@bunnybot merge

[bunnybot (widelandsofficial)]

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4092. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/437007517.

[GunChleoc (gunchleoc)]

apt-get install failed

@bunnybot merge force

=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua	2018-09-18 05:40:48 +0000
+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua	2018-10-04 07:15:15 +0000
@@ -65,10 +65,10 @@
          actions = {
             "return=skipped unless economy needs fish",
             "sleep=23000",
-            "return=failed unless site has water:3",
+            "return=failed unless site has water:2",
             "return=failed unless site has fruit",
             "callworker=breed_in_pond",
-            "consume=fruit water:3",
+            "consume=fruit water:2",
          },
       },
       fish_pond = {

=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
--- data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-09-10 12:32:56 +0000
+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua	2018-10-04 07:15:15 +0000
@@ -89,8 +89,8 @@
          actions = {
             -- time total: 66
             "return=skipped unless economy needs ration",
-            "sleep=5000",
             "consume=fruit,bread_frisians smoked_fish,smoked_meat",
+            "sleep=5000",
             "animate=working 51000",
             "sleep=10000",
             "produce=ration:2"

=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-09-16 13:19:53 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua	2018-10-04 07:15:15 +0000
@@ -55,7 +55,7 @@
    inputs = {
       { name = "smoked_fish", amount = 6 },
       { name = "smoked_meat", amount = 6 },
-      { name = "mead", amount = 8 },
+      { name = "mead", amount = 6 },
       { name = "honey_bread", amount = 6 },
       { name = "sword_long", amount = 3 },
       { name = "sword_broad", amount = 3 },
@@ -123,7 +123,7 @@
             "checksoldier=soldier attack 3",
             "animate=working 22800",
             "checksoldier=soldier attack 3", -- Because the soldier can be expelled by the player
-            "consume=sword_long honey_bread mead:2 smoked_fish,smoked_meat",
+            "consume=sword_long honey_bread mead smoked_fish,smoked_meat",
             "train=soldier attack 3 4"
          }
       },
@@ -134,7 +134,7 @@
             "checksoldier=soldier attack 4",
             "animate=working 15600",
             "checksoldier=soldier attack 4", -- Because the soldier can be expelled by the player
-            "consume=sword_broad honey_bread mead:2 smoked_fish,smoked_meat",
+            "consume=sword_broad honey_bread mead smoked_fish,smoked_meat",
             "train=soldier attack 4 5",
             "produce=scrap_iron:2"
          }
@@ -146,7 +146,7 @@
             "checksoldier=soldier attack 5",
             "animate=working 15600",
             "checksoldier=soldier attack 5", -- Because the soldier can be expelled by the player
-            "consume=sword_double honey_bread mead:2 smoked_fish,smoked_meat",
+            "consume=sword_double honey_bread mead smoked_fish,smoked_meat",
             "train=soldier attack 5 6",
             "produce=scrap_iron scrap_metal_mixed"
          }

=== modified file 'data/tribes/buildings/trainingsites/frisians/training_camp/init.lua'
--- data/tribes/buildings/trainingsites/frisians/training_camp/init.lua	2018-08-13 08:10:53 +0000
+++ data/tribes/buildings/trainingsites/frisians/training_camp/init.lua	2018-10-04 07:15:15 +0000
@@ -52,8 +52,8 @@
    },
 
    inputs = {
+      { name = "beer", amount = 6 },
       { name = "bread_frisians", amount = 6 },
-      { name = "beer", amount = 6 },
       { name = "smoked_fish", amount = 6 },
       { name = "smoked_meat", amount = 6 },
       { name = "sword_long", amount = 2 },

=== modified file 'data/tribes/workers/frisians/baker/init.lua'
--- data/tribes/workers/frisians/baker/init.lua	2018-02-06 11:17:48 +0000
+++ data/tribes/workers/frisians/baker/init.lua	2018-10-04 07:15:15 +0000
@@ -23,7 +23,7 @@
       bread_paddle = 1
    },
 
-   experience = 16,
+   experience = 13,
    becomes = "frisians_baker_master",
 
    animations = animations,

=== modified file 'data/tribes/workers/frisians/blacksmith/init.lua'
--- data/tribes/workers/frisians/blacksmith/init.lua	2018-02-06 11:17:48 +0000
+++ data/tribes/workers/frisians/blacksmith/init.lua	2018-10-04 07:15:15 +0000
@@ -23,7 +23,7 @@
       hammer = 1
    },
 
-   experience = 22,
+   experience = 18,
    becomes = "frisians_blacksmith_master",
 
    animations = animations,

=== modified file 'data/tribes/workers/frisians/brewer/init.lua'
--- data/tribes/workers/frisians/brewer/init.lua	2018-02-06 11:17:48 +0000
+++ data/tribes/workers/frisians/brewer/init.lua	2018-10-04 07:15:15 +0000
@@ -22,7 +22,7 @@
       frisians_carrier = 1
    },
 
-   experience = 19,
+   experience = 15,
    becomes = "frisians_brewer_master",
 
    animations = animations,