widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07877
[Merge] lp:~7010622-q/widelands/topple-sounds-4 into lp:widelands
toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-4 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-sounds-4/+merge/300301
Added new sound files for Barbarians Inn + Big-Inn, also for Empire Inn. Script files were adjusted and improved to reduce the futile wait time when a resource is missing in these sites for more complex products.
Resampled sound file "ox_00.ogg" to 11025 Hz with success to end the "white snow" effect here at my computer (ALSA problem).
--
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-4 into lp:widelands.
=== added directory 'data/sound/barbarians/taverns'
=== added file 'data/sound/barbarians/taverns/biginn_01.ogg'
Binary files data/sound/barbarians/taverns/biginn_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/biginn_01.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/biginn_02.ogg'
Binary files data/sound/barbarians/taverns/biginn_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/biginn_02.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/biginn_10.ogg'
Binary files data/sound/barbarians/taverns/biginn_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/biginn_10.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/inn_01.ogg'
Binary files data/sound/barbarians/taverns/inn_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/inn_01.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/inn_02.ogg'
Binary files data/sound/barbarians/taverns/inn_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/inn_02.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/inn_10.ogg'
Binary files data/sound/barbarians/taverns/inn_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/inn_10.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/tavern_01.ogg'
Binary files data/sound/barbarians/taverns/tavern_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/tavern_01.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/tavern_02.ogg'
Binary files data/sound/barbarians/taverns/tavern_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/tavern_02.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/barbarians/taverns/tavern_10.ogg'
Binary files data/sound/barbarians/taverns/tavern_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/taverns/tavern_10.ogg 2016-07-18 09:52:15 +0000 differ
=== added directory 'data/sound/empire/taverns'
=== added file 'data/sound/empire/taverns/meal_01.ogg'
Binary files data/sound/empire/taverns/meal_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/meal_01.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/empire/taverns/meal_02.ogg'
Binary files data/sound/empire/taverns/meal_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/meal_02.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/empire/taverns/meal_10.ogg'
Binary files data/sound/empire/taverns/meal_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/meal_10.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/empire/taverns/ration_01.ogg'
Binary files data/sound/empire/taverns/ration_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/ration_01.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/empire/taverns/ration_02.ogg'
Binary files data/sound/empire/taverns/ration_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/ration_02.ogg 2016-07-18 09:52:15 +0000 differ
=== added file 'data/sound/empire/taverns/ration_10.ogg'
Binary files data/sound/empire/taverns/ration_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/empire/taverns/ration_10.ogg 2016-07-18 09:52:15 +0000 differ
=== modified file 'data/sound/farm/ox_00.ogg'
Binary files data/sound/farm/ox_00.ogg 2010-03-28 08:46:10 +0000 and data/sound/farm/ox_00.ogg 2016-07-18 09:52:15 +0000 differ
=== removed directory 'data/sound/taverns'
=== removed file 'data/sound/taverns/dishes_01.ogg'
Binary files data/sound/taverns/dishes_01.ogg 2016-07-07 09:58:30 +0000 and data/sound/taverns/dishes_01.ogg 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/sound/taverns/dishes_02.ogg'
Binary files data/sound/taverns/dishes_02.ogg 2016-07-07 09:58:30 +0000 and data/sound/taverns/dishes_02.ogg 1970-01-01 00:00:00 +0000 differ
=== removed file 'data/sound/taverns/dishes_10.ogg'
Binary files data/sound/taverns/dishes_10.ogg 2016-07-07 09:58:30 +0000 and data/sound/taverns/dishes_10.ogg 1970-01-01 00:00:00 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2016-07-18 09:52:15 +0000
@@ -70,8 +70,10 @@
descname = _"preparing a ration",
actions = {
"return=skipped unless economy needs ration",
- "sleep=33000",
+ "sleep=23000",
"consume=barbarians_bread,fish,meat",
+ "play_sound=sound/barbarians/taverns tavern 100",
+ "sleep=10000",
"produce=ration"
}
},
@@ -80,8 +82,10 @@
descname = _"preparing a snack",
actions = {
"return=skipped unless economy needs snack",
- "sleep=35000",
+ "sleep=5000", -- keeping first sleep low reduces futile wait time for resources
"consume=barbarians_bread fish,meat beer",
+ "play_sound=sound/barbarians/taverns biginn 100",
+ "sleep=30000",
"produce=snack"
}
},
@@ -90,8 +94,10 @@
descname = _"preparing a meal",
actions = {
"return=skipped unless economy needs meal",
- "sleep=37000",
+ "sleep=5000", -- keeping first sleep low reduces futile wait time for resources
"consume=barbarians_bread fish,meat beer_strong",
+ "play_sound=sound/barbarians/taverns biginn 100",
+ "sleep=32000",
"produce=meal"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2016-07-18 09:52:15 +0000
@@ -67,9 +67,11 @@
descname = _"preparing a ration",
actions = {
"return=skipped unless economy needs ration",
- "sleep=14000",
+ "sleep=5000",
"consume=barbarians_bread,fish,meat",
- "animate=working 19000",
+ "play_sound=sound/barbarians/taverns inn 100",
+ "animate=working 18000",
+ "sleep=10000",
"produce=ration"
}
},
@@ -78,9 +80,11 @@
descname = _"preparing a snack",
actions = {
"return=skipped unless economy needs snack",
- "sleep=15000",
+ "sleep=5000", -- keeping first sleep low reduces futile wait time for resources
"consume=barbarians_bread fish,meat beer",
+ "play_sound=sound/barbarians/taverns inn 100",
"animate=working 20000",
+ "sleep=10000",
"produce=snack"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2016-07-07 09:58:30 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2016-07-18 09:52:15 +0000
@@ -62,7 +62,7 @@
"sleep=14000",
"return=skipped unless economy needs ration",
"consume=barbarians_bread,fish,meat",
- "play_sound=sound/taverns dishes 100",
+ "play_sound=sound/barbarians/taverns tavern 100",
"animate=working 19000",
"produce=ration"
},
=== modified file 'data/tribes/buildings/productionsites/empire/inn/init.lua'
--- data/tribes/buildings/productionsites/empire/inn/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/inn/init.lua 2016-07-18 09:52:15 +0000
@@ -64,9 +64,11 @@
descname = _"preparing a ration",
actions = {
"return=skipped unless economy needs ration",
- "sleep=14000",
+ "sleep=10000",
"consume=empire_bread,fish,meat",
+ "play_sound=sound/empire/taverns ration 100",
"animate=working 19000",
+ "sleep=4000",
"produce=ration"
}
},
@@ -75,9 +77,11 @@
descname = _"preparing a meal",
actions = {
"return=skipped unless economy needs meal",
- "sleep=15000",
+ "sleep=10000",
"consume=empire_bread fish,meat",
+ "play_sound=sound/empire/taverns meal 100",
"animate=working 20000",
+ "sleep=5000",
"produce=meal"
}
},
=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2016-07-07 09:58:30 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2016-07-18 09:52:15 +0000
@@ -58,7 +58,7 @@
"sleep=14000",
"return=skipped unless economy needs ration",
"consume=empire_bread,fish,meat",
- "play_sound=sound/taverns dishes 100",
+ "play_sound=sound/empire/taverns ration 100",
"animate=working 19000",
"produce=ration"
}
Follow ups
