widelands-dev team mailing list archive

[Nasenbaer <Nasenbaer@xxxxxxxxxxxx>]

Nasenbaer has proposed merging lp:~nasenbaer/widelands/bug1219523 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1219523 in widelands: "Empire Stonemasons productivity never drops"
  https://bugs.launchpad.net/widelands/+bug/1219523

For more details, see:
https://code.launchpad.net/~nasenbaer/widelands/bug1219523/+merge/184837

Just a proof of concept fix.
-- 
https://code.launchpad.net/~nasenbaer/widelands/bug1219523/+merge/184837
Your team Widelands Developers is requested to review the proposed merge of lp:~nasenbaer/widelands/bug1219523 into lp:widelands.

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2013-07-23 13:40:00 +0000
+++ tribes/atlanteans/quarry/conf	2013-09-10 17:28:38 +0000
@@ -19,7 +19,9 @@
 work=_Work
 
 [work]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut_stone
 
 [idle]

=== modified file 'tribes/atlanteans/stonecutter/conf'
--- tribes/atlanteans/stonecutter/conf	2013-03-02 20:35:18 +0000
+++ tribes/atlanteans/stonecutter/conf	2013-09-10 17:28:38 +0000
@@ -1,10 +1,14 @@
 help=_Cuts raw pieces of granite out of laying stones.
 program=cut_stone
+program=find_stone
 
 [buildcost]
 pick=1
 carrier=1
 
+[find_stone]
+0=findobject attrib:stone radius:6
+
 [cut_stone]
 0=findobject attrib:stone radius:6
 1=walk object
@@ -19,7 +23,6 @@
 hotspot=7 20
 playercolor=true
 
-
 [hacking]
 pics=hacking_??.png
 hotspot=10 19

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2013-07-22 11:45:41 +0000
+++ tribes/barbarians/quarry/conf	2013-09-10 17:28:38 +0000
@@ -18,7 +18,9 @@
 work=_Work
 
 [work]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut
 
 [idle]

=== modified file 'tribes/barbarians/stonemason/conf'
--- tribes/barbarians/stonemason/conf	2013-03-02 20:35:18 +0000
+++ tribes/barbarians/stonemason/conf	2013-09-10 17:28:38 +0000
@@ -1,10 +1,14 @@
 help=_Cuts raw pieces of granite out of laying stones.
 program=cut
+program=find_stone
 
 [buildcost]
 pick=1
 carrier=1
 
+[find_stone]
+0=findobject attrib:stone radius:6
+
 [cut]
 0=findobject attrib:stone radius:6
 1=walk object

=== modified file 'tribes/empire/quarry/conf'
--- tribes/empire/quarry/conf	2013-07-23 13:40:00 +0000
+++ tribes/empire/quarry/conf	2013-09-10 17:28:38 +0000
@@ -24,19 +24,27 @@
 work=_Work
 
 [mine_stone]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut_stone
 
 [stone]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut_stone
 
 [mine_marble]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut_marble
 
 [marble]
-sleep=25000
+sleep=2500
+worker=find_stone
+sleep=22500
 worker=cut_marble
 
 [work]

=== modified file 'tribes/empire/stonemason/conf'
--- tribes/empire/stonemason/conf	2013-03-02 20:35:18 +0000
+++ tribes/empire/stonemason/conf	2013-09-10 17:28:38 +0000
@@ -1,11 +1,15 @@
 help=_Cuts raw pieces of granite and marble out of laying stones.
 program=cut_stone
 program=cut_marble
+program=find_stone
 
 [buildcost]
 pick=1
 carrier=1
 
+[find_stone]
+0=findobject attrib:stone radius:6
+
 [cut_stone]
 0=findobject attrib:stone radius:6
 1=walk object