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

Proposed by GunChleoc
Status: Merged
Merged at revision: 8871
Proposed branch: lp:~widelands-dev/widelands/frisian_balancing_worldsavior_201809
Merge into: lp:widelands
Diff against target: 123 lines (+11/-11)
7 files modified
data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua (+2/-2)
data/tribes/buildings/productionsites/frisians/tavern/init.lua (+1/-1)
data/tribes/buildings/trainingsites/frisians/training_arena/init.lua (+4/-4)
data/tribes/buildings/trainingsites/frisians/training_camp/init.lua (+1/-1)
data/tribes/workers/frisians/baker/init.lua (+1/-1)
data/tribes/workers/frisians/blacksmith/init.lua (+1/-1)
data/tribes/workers/frisians/brewer/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/frisian_balancing_worldsavior_201809
Reviewer Review Type Date Requested Status
Benedikt Straub diff Approve
Review via email: mp+355907@code.launchpad.net

Commit message

Various balancing changes for Frisian production.

To post a comment you must log in.
Revision history for this message
Benedikt Straub (nordfriese) wrote :

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
Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

8848. By GunChleoc

Incorporated feedback from code review & forum

Revision history for this message
Benedikt Straub (nordfriese) wrote :

All right, I can agree with that

review: Approve (diff)
Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Revision history for this message
GunChleoc (gunchleoc) wrote :

@bunnybot merge

Revision history for this message
bunnybot (widelandsofficial) wrote :

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.

Revision history for this message
GunChleoc (gunchleoc) wrote :

apt-get install failed

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua'
2--- data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2018-09-18 05:40:48 +0000
3+++ data/tribes/buildings/productionsites/frisians/aqua_farm/init.lua 2018-10-04 07:15:15 +0000
4@@ -65,10 +65,10 @@
5 actions = {
6 "return=skipped unless economy needs fish",
7 "sleep=23000",
8- "return=failed unless site has water:3",
9+ "return=failed unless site has water:2",
10 "return=failed unless site has fruit",
11 "callworker=breed_in_pond",
12- "consume=fruit water:3",
13+ "consume=fruit water:2",
14 },
15 },
16 fish_pond = {
17
18=== modified file 'data/tribes/buildings/productionsites/frisians/tavern/init.lua'
19--- data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-09-10 12:32:56 +0000
20+++ data/tribes/buildings/productionsites/frisians/tavern/init.lua 2018-10-04 07:15:15 +0000
21@@ -89,8 +89,8 @@
22 actions = {
23 -- time total: 66
24 "return=skipped unless economy needs ration",
25- "sleep=5000",
26 "consume=fruit,bread_frisians smoked_fish,smoked_meat",
27+ "sleep=5000",
28 "animate=working 51000",
29 "sleep=10000",
30 "produce=ration:2"
31
32=== modified file 'data/tribes/buildings/trainingsites/frisians/training_arena/init.lua'
33--- data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-09-16 13:19:53 +0000
34+++ data/tribes/buildings/trainingsites/frisians/training_arena/init.lua 2018-10-04 07:15:15 +0000
35@@ -55,7 +55,7 @@
36 inputs = {
37 { name = "smoked_fish", amount = 6 },
38 { name = "smoked_meat", amount = 6 },
39- { name = "mead", amount = 8 },
40+ { name = "mead", amount = 6 },
41 { name = "honey_bread", amount = 6 },
42 { name = "sword_long", amount = 3 },
43 { name = "sword_broad", amount = 3 },
44@@ -123,7 +123,7 @@
45 "checksoldier=soldier attack 3",
46 "animate=working 22800",
47 "checksoldier=soldier attack 3", -- Because the soldier can be expelled by the player
48- "consume=sword_long honey_bread mead:2 smoked_fish,smoked_meat",
49+ "consume=sword_long honey_bread mead smoked_fish,smoked_meat",
50 "train=soldier attack 3 4"
51 }
52 },
53@@ -134,7 +134,7 @@
54 "checksoldier=soldier attack 4",
55 "animate=working 15600",
56 "checksoldier=soldier attack 4", -- Because the soldier can be expelled by the player
57- "consume=sword_broad honey_bread mead:2 smoked_fish,smoked_meat",
58+ "consume=sword_broad honey_bread mead smoked_fish,smoked_meat",
59 "train=soldier attack 4 5",
60 "produce=scrap_iron:2"
61 }
62@@ -146,7 +146,7 @@
63 "checksoldier=soldier attack 5",
64 "animate=working 15600",
65 "checksoldier=soldier attack 5", -- Because the soldier can be expelled by the player
66- "consume=sword_double honey_bread mead:2 smoked_fish,smoked_meat",
67+ "consume=sword_double honey_bread mead smoked_fish,smoked_meat",
68 "train=soldier attack 5 6",
69 "produce=scrap_iron scrap_metal_mixed"
70 }
71
72=== modified file 'data/tribes/buildings/trainingsites/frisians/training_camp/init.lua'
73--- data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-08-13 08:10:53 +0000
74+++ data/tribes/buildings/trainingsites/frisians/training_camp/init.lua 2018-10-04 07:15:15 +0000
75@@ -52,8 +52,8 @@
76 },
77
78 inputs = {
79+ { name = "beer", amount = 6 },
80 { name = "bread_frisians", amount = 6 },
81- { name = "beer", amount = 6 },
82 { name = "smoked_fish", amount = 6 },
83 { name = "smoked_meat", amount = 6 },
84 { name = "sword_long", amount = 2 },
85
86=== modified file 'data/tribes/workers/frisians/baker/init.lua'
87--- data/tribes/workers/frisians/baker/init.lua 2018-02-06 11:17:48 +0000
88+++ data/tribes/workers/frisians/baker/init.lua 2018-10-04 07:15:15 +0000
89@@ -23,7 +23,7 @@
90 bread_paddle = 1
91 },
92
93- experience = 16,
94+ experience = 13,
95 becomes = "frisians_baker_master",
96
97 animations = animations,
98
99=== modified file 'data/tribes/workers/frisians/blacksmith/init.lua'
100--- data/tribes/workers/frisians/blacksmith/init.lua 2018-02-06 11:17:48 +0000
101+++ data/tribes/workers/frisians/blacksmith/init.lua 2018-10-04 07:15:15 +0000
102@@ -23,7 +23,7 @@
103 hammer = 1
104 },
105
106- experience = 22,
107+ experience = 18,
108 becomes = "frisians_blacksmith_master",
109
110 animations = animations,
111
112=== modified file 'data/tribes/workers/frisians/brewer/init.lua'
113--- data/tribes/workers/frisians/brewer/init.lua 2018-02-06 11:17:48 +0000
114+++ data/tribes/workers/frisians/brewer/init.lua 2018-10-04 07:15:15 +0000
115@@ -22,7 +22,7 @@
116 frisians_carrier = 1
117 },
118
119- experience = 19,
120+ experience = 15,
121 becomes = "frisians_brewer_master",
122
123 animations = animations,

Subscribers

People subscribed via source and target branches

to status/vote changes: