widelands-dev team mailing list archive

[TiborB <tiborb95@xxxxxxxxx>]

TiborB has proposed merging lp:~widelands-dev/widelands/quarry_tweaks into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/quarry_tweaks/+merge/254632

Chanching syntax of quarries conf files (atlanteans and barbarians) to be like empire's one.

This is a peformance tweak - to insert a sleep time after failed search for stones.

And it breaks the savefile compatibility, it seems :)
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/quarry_tweaks into lp:widelands.

=== modified file 'tribes/atlanteans/quarry/conf'
--- tribes/atlanteans/quarry/conf	2014-08-02 19:55:23 +0000
+++ tribes/atlanteans/quarry/conf	2015-03-30 18:56:08 +0000
@@ -16,13 +16,19 @@
 stonecutter=1
 
 [programs]
+# TRANSLATORS: "Completed/Skipped/Did not start quarrying stone because ...
+mine_stone=_quarrying stone
 # TRANSLATORS: "Completed/Skipped/Did not start working because ...
 work=_working
 
-[work]
+[mine_stone]
 worker=cut_stone  # This order is on purpose so that the productivity
 sleep=25000       # drops fast once all stones are gone.
 
+[work]
+call=mine_stone
+return=skipped
+
 [out_of_resource_notification]
 title=_Out of Rocks
 message=_The stonecutter working at this quarry can’t find any rocks in his working radius.

=== modified file 'tribes/barbarians/quarry/conf'
--- tribes/barbarians/quarry/conf	2015-02-12 19:46:19 +0000
+++ tribes/barbarians/quarry/conf	2015-03-30 18:56:08 +0000
@@ -15,12 +15,18 @@
 stonemason=1
 
 [programs]
+# TRANSLATORS: "Completed/Skipped/Did not start quarrying stone because ...
+mine_stone=_quarrying stone
 # TRANSLATORS: "Completed/Skipped/Did not start working because ...
 work=_working
 
+[mine_stone]
+worker=cut  # This order is on purpose so that the productivity
+sleep=25000       # drops fast once all stones are gone.
+
 [work]
-worker=cut   # This order is on purpose so that the productivity
-sleep=25000  # drops fast once all stones are gone.
+call=mine_stone
+return=skipped
 
 [out_of_resource_notification]
 title=_Out of Rocks