widelands

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

  1. balance_farm_productivity
  2. Merge into trunk
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
1=== modified file 'tribes/atlanteans/farm/conf'
2--- tribes/atlanteans/farm/conf 2009-05-05 16:11:39 +0000
3+++ tribes/atlanteans/farm/conf 2010-04-26 16:02:24 +0000
4@@ -23,19 +23,19 @@
5 work=_Work
6
7 [plant_corn]
8-sleep=20000
9+sleep=14000 #orig 20000
10 worker=plant
11
12 [plant]
13-sleep=20000
14+sleep=14000 #orig 20000
15 worker=plant
16
17 [harvest_corn]
18-sleep=5000
19+sleep=4000 #orig 5000
20 worker=harvest
21
22 [harvest]
23-sleep=5000
24+sleep=4000 #orig 5000
25 worker=harvest
26
27 [work]
28
29=== modified file 'tribes/atlanteans/farmer/conf'
30--- tribes/atlanteans/farmer/conf 2009-01-25 19:40:02 +0000
31+++ tribes/atlanteans/farmer/conf 2010-04-26 16:02:24 +0000
32@@ -11,9 +11,9 @@
33 0=setdescription tribe:cornfield_t
34 1=findspace size:any radius:2
35 2=walk coords
36-3=animation idle 500
37+3=animation idle 4000
38 4=plant
39-5=animation idle 500
40+5=animation idle 4000
41 6=return
42
43 [harvest]
44@@ -22,7 +22,7 @@
45 2=playFX ../../../sound/farm/scythe 220
46 3=animation idle 10000
47 4=object harvest
48-5=animation idle 2000
49+5=animation idle 4000
50 6=createitem corn
51 7=return
52
53
54=== modified file 'tribes/barbarians/farm/conf'
55--- tribes/barbarians/farm/conf 2010-04-25 04:14:31 +0000
56+++ tribes/barbarians/farm/conf 2010-04-26 16:02:24 +0000
57@@ -18,19 +18,19 @@
58 work=_Work
59
60 [plant_wheat]
61-sleep=20000
62+sleep=14000 #orig 20000
63 worker=plant
64
65 [plant]
66-sleep=20000
67+sleep=14000 #orig 20000
68 worker=plant
69
70 [harvest_wheat]
71-sleep=5000
72+sleep=4000 #orig 5000
73 worker=harvest
74
75 [harvest]
76-sleep=5000
77+sleep=4000 #orig 5000
78 worker=harvest
79
80 [work]
81
82=== modified file 'tribes/empire/farm/conf'
83--- tribes/empire/farm/conf 2009-06-14 10:58:19 +0000
84+++ tribes/empire/farm/conf 2010-04-26 16:02:24 +0000
85@@ -19,19 +19,19 @@
86 work=_Work
87
88 [plant_wheat]
89-sleep=20000
90+sleep=14000 #orig 20000
91 worker=plant
92
93 [plant]
94-sleep=20000
95+sleep=14000 #orig 20000
96 worker=plant
97
98 [harvest_wheat]
99-sleep=5000
100+sleep=4000 #orig 5000
101 worker=harvest
102
103 [harvest]
104-sleep=5000
105+sleep=4000 #orig 5000
106 worker=harvest
107
108 [work]
109
110=== modified file 'tribes/empire/farmer/conf'
111--- tribes/empire/farmer/conf 2009-07-08 12:20:59 +0000
112+++ tribes/empire/farmer/conf 2010-04-26 16:02:24 +0000
113@@ -11,9 +11,9 @@
114 0=setdescription tribe:field0t
115 1=findspace size:any radius:2 space
116 2=walk coords
117-3=animation idle 500
118+3=animation idle 4000 #orig 500
119 4=plant
120-5=animation idle 500
121+5=animation idle 4000 #orig 500
122 6=return
123
124 [harvest]
125@@ -22,7 +22,7 @@
126 2=playFX ../../../sound/farm/scythe 220
127 3=animation idle 10000
128 4=object harvest
129-5=animation idle 2000
130+5=animation idle 4000 #orig 2000
131 6=createitem wheat
132 7=return
133

Subscribers

People subscribed via source and target branches

to status/vote changes: