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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'data/tribes/buildings/productionsites/empire/piggery/init.lua'
--- data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/empire/piggery/init.lua 2019-08-28 17:42:06 +0000
@@ -55,9 +55,9 @@
55 actions = {55 actions = {
56 "return=skipped unless economy needs meat",56 "return=skipped unless economy needs meat",
57 "consume=water wheat",57 "consume=water wheat",
58 "sleep=25000",58 "sleep=20000",
59 "playsound=sound/farm/farm_animal 180",59 "playsound=sound/farm/farm_animal 180",
60 "animate=working 30000",60 "animate=working 24000",
61 "produce=meat"61 "produce=meat"
62 }62 }
63 },63 },
6464
=== modified file 'data/tribes/buildings/productionsites/empire/vineyard/init.lua'
--- data/tribes/buildings/productionsites/empire/vineyard/init.lua 2019-06-06 09:11:02 +0000
+++ data/tribes/buildings/productionsites/empire/vineyard/init.lua 2019-08-28 17:42:06 +0000
@@ -65,7 +65,7 @@
65 descname = _"planting grapevines",65 descname = _"planting grapevines",
66 actions = {66 actions = {
67 "callworker=plant",67 "callworker=plant",
68 "sleep=13000"68 "sleep=12000"
69 }69 }
70 },70 },
71 harvest = {71 harvest = {
7272
=== modified file 'data/tribes/workers/barbarians/soldier/init.lua'
--- data/tribes/workers/barbarians/soldier/init.lua 2019-05-25 08:51:42 +0000
+++ data/tribes/workers/barbarians/soldier/init.lua 2019-08-28 17:42:06 +0000
@@ -106,7 +106,7 @@
106 evade = {106 evade = {
107 max_level = 2,107 max_level = 2,
108 base = 25,108 base = 25,
109 increase_per_level = 15,109 increase_per_level = 16,
110 pictures = path.list_files(dirname .. "evade_level?.png"),110 pictures = path.list_files(dirname .. "evade_level?.png"),
111 },111 },
112112

Subscribers

People subscribed via source and target branches

to status/vote changes: