Merge lp:~widelands-dev/widelands/balancing-201908 into lp:widelands

Proposed by GunChleoc
Status: Work in progress
Proposed branch: lp:~widelands-dev/widelands/balancing-201908
Merge into: lp:widelands
Diff against target: 40 lines (+4/-4)
3 files modified
data/tribes/buildings/productionsites/empire/piggery/init.lua (+2/-2)
data/tribes/buildings/productionsites/empire/vineyard/init.lua (+1/-1)
data/tribes/workers/barbarians/soldier/init.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/balancing-201908
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+371947@code.launchpad.net

Description of the change

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 5352. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/577985913.
Appveyor build 5122. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_balancing_201908-5122.

Unmerged revisions

9191. By GunChleoc

Empire Vineyards plant a bit faster.

9190. By GunChleoc

Make Empire Piggery work 20% faster.

9189. By GunChleoc

Change Barbarian evade increase per level from 15 to 16.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/tribes/buildings/productionsites/empire/piggery/init.lua'
2--- data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-05-29 18:29:28 +0000
3+++ data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-08-28 17:42:06 +0000
4@@ -55,9 +55,9 @@
5 actions = {
6 "return=skipped unless economy needs meat",
7 "consume=water wheat",
8- "sleep=25000",
9+ "sleep=20000",
10 "playsound=sound/farm/farm_animal 180",
11- "animate=working 30000",
12+ "animate=working 24000",
13 "produce=meat"
14 }
15 },
16
17=== modified file 'data/tribes/buildings/productionsites/empire/vineyard/init.lua'
18--- data/tribes/buildings/productionsites/empire/vineyard/init.lua 2019-06-06 09:11:02 +0000
19+++ data/tribes/buildings/productionsites/empire/vineyard/init.lua 2019-08-28 17:42:06 +0000
20@@ -65,7 +65,7 @@
21 descname = _"planting grapevines",
22 actions = {
23 "callworker=plant",
24- "sleep=13000"
25+ "sleep=12000"
26 }
27 },
28 harvest = {
29
30=== modified file 'data/tribes/workers/barbarians/soldier/init.lua'
31--- data/tribes/workers/barbarians/soldier/init.lua 2019-05-25 08:51:42 +0000
32+++ data/tribes/workers/barbarians/soldier/init.lua 2019-08-28 17:42:06 +0000
33@@ -106,7 +106,7 @@
34 evade = {
35 max_level = 2,
36 base = 25,
37- increase_per_level = 15,
38+ increase_per_level = 16,
39 pictures = path.list_files(dirname .. "evade_level?.png"),
40 },
41

Subscribers

People subscribed via source and target branches

to status/vote changes: