Merge lp:~chuckw20/widelands/balance_farm_productivity into lp:widelands

Proposed by Chuck Wilder
Status: Merged
Merged at revision: not available
Proposed branch: lp:~chuckw20/widelands/balance_farm_productivity
Merge into: lp:widelands
Diff against target: 132 lines (+18/-18)
5 files modified
tribes/atlanteans/farm/conf (+4/-4)
tribes/atlanteans/farmer/conf (+3/-3)
tribes/barbarians/farm/conf (+4/-4)
tribes/empire/farm/conf (+4/-4)
tribes/empire/farmer/conf (+3/-3)
To merge this branch: bzr merge lp:~chuckw20/widelands/balance_farm_productivity
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+24132@code.launchpad.net

Description of the change

The recent addition of 9 more seconds of animation for the barbarian farmer had the effect of reducing the farm's throughput. To mitigate this, adjustments were made to the farm sleep cycles. These changes were replicated across all of the tribes to balance their production rate.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tribes/atlanteans/farm/conf'
--- tribes/atlanteans/farm/conf 2009-05-05 16:11:39 +0000
+++ tribes/atlanteans/farm/conf 2010-04-26 16:02:24 +0000
@@ -23,19 +23,19 @@
23work=_Work23work=_Work
2424
25[plant_corn]25[plant_corn]
26sleep=2000026sleep=14000 #orig 20000
27worker=plant27worker=plant
2828
29[plant]29[plant]
30sleep=2000030sleep=14000 #orig 20000
31worker=plant31worker=plant
3232
33[harvest_corn]33[harvest_corn]
34sleep=500034sleep=4000 #orig 5000
35worker=harvest35worker=harvest
3636
37[harvest]37[harvest]
38sleep=500038sleep=4000 #orig 5000
39worker=harvest39worker=harvest
4040
41[work]41[work]
4242
=== modified file 'tribes/atlanteans/farmer/conf'
--- tribes/atlanteans/farmer/conf 2009-01-25 19:40:02 +0000
+++ tribes/atlanteans/farmer/conf 2010-04-26 16:02:24 +0000
@@ -11,9 +11,9 @@
110=setdescription tribe:cornfield_t110=setdescription tribe:cornfield_t
121=findspace size:any radius:2121=findspace size:any radius:2
132=walk coords132=walk coords
143=animation idle 500143=animation idle 4000
154=plant154=plant
165=animation idle 500165=animation idle 4000
176=return176=return
1818
19[harvest]19[harvest]
@@ -22,7 +22,7 @@
222=playFX ../../../sound/farm/scythe 220222=playFX ../../../sound/farm/scythe 220
233=animation idle 10000233=animation idle 10000
244=object harvest244=object harvest
255=animation idle 2000255=animation idle 4000
266=createitem corn266=createitem corn
277=return277=return
2828
2929
=== modified file 'tribes/barbarians/farm/conf'
--- tribes/barbarians/farm/conf 2010-04-25 04:14:31 +0000
+++ tribes/barbarians/farm/conf 2010-04-26 16:02:24 +0000
@@ -18,19 +18,19 @@
18work=_Work18work=_Work
1919
20[plant_wheat]20[plant_wheat]
21sleep=2000021sleep=14000 #orig 20000
22worker=plant22worker=plant
2323
24[plant]24[plant]
25sleep=2000025sleep=14000 #orig 20000
26worker=plant26worker=plant
2727
28[harvest_wheat]28[harvest_wheat]
29sleep=500029sleep=4000 #orig 5000
30worker=harvest30worker=harvest
3131
32[harvest]32[harvest]
33sleep=500033sleep=4000 #orig 5000
34worker=harvest34worker=harvest
3535
36[work]36[work]
3737
=== modified file 'tribes/empire/farm/conf'
--- tribes/empire/farm/conf 2009-06-14 10:58:19 +0000
+++ tribes/empire/farm/conf 2010-04-26 16:02:24 +0000
@@ -19,19 +19,19 @@
19work=_Work19work=_Work
2020
21[plant_wheat]21[plant_wheat]
22sleep=2000022sleep=14000 #orig 20000
23worker=plant23worker=plant
2424
25[plant]25[plant]
26sleep=2000026sleep=14000 #orig 20000
27worker=plant27worker=plant
2828
29[harvest_wheat]29[harvest_wheat]
30sleep=500030sleep=4000 #orig 5000
31worker=harvest31worker=harvest
3232
33[harvest]33[harvest]
34sleep=500034sleep=4000 #orig 5000
35worker=harvest35worker=harvest
3636
37[work]37[work]
3838
=== modified file 'tribes/empire/farmer/conf'
--- tribes/empire/farmer/conf 2009-07-08 12:20:59 +0000
+++ tribes/empire/farmer/conf 2010-04-26 16:02:24 +0000
@@ -11,9 +11,9 @@
110=setdescription tribe:field0t110=setdescription tribe:field0t
121=findspace size:any radius:2 space121=findspace size:any radius:2 space
132=walk coords132=walk coords
143=animation idle 500143=animation idle 4000 #orig 500
154=plant154=plant
165=animation idle 500165=animation idle 4000 #orig 500
176=return176=return
1818
19[harvest]19[harvest]
@@ -22,7 +22,7 @@
222=playFX ../../../sound/farm/scythe 220222=playFX ../../../sound/farm/scythe 220
233=animation idle 10000233=animation idle 10000
244=object harvest244=object harvest
255=animation idle 2000255=animation idle 4000 #orig 2000
266=createitem wheat266=createitem wheat
277=return277=return
2828

Subscribers

People subscribed via source and target branches

to status/vote changes: