toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-5 into
lp:widelands.
Commit message:
Added sounds for Weaving_Mill (all), ATL Woodcutter, Sawmill, Stonecutter.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-sounds-5/+merge/312999
Added sounds for Weaving_Mill (all), ATL Woodcutter, Sawmill, Stonecutter.
Release my accumulated sound works, mostly on Atlanteans. I prolonged the ATL
Stonecutter work cycle by 2 seconds to better fit the sound production. The
entire work cycle is nearly 60 sec, so this slight disadvantage seems bearable
to me. Otherwise I have to continue work on the sound.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-sounds-5 into lp:widelands.
=== added directory 'data/sound/atlanteans'
=== added directory 'data/sound/atlanteans/cutting'
=== added file 'data/sound/atlanteans/cutting/stonecutter_01.ogg'
Binary files data/sound/atlanteans/cutting/stonecutter_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/cutting/stonecutter_01.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/cutting/stonecutter_02.ogg'
Binary files data/sound/atlanteans/cutting/stonecutter_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/cutting/stonecutter_02.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/cutting/stonecutter_03.ogg'
Binary files data/sound/atlanteans/cutting/stonecutter_03.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/cutting/stonecutter_03.ogg 2016-12-12 08:28:58 +0000 differ
=== added directory 'data/sound/atlanteans/saw'
=== added file 'data/sound/atlanteans/saw/benchsaw_01.ogg'
Binary files data/sound/atlanteans/saw/benchsaw_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/saw/benchsaw_01.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/saw/benchsaw_02.ogg'
Binary files data/sound/atlanteans/saw/benchsaw_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/saw/benchsaw_02.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/saw/sawing_01.ogg'
Binary files data/sound/atlanteans/saw/sawing_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/saw/sawing_01.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/saw/sawing_02.ogg'
Binary files data/sound/atlanteans/saw/sawing_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/saw/sawing_02.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/atlanteans/saw/sawing_03.ogg'
Binary files data/sound/atlanteans/saw/sawing_03.ogg 1970-01-01 00:00:00 +0000 and data/sound/atlanteans/saw/sawing_03.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/barbarians/weaver_01.ogg'
Binary files data/sound/barbarians/weaver_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/weaver_01.ogg 2016-12-12 08:28:58 +0000 differ
=== added file 'data/sound/mill/weaving_01.ogg'
Binary files data/sound/mill/weaving_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/mill/weaving_01.ogg 2016-12-12 08:28:58 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua 2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua 2016-12-12 08:28:58 +0000
@@ -56,7 +56,7 @@
"sleep=16500", -- Much faster than barbarians' wood hardener
"return=skipped unless economy needs planks",
"consume=log:2",
- "play_sound=sound/sawmill sawmill 192",
+ "play_sound=sound/atlanteans/saw benchsaw 192",
"animate=working 20000", -- Much faster than barbarians' wood hardener
"produce=planks"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2016-10-30 19:15:45 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2016-12-12 08:28:58 +0000
@@ -70,6 +70,7 @@
"return=skipped unless economy needs spidercloth",
"sleep=10000",
"consume=spider_silk",
+ "play_sound=sound/mill weaving 120",
"animate=working 20000",
"sleep=10000",
"produce=spidercloth"
@@ -82,6 +83,7 @@
"return=skipped unless economy needs tabard",
"sleep=10000",
"consume=spider_silk",
+ "play_sound=sound/mill weaving 120",
"animate=working 25000",
"sleep=5000",
"produce=tabard"
@@ -95,6 +97,7 @@
"sleep=2000",
"consume=spider_silk gold_thread",
"sleep=3000",
+ "play_sound=sound/mill weaving 120",
"animate=working 30000",
"sleep=5000",
"produce=tabard_golden"
=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua 2016-12-12 08:28:58 +0000
@@ -55,11 +55,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start weaving because ...
descname = _"weaving",
actions = {
- "sleep=20000",
+ "sleep=25000",
"check_map=seafaring",
"return=skipped unless economy needs cloth",
"consume=thatch_reed",
- "animate=working 25000",
+ "play_sound=sound/barbarians weaver 120",
+ "animate=working 20000",
"produce=cloth"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/empire/weaving_mill/init.lua 2016-09-03 14:59:10 +0000
+++ data/tribes/buildings/productionsites/empire/weaving_mill/init.lua 2016-12-12 08:28:58 +0000
@@ -59,10 +59,13 @@
-- TRANSLATORS: Completed/Skipped/Did not start weaving because ...
descname = _"weaving",
actions = {
- "sleep=25000",
+ "sleep=5000",
"return=skipped unless economy needs cloth",
"consume=wool",
+ "sleep=15000",
+ "play_sound=sound/mill weaving 120",
"animate=working 15000", -- Unsure of balancing CW
+ "sleep=5000",
"produce=cloth"
}
},
=== modified file 'data/tribes/workers/atlanteans/stonecutter/init.lua'
--- data/tribes/workers/atlanteans/stonecutter/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/atlanteans/stonecutter/init.lua 2016-12-12 08:28:58 +0000
@@ -33,8 +33,8 @@
cut_granite = {
"findobject attrib:rocks radius:6",
"walk object",
- "play_sound sound/stonecutting stonecutter 192",
- "animation hacking 10000",
+ "play_sound sound/atlanteans/cutting stonecutter 192",
+ "animation hacking 12000",
"object shrink",
"createware granite",
"return"
=== modified file 'data/tribes/workers/atlanteans/woodcutter/init.lua'
--- data/tribes/workers/atlanteans/woodcutter/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/workers/atlanteans/woodcutter/init.lua 2016-12-12 08:28:58 +0000
@@ -33,7 +33,7 @@
harvest = {
"findobject attrib:tree radius:10",
"walk object",
- "play_sound sound/sawmill sawmill 230",
+ "play_sound sound/atlanteans/saw sawing 230",
"animation sawing 10000",
"object fall",
"animation idle 2000",
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
