toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-2 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-sounds-2/+merge/297824
added new sounds for empire.brewery, empire.vinery, empire.smelting_works,
barbarian.smelting_works.
modified sound mill_turning_01.ogg to decrease loudness.
modified script for smelting_works to synchronise sharpening sound with product
delivery.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-sounds-2 into lp:widelands.
=== added directory 'data/sound/empire'
=== added file 'data/sound/empire/beerbubble_01.ogg'
Binary files data/sound/empire/beerbubble_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/beerbubble_01.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/empire/beerbubble_02.ogg'
Binary files data/sound/empire/beerbubble_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/beerbubble_02.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/empire/winebubble_01.ogg'
Binary files data/sound/empire/winebubble_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/winebubble_01.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/empire/winebubble_02.ogg'
Binary files data/sound/empire/winebubble_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/winebubble_02.ogg 2016-06-18 08:25:35 +0000 differ
=== added directory 'data/sound/metal'
=== added file 'data/sound/metal/fizzle_01.ogg'
Binary files data/sound/metal/fizzle_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/metal/fizzle_01.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/metal/furnace_01.ogg'
Binary files data/sound/metal/furnace_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/metal/furnace_01.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/metal/goldping_01.ogg'
Binary files data/sound/metal/goldping_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/metal/goldping_01.ogg 2016-06-18 08:25:35 +0000 differ
=== added file 'data/sound/metal/ironping_01.ogg'
Binary files data/sound/metal/ironping_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/metal/ironping_01.ogg 2016-06-18 08:25:35 +0000 differ
=== modified file 'data/sound/mill/mill_turning_01.ogg'
Binary files data/sound/mill/mill_turning_01.ogg 2008-07-30 20:53:52 +0000 and data/sound/mill/mill_turning_01.ogg 2016-06-18 08:25:35 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-06-18 08:25:35 +0000
@@ -71,7 +71,9 @@
"return=skipped unless economy needs iron",
"sleep=32000",
"consume=coal iron_ore",
+ "play_sound=sound/metal furnace 192",
"animate=working 35000",
+ "play_sound=sound/metal ironping 80",
"produce=iron"
}
},
@@ -82,7 +84,9 @@
"return=skipped unless economy needs gold",
"sleep=32000",
"consume=coal gold_ore",
+ "play_sound=sound/metal furnace 192",
"animate=working 35000",
+ "play_sound=sound/metal goldping 80",
"produce=gold"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/brewery/init.lua'
--- data/tribes/buildings/productionsites/empire/brewery/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/brewery/init.lua 2016-06-18 08:25:35 +0000
@@ -57,6 +57,7 @@
"sleep=30000",
"return=skipped unless economy needs beer",
"consume=water wheat",
+ "play_sound=sound/empire beerbubble 180",
"animate=working 30000",
"produce=beer"
}
=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-06-18 08:25:35 +0000
@@ -73,7 +73,9 @@
"return=skipped unless economy needs iron",
"sleep=25000",
"consume=iron_ore coal",
+ "play_sound=sound/metal fizzle 150",
"animate=working 35000",
+ "play_sound=sound/metal ironping 80",
"produce=iron"
}
},
@@ -84,7 +86,9 @@
"return=skipped unless economy needs gold",
"sleep=25000",
"consume=gold_ore coal",
+ "play_sound=sound/metal fizzle 150",
"animate=working 35000",
+ "play_sound=sound/metal goldping 80",
"produce=gold"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/buildings/productionsites/empire/weaponsmithy/init.lua 2016-06-18 08:25:35 +0000
@@ -81,8 +81,9 @@
"sleep=20000",
"consume=planks",
"play_sound=sound/smiths smith 192",
- "animate=working 30000",
+ "animate=working 21000",
"play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=spear_wooden"
}
},
@@ -94,8 +95,9 @@
"sleep=32000",
"consume=coal iron planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
+ "animate=working 36000",
"play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=spear"
}
},
@@ -107,8 +109,9 @@
"sleep=32000",
"consume=coal iron:2 planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
+ "animate=working 36000",
"play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=spear_advanced"
}
},
@@ -120,8 +123,9 @@
"sleep=32000",
"consume=coal:2 gold iron planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
+ "animate=working 36000",
"play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=spear_heavy"
}
},
@@ -133,8 +137,9 @@
"sleep=32000",
"consume=coal:2 gold iron:2 planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
+ "animate=working 36000",
"play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=spear_war"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/winery/init.lua'
--- data/tribes/buildings/productionsites/empire/winery/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/winery/init.lua 2016-06-18 08:25:35 +0000
@@ -58,6 +58,7 @@
-- Grapes are only needed for wine, so no need to check if wine is needed
"sleep=30000",
"consume=grape:2",
+ "play_sound=sound/empire winebubble 180",
"animate=working 30000",
"produce=wine"
}
_______________________________________________
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
