widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #07854
[Merge] lp:~7010622-q/widelands/topple-sounds-3 into lp:widelands
toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-3 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-sounds-3/+merge/299480
New sounds for Barbarians Wood Hardener and Lime Kiln. Also new sounds for Tavern, both Barbarian and Empire. Added elk_02.ogg. Synchronised sound and animation for Weapon Smithy in all nations.
Noteworthy, there is included a suggestion for program change in barbarians.warmill lua.
descname = _"forging a bronze ax",
...
- "consume=coal:2 iron:2",
+ "consume=coal gold iron",
I find Barbarians largely resource overloaded; this mighty aid a bit relieving them and makes the term "bronze" more credible.
--
Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-3 into lp:widelands.
=== added file 'data/sound/animals/elk_02.ogg'
Binary files data/sound/animals/elk_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/animals/elk_02.ogg 2016-07-07 21:50:29 +0000 differ
=== added directory 'data/sound/barbarians'
=== added file 'data/sound/barbarians/blackwood_01.ogg'
Binary files data/sound/barbarians/blackwood_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/blackwood_01.ogg 2016-07-07 21:50:29 +0000 differ
=== added file 'data/sound/barbarians/mortar_01.ogg'
Binary files data/sound/barbarians/mortar_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/mortar_01.ogg 2016-07-07 21:50:29 +0000 differ
=== added file 'data/sound/barbarians/stonegrind_01.ogg'
Binary files data/sound/barbarians/stonegrind_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/barbarians/stonegrind_01.ogg 2016-07-07 21:50:29 +0000 differ
=== added directory 'data/sound/taverns'
=== added file 'data/sound/taverns/dishes_01.ogg'
Binary files data/sound/taverns/dishes_01.ogg 1970-01-01 00:00:00 +0000 and data/sound/taverns/dishes_01.ogg 2016-07-07 21:50:29 +0000 differ
=== added file 'data/sound/taverns/dishes_02.ogg'
Binary files data/sound/taverns/dishes_02.ogg 1970-01-01 00:00:00 +0000 and data/sound/taverns/dishes_02.ogg 2016-07-07 21:50:29 +0000 differ
=== added file 'data/sound/taverns/dishes_10.ogg'
Binary files data/sound/taverns/dishes_10.ogg 1970-01-01 00:00:00 +0000 and data/sound/taverns/dishes_10.ogg 2016-07-07 21:50:29 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-07-07 21:50:29 +0000
@@ -76,8 +76,9 @@
"sleep=20000",
"consume=iron planks",
"play_sound=sound/smiths smith 192",
- "animate=working 30000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 21000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=trident_light"
}
},
@@ -89,8 +90,9 @@
"sleep=32000",
"consume=iron coal planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 36000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=trident_long"
}
},
@@ -102,8 +104,9 @@
"sleep=32000",
"consume=iron:2 coal planks",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 36000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=trident_steel"
}
},
@@ -115,8 +118,9 @@
"sleep=32000",
"consume=iron coal:2 planks gold",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 36000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=trident_double"
}
},
@@ -128,8 +132,9 @@
"sleep=32000",
"consume=iron:2 coal:2 planks gold",
"play_sound=sound/smiths smith 192",
- "animate=working 45000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 36000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=trident_heavy_double"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-07-07 21:50:29 +0000
@@ -75,11 +75,12 @@
descname = _"forging an ax",
actions = {
"return=skipped unless economy needs ax",
- "sleep=32000",
+ "sleep=26000",
"consume=coal iron",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax"
}
},
@@ -88,11 +89,12 @@
descname = _"forging a sharp ax",
actions = {
"return=skipped unless economy needs ax_sharp",
- "sleep=32000",
+ "sleep=26000",
"consume=coal iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_sharp"
}
},
@@ -101,11 +103,12 @@
descname = _"forging a broad ax",
actions = {
"return=skipped unless economy needs ax_broad",
- "sleep=32000",
+ "sleep=26000",
"consume=coal:2 iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_broad"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua'
--- data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/lime_kiln/init.lua 2016-07-07 21:50:29 +0000
@@ -57,7 +57,10 @@
"sleep=50000",
"return=skipped unless economy needs grout",
"consume=coal granite:2 water:2",
- "animate=working 32000",
+ "play_sound=sound/barbarians stonegrind 100",
+ "animate=working 29000",
+ "play_sound=sound/barbarians mortar 80",
+ "sleep=3000",
"produce=grout:2"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/tavern/init.lua'
--- data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/tavern/init.lua 2016-07-07 21:50:29 +0000
@@ -62,6 +62,7 @@
"sleep=14000",
"return=skipped unless economy needs ration",
"consume=barbarians_bread,fish,meat",
+ "play_sound=sound/taverns dishes 100",
"animate=working 19000",
"produce=ration"
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/warmill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-02-09 12:50:52 +0000
+++ data/tribes/buildings/productionsites/barbarians/warmill/init.lua 2016-07-07 21:50:29 +0000
@@ -82,11 +82,12 @@
descname = _"forging an ax",
actions = {
"return=skipped unless economy needs ax",
- "sleep=32000",
+ "sleep=26000",
"consume=coal iron",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax"
}
},
@@ -95,11 +96,12 @@
descname = _"forging a sharp ax",
actions = {
"return=skipped unless economy needs ax_sharp",
- "sleep=32000",
+ "sleep=26000",
"consume=coal iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_sharp"
}
},
@@ -108,11 +110,12 @@
descname = _"forging a broad ax",
actions = {
"return=skipped unless economy needs ax_broad",
- "sleep=32000",
+ "sleep=26000",
"consume=coal:2 iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_broad"
}
},
@@ -121,11 +124,12 @@
descname = _"forging a bronze ax",
actions = {
"return=skipped unless economy needs ax_bronze",
- "sleep=32000",
- "consume=coal:2 iron:2",
+ "sleep=26000",
+ "consume=coal gold iron",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_bronze"
}
},
@@ -134,11 +138,12 @@
descname = _"forging a battle ax",
actions = {
"return=skipped unless economy needs ax_battle",
- "sleep=32000",
+ "sleep=26000",
"consume=coal gold iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_battle"
}
},
@@ -147,11 +152,12 @@
descname = _"forging a warrior’s ax",
actions = {
"return=skipped unless economy needs ax_warriors",
- "sleep=32000",
+ "sleep=26000",
"consume=coal:2 gold:2 iron:2",
"play_sound=sound/smiths smith 192",
- "animate=working 25000",
- "play_sound=sound/smiths sharpening 192",
+ "animate=working 22000",
+ "play_sound=sound/smiths sharpening 120",
+ "sleep=9000",
"produce=ax_warriors"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua'
--- data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/wood_hardener/init.lua 2016-07-07 21:50:29 +0000
@@ -63,6 +63,7 @@
"sleep=43000",
"return=skipped unless economy needs blackwood",
"consume=log:2",
+ "play_sound=sound/barbarians blackwood 80",
"animate=working 24000",
"produce=blackwood"
}
=== modified file 'data/tribes/buildings/productionsites/empire/tavern/init.lua'
--- data/tribes/buildings/productionsites/empire/tavern/init.lua 2015-12-11 16:54:00 +0000
+++ data/tribes/buildings/productionsites/empire/tavern/init.lua 2016-07-07 21:50:29 +0000
@@ -58,6 +58,7 @@
"sleep=14000",
"return=skipped unless economy needs ration",
"consume=empire_bread,fish,meat",
+ "play_sound=sound/taverns dishes 100",
"animate=working 19000",
"produce=ration"
}
Follow ups
