widelands-dev team mailing list archive

[Teppo Mäenpää <tm@xxxxxx>]

Teppo Mäenpää has proposed merging lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge/214822

This removes the second program from Empire's marble mine.

The reason is to allow miner training after resources have exhausted. See forum thread 1478 for more verbose discussion.


I playtested this briefly, and did not notice problems.
-- 
https://code.launchpad.net/~widelands-dev/widelands/feature-1478-stone-mine-streamline/+merge/214822
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/feature-1478-stone-mine-streamline into lp:widelands.

=== modified file 'tribes/empire/marblemine/conf'
--- tribes/empire/marblemine/conf	2014-03-17 17:23:26 +0000
+++ tribes/empire/marblemine/conf	2014-04-08 19:09:05 +0000
@@ -23,34 +23,17 @@
 wine=6
 
 [programs]
-mine_marble=_Mine marble
-mine_stone=_Mine stone
 work=_Work
 
-[mine_marble]
-sleep=20000
-consume=wine ration
-animate=working 20000
-mine=granit 2 50 5
-produce=marble:2
-animate=working 20000
-mine=granit 2 50 5
-produce=marble stone
-
-[mine_stone]
+[work]
 sleep=20000
 consume=ration wine
 animate=working 20000
 mine=granit 2 50 5
-produce=stone marble
-animate=working 20000
-mine=granit 2 50 5
 produce=stone:2
-
-[work]
-call=mine_marble
-call=mine_stone
-return=skipped
+animate=working 20000
+mine=granit 2 50 5
+produce=marble:2
 
 [idle]
 pics=marblemine_i_??.png