widelands-dev team mailing list archive

[toptopple <7010622@xxxxxx>]

toptopple has proposed merging lp:~7010622-q/widelands/topple-atlantean-update-1 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-atlantean-update-1/+merge/309530

Added sound playing for Atlantean Mill, Toolsmith, Smelting-Works. Improved time behaviour for Atlantean Toolsmith, Weaving-Mill.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-atlantean-update-1 into lp:widelands.

=== modified file 'data/tribes/buildings/productionsites/atlanteans/mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/mill/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/mill/init.lua	2016-10-28 06:40:19 +0000
@@ -67,6 +67,7 @@
             "return=skipped unless economy needs cornmeal",
             "sleep=3500",
             "consume=corn",
+            "play_sound=sound/mill mill_turning 240",
             "animate=working 15000",
             "produce=cornmeal"
          }
@@ -79,6 +80,7 @@
             "return=skipped when site has corn and economy needs cornmeal and not economy needs blackroot_flour",
             "sleep=3500",
             "consume=blackroot",
+            "play_sound=sound/mill mill_turning 240",
             "animate=working 15000",
             "produce=blackroot_flour"
          }

=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2016-10-24 10:07:57 +0000
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua	2016-10-28 06:40:19 +0000
@@ -69,7 +69,9 @@
             "sleep=5000",  -- penalty for unavailable iron_ore (2x)
             "consume=iron_ore coal",
             "sleep=20000",
+            "play_sound=sound/metal fizzle 150",
             "animate=working 35000",
+            "play_sound=sound/metal ironping 80",
             "produce=iron"
          }
       },
@@ -81,7 +83,9 @@
             "sleep=10000",  -- penalty for unavailable gold_ore
             "consume=gold_ore coal",
             "sleep=15000",
+            "play_sound=sound/metal fizzle 150",
             "animate=working 35000",
+            "play_sound=sound/metal goldping 80",
             "produce=gold"
          }
       },

=== modified file 'data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua	2016-10-28 06:40:19 +0000
@@ -85,8 +85,10 @@
          descname = _"making a bread paddle",
          actions = {
             "return=skipped unless economy needs bread_paddle",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=bread_paddle"
          }
@@ -96,8 +98,10 @@
          descname = _"making a pair of buckets",
          actions = {
             "return=skipped unless economy needs buckets",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=buckets"
          }
@@ -107,8 +111,10 @@
          descname = _"making fire tongs",
          actions = {
             "return=skipped unless economy needs fire_tongs",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=fire_tongs"
          }
@@ -118,8 +124,10 @@
          descname = _"making a fishing net",
          actions = {
             "return=skipped unless economy needs fishing_net",
-            "sleep=32000",
+            "sleep=5000",
             "consume=spidercloth:2",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=fishing_net"
          }
@@ -129,8 +137,10 @@
          descname = _"making a hammer",
          actions = {
             "return=skipped unless economy needs hammer",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hammer"
          }
@@ -140,8 +150,10 @@
          descname = _"making a hook pole",
          actions = {
             "return=skipped unless economy needs hook_pole",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hook_pole"
          }
@@ -151,8 +163,10 @@
          descname = _"making a hunting bow",
          actions = {
             "return=skipped unless economy needs hunting_bow",
-            "sleep=32000",
+            "sleep=5000",
             "consume=log spidercloth",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=hunting_bow"
          }
@@ -162,8 +176,10 @@
          descname = _"making milking tongs",
          actions = {
             "return=skipped unless economy needs milking_tongs",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=milking_tongs"
          }
@@ -173,8 +189,10 @@
          descname = _"making a pick",
          actions = {
             "return=skipped unless economy needs pick",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=pick"
          }
@@ -184,8 +202,10 @@
          descname = _"making a saw",
          actions = {
             "return=skipped unless economy needs saw",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=saw"
          }
@@ -195,8 +215,10 @@
          descname = _"making a scythe",
          actions = {
             "return=skipped unless economy needs scythe",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=scythe"
          }
@@ -206,8 +228,10 @@
          descname = _"making a shovel",
          actions = {
             "return=skipped unless economy needs shovel",
-            "sleep=32000",
+            "sleep=5000",
             "consume=iron log",
+            "sleep=27000",
+            "play_sound=sound/smiths toolsmith 192",
             "animate=working 35000",
             "produce=shovel"
          }

=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua	2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua	2016-10-28 06:40:19 +0000
@@ -68,9 +68,10 @@
          descname = _"weaving spidercloth",
          actions = {
             "return=skipped unless economy needs spidercloth",
-            "sleep=20000",
+            "sleep=10000",
             "consume=spider_silk",
             "animate=working 20000",
+            "sleep=10000",
             "produce=spidercloth"
          }
       },
@@ -79,9 +80,10 @@
          descname = _"tailoring a tabard",
          actions = {
             "return=skipped unless economy needs tabard",
-            "sleep=20000",
+            "sleep=10000",
             "consume=spider_silk",
-            "animate=working 20000",
+            "animate=working 25000",
+            "sleep=5000",
             "produce=tabard"
          }
       },
@@ -90,9 +92,11 @@
          descname = _"tailoring a golden tabard",
          actions = {
             "return=skipped unless economy needs tabard_golden",
-            "sleep=20000",
+            "sleep=2000",
             "consume=spider_silk gold_thread",
-            "animate=working 20000",
+            "sleep=3000",
+            "animate=working 30000",
+            "sleep=5000",
             "produce=tabard_golden"
          }
       },