widelands

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

  1. frisian_balancing_worldsavior_201809
  2. Merge into trunk
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.

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
=== 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 @@
65 actions = {65 actions = {
66 "return=skipped unless economy needs fish",66 "return=skipped unless economy needs fish",
67 "sleep=23000",67 "sleep=23000",
68 "return=failed unless site has water:3",68 "return=failed unless site has water:2",
69 "return=failed unless site has fruit",69 "return=failed unless site has fruit",
70 "callworker=breed_in_pond",70 "callworker=breed_in_pond",
71 "consume=fruit water:3",71 "consume=fruit water:2",
72 },72 },
73 },73 },
74 fish_pond = {74 fish_pond = {
7575
=== 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 @@
89 actions = {89 actions = {
90 -- time total: 6690 -- time total: 66
91 "return=skipped unless economy needs ration",91 "return=skipped unless economy needs ration",
92 "sleep=5000",
93 "consume=fruit,bread_frisians smoked_fish,smoked_meat",92 "consume=fruit,bread_frisians smoked_fish,smoked_meat",
93 "sleep=5000",
94 "animate=working 51000",94 "animate=working 51000",
95 "sleep=10000",95 "sleep=10000",
96 "produce=ration:2"96 "produce=ration:2"
9797
=== 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 @@
55 inputs = {55 inputs = {
56 { name = "smoked_fish", amount = 6 },56 { name = "smoked_fish", amount = 6 },
57 { name = "smoked_meat", amount = 6 },57 { name = "smoked_meat", amount = 6 },
58 { name = "mead", amount = 8 },58 { name = "mead", amount = 6 },
59 { name = "honey_bread", amount = 6 },59 { name = "honey_bread", amount = 6 },
60 { name = "sword_long", amount = 3 },60 { name = "sword_long", amount = 3 },
61 { name = "sword_broad", amount = 3 },61 { name = "sword_broad", amount = 3 },
@@ -123,7 +123,7 @@
123 "checksoldier=soldier attack 3",123 "checksoldier=soldier attack 3",
124 "animate=working 22800",124 "animate=working 22800",
125 "checksoldier=soldier attack 3", -- Because the soldier can be expelled by the player125 "checksoldier=soldier attack 3", -- Because the soldier can be expelled by the player
126 "consume=sword_long honey_bread mead:2 smoked_fish,smoked_meat",126 "consume=sword_long honey_bread mead smoked_fish,smoked_meat",
127 "train=soldier attack 3 4"127 "train=soldier attack 3 4"
128 }128 }
129 },129 },
@@ -134,7 +134,7 @@
134 "checksoldier=soldier attack 4",134 "checksoldier=soldier attack 4",
135 "animate=working 15600",135 "animate=working 15600",
136 "checksoldier=soldier attack 4", -- Because the soldier can be expelled by the player136 "checksoldier=soldier attack 4", -- Because the soldier can be expelled by the player
137 "consume=sword_broad honey_bread mead:2 smoked_fish,smoked_meat",137 "consume=sword_broad honey_bread mead smoked_fish,smoked_meat",
138 "train=soldier attack 4 5",138 "train=soldier attack 4 5",
139 "produce=scrap_iron:2"139 "produce=scrap_iron:2"
140 }140 }
@@ -146,7 +146,7 @@
146 "checksoldier=soldier attack 5",146 "checksoldier=soldier attack 5",
147 "animate=working 15600",147 "animate=working 15600",
148 "checksoldier=soldier attack 5", -- Because the soldier can be expelled by the player148 "checksoldier=soldier attack 5", -- Because the soldier can be expelled by the player
149 "consume=sword_double honey_bread mead:2 smoked_fish,smoked_meat",149 "consume=sword_double honey_bread mead smoked_fish,smoked_meat",
150 "train=soldier attack 5 6",150 "train=soldier attack 5 6",
151 "produce=scrap_iron scrap_metal_mixed"151 "produce=scrap_iron scrap_metal_mixed"
152 }152 }
153153
=== 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 @@
52 },52 },
5353
54 inputs = {54 inputs = {
55 { name = "beer", amount = 6 },
55 { name = "bread_frisians", amount = 6 },56 { name = "bread_frisians", amount = 6 },
56 { name = "beer", amount = 6 },
57 { name = "smoked_fish", amount = 6 },57 { name = "smoked_fish", amount = 6 },
58 { name = "smoked_meat", amount = 6 },58 { name = "smoked_meat", amount = 6 },
59 { name = "sword_long", amount = 2 },59 { name = "sword_long", amount = 2 },
6060
=== 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 @@
23 bread_paddle = 123 bread_paddle = 1
24 },24 },
2525
26 experience = 16,26 experience = 13,
27 becomes = "frisians_baker_master",27 becomes = "frisians_baker_master",
2828
29 animations = animations,29 animations = animations,
3030
=== 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 @@
23 hammer = 123 hammer = 1
24 },24 },
2525
26 experience = 22,26 experience = 18,
27 becomes = "frisians_blacksmith_master",27 becomes = "frisians_blacksmith_master",
2828
29 animations = animations,29 animations = animations,
3030
=== 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 @@
22 frisians_carrier = 122 frisians_carrier = 1
23 },23 },
2424
25 experience = 19,25 experience = 15,
26 becomes = "frisians_brewer_master",26 becomes = "frisians_brewer_master",
2727
28 animations = animations,28 animations = animations,

Subscribers

People subscribed via source and target branches

to status/vote changes: