Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_immovables into lp:widelands
Very nice! I don't see a technical problem which hasn't been there in the unmodified program. :) When I look into the specs of this task, however, there is no mention of the Animals class. So with your implementation we actually are dealing with an over-fulfillment of the task. When I was designing the task, I didn't think of the Animals as something different to Immovables, probably because they don't move in the editor and better handling of the editor was my only purpose. We have to re-think. Anyways, short-key 'a' was targeted for the Animals tool and hence is placed falsely here (for the VIEW). I surmise we should discuss this matter in the task thread first and then continue here. -- https://code.launchpad.net/~widelands-dev/widelands/toggle_immovables/+merge/328977 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/toggle_immovables into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands
Ok, I don't think I have any personal problem here! ;) Are you going to work on the second view filter as well? This should switch all objects of the "Immovable" class/tool. And independent thereof: can you implement or make a suggestion for the Immovable View switch button? -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/toggle_resources into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands
I assume people, including me, can live with such arrangement as you propose. I find it not so convincing, however. While I see your point, I don't quite agree that the current state of the Buildhelp view and related tools has to remain as is. If I had to decide I probably would prefer the WYSIWIG principle and regard it undesirable you have feasibility to perform editions which you are not visibly aware of, or made aware of, so to speak. So I would agree the edition principles should hold strong for all similar tools, but I rather suggest to investigate to change the Buildhelp settings than allow for invisible editions for other tools. The modifications of terrain can be ignored as Buildhelp display can be defined as derivation from the current terrain shape, so it's not really that you create or remove Buildhelp patterns. In that there is no tool involved. Only thing relevant are edifice creation or Portspace creation and these would have to be changed and made dependent on Buildhelp visibility. On a sidenote: once Portspaces are indicated by Anchors, as is planned for the future, the Buildhelp arguments falls aside for this tool. -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/toggle_resources into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/toggle_resources into lp:widelands
Thanks for taking this up, SirVer! Looks good to me on first sight (not extensively tested) with one exception: -- issue: the resource editing tool has to be deactivated while the RESOURCE VIEW is switched OFF. Deactivated means it must not be possible to create or remove any resources on the map. Extended: -- the 'q' key is targeted as a shortcut for the resource view button -- https://code.launchpad.net/~widelands-dev/widelands/toggle_resources/+merge/328958 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/toggle_resources into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664145-miners into lp:widelands
>I think mines right now are not able to switch higher worker for a spare lower >worker to make the higher one available in case of need elsewhere. Not a good point in my view! I think there should be still something to do for the players of the game to perform. What is certainly correct is that AI-players must be in the position to perform miner shifting (not the mines themselves!), but this request must be up already. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664145-miners/+merge/317710 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1664145-miners. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1664145-miners into lp:widelands
Tested today and appears to work correctly now. There was a tiny glitch in that 2 Master Miners (out of 7) remained at home despite new Miner posts requested; instead new Miners were created. We cannot say at this point where exactly this error lies, assuming it is an error. However, I would suggest that clearing out all Miners, Chief Miners and Master Miners should be target before new Miners are created from Pickaxes. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1664145-miners/+merge/317710 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1664145-miners into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-sounds-6 into lp:widelands
I forgot to remove the old sound files and have updated accordingly. I'm not convinced of keeping them as later reference is unlikely (assuming the new ones are an improvement) and if though therefore we have launchpad code version system. Created the CSV text version as requested. The relative barbarism to name it "readme" you have to commit by yourself! ;) I hope for the rest you will get along with my input here; the main part being the new sound files for the game. -- https://code.launchpad.net/~7010622-q/widelands/topple-sounds-6/+merge/316814 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-6 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-sounds-6 into lp:widelands
toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-6 into lp:widelands. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~7010622-q/widelands/topple-sounds-6/+merge/316814 Modified smithies sounds to dimmer versions; added tree-falling sounds, substituted Timber shouting with tree-falling. Added sound documentation in .ods spreadsheet format (LibreCalc) into 'doc' folder. I hope the .ods format is general enough, otherwise I have to look for a suitable export format. -- Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-6 into lp:widelands. === modified file 'data/sound/smiths/smith_00.ogg' Binary files data/sound/smiths/smith_00.ogg 2008-07-30 16:28:18 + and data/sound/smiths/smith_00.ogg 2017-02-09 07:55:50 + differ === modified file 'data/sound/smiths/smith_01.ogg' Binary files data/sound/smiths/smith_01.ogg 2008-07-30 16:28:18 + and data/sound/smiths/smith_01.ogg 2017-02-09 07:55:50 + differ === modified file 'data/sound/smiths/smith_02.ogg' Binary files data/sound/smiths/smith_02.ogg 2008-07-30 16:28:18 + and data/sound/smiths/smith_02.ogg 2017-02-09 07:55:50 + differ === modified file 'data/sound/smiths/toolsmith_01.ogg' Binary files data/sound/smiths/toolsmith_01.ogg 2008-07-30 16:28:18 + and data/sound/smiths/toolsmith_01.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/smiths/xsmith_00.ogg' Binary files data/sound/smiths/xsmith_00.ogg 1970-01-01 00:00:00 + and data/sound/smiths/xsmith_00.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/smiths/xsmith_01.ogg' Binary files data/sound/smiths/xsmith_01.ogg 1970-01-01 00:00:00 + and data/sound/smiths/xsmith_01.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/smiths/xsmith_02.ogg' Binary files data/sound/smiths/xsmith_02.ogg 1970-01-01 00:00:00 + and data/sound/smiths/xsmith_02.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/smiths/xtoolsmith_01.ogg' Binary files data/sound/smiths/xtoolsmith_01.ogg 1970-01-01 00:00:00 + and data/sound/smiths/xtoolsmith_01.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/woodcutting/tree-falling_00.ogg' Binary files data/sound/woodcutting/tree-falling_00.ogg 1970-01-01 00:00:00 + and data/sound/woodcutting/tree-falling_00.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/woodcutting/tree-falling_01.ogg' Binary files data/sound/woodcutting/tree-falling_01.ogg 1970-01-01 00:00:00 + and data/sound/woodcutting/tree-falling_01.ogg 2017-02-09 07:55:50 + differ === added file 'data/sound/woodcutting/tree-falling_10.ogg' Binary files data/sound/woodcutting/tree-falling_10.ogg 1970-01-01 00:00:00 + and data/sound/woodcutting/tree-falling_10.ogg 2017-02-09 07:55:50 + differ === modified file 'data/tribes/workers/atlanteans/woodcutter/init.lua' --- data/tribes/workers/atlanteans/woodcutter/init.lua 2017-01-26 13:04:54 + +++ data/tribes/workers/atlanteans/woodcutter/init.lua 2017-02-09 07:55:50 + @@ -35,6 +35,7 @@ "walk object", "play_sound sound/atlanteans/saw sawing 230", "animation sawing 1", + "play_sound sound/woodcutting tree-falling 130", "object fall", "animation idle 2000", "createware log", === modified file 'data/tribes/workers/barbarians/lumberjack/init.lua' --- data/tribes/workers/barbarians/lumberjack/init.lua 2016-10-13 13:40:08 + +++ data/tribes/workers/barbarians/lumberjack/init.lua 2017-02-09 07:55:50 + @@ -36,7 +36,8 @@ "walk object", "play_sound sound/woodcutting woodcutting 255", "animation hacking 1", - "play_sound sound/spoken timber 192", +-- "play_sound sound/spoken timber 192", + "play_sound sound/woodcutting tree-falling 130", "object fall", "animation idle 2000", "createware log", === modified file 'data/tribes/workers/empire/lumberjack/init.lua' --- data/tribes/workers/empire/lumberjack/init.lua 2016-10-13 13:40:08 + +++ data/tribes/workers/empire/lumberjack/init.lua 2017-02-09 07:55:50 + @@ -36,7 +36,8 @@ "walk object", "play_sound sound/woodcutting fast_woodcutting 250", "animation hacking 1", - "play_sound sound/spoken timber 156", +-- "play_sound sound/spoken timber 156", + "play_sound sound/woodcutting tree-falling 130", "object fall", "animation idle 2000", "createware log", === added file 'doc/wl sound docu (toptopple).ods' Binary files doc/wl sound docu (toptopple).ods 1970-01-01 00
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/critter_editor_categories into lp:widelands
@GunChleoc: while the code may be old, it is fact that in latest version (8236) the disturbing text does not show in the Animals menu, so we must assume this branch is responsible for its appearance. Can you agree with that? I have seen the text goes away when any item is selected, but I still hold it is preferable to deactivate the text in Animals until a better solution for this aid is found. -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/critter_editor_categories into lp:widelands
Review: Needs Fixing I am a bit sceptical about the amount of redundant text that appears in the selection windows of Immovables and Animals. You have also added the text to the Animals window which didn't show it before. The standard text showing everywhere is "Click to select an item. Use the Ctrl key to select multiple items." I wonder for what is it good? 1. "Click to select an item." is redundant, everyone using this tool can be expected to guess this. 2. "Use the Ctrl key to select multiple items." This is useful information, but is it enough and is it in the right place? Once you understood the message, this text still appears as graphic clutter during all your editor work (more or less) and consuming needed view space. Then, have you looked at the "Duck" window and how the text appears there? It's a monument of redundancy and it will not take long until people will start asking "Why?". I further find two things: A) Help texts of the mentioned type can be placed as a hover-text on a small Help button, like e.g showing "?", in the bottom right of each selection window. You can even put more information there, e.g. on what multiple selections can be used for. Then this type of text can disappear from the displays. B) What could, additionally, indeed show in the bottom of the displays is an explanatory text for the chosen category (tab) if there is a special practical relevance to these items. E.g. the "Rocks" tab could say "Items here can be mined for the Stone and Marble resource.". Or. "Dead trees can never be removed." Etc. Hope this can give some ideas which are useful. -- https://code.launchpad.net/~widelands-dev/widelands/critter_editor_categories/+merge/312967 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/critter_editor_categories. ___ 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
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-sounds-5 into lp:widelands
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 + and data/sound/atlanteans/cutting/stonecutter_01.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/cutting/stonecutter_02.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/cutting/stonecutter_03.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/saw/benchsaw_01.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/saw/benchsaw_02.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/saw/sawing_01.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/saw/sawing_02.ogg 2016-12-12 08:28:58 + 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 + and data/sound/atlanteans/saw/sawing_03.ogg 2016-12-12 08:28:58 + differ === added file 'data/sound/barbarians/weaver_01.ogg' Binary files data/sound/barbarians/weaver_01.ogg 1970-01-01 00:00:00 + and data/sound/barbarians/weaver_01.ogg 2016-12-12 08:28:58 + differ === added file 'data/sound/mill/weaving_01.ogg' Binary files data/sound/mill/weaving_01.ogg 1970-01-01 00:00:00 + and data/sound/mill/weaving_01.ogg 2016-12-12 08:28:58 + 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 + +++ data/tribes/buildings/productionsites/atlanteans/sawmill/init.lua 2016-12-12 08:28:58 + @@ -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 2", -- 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 + +++ data/tribes/buildings/productionsites/atlanteans/weaving_mill/init.lua 2016-12-12 08:28:58 + @@ -70,6 +70,7 @@ "return=skipped unless economy needs spidercloth", "sleep=1", "consume=spider_silk", +"play_sound=sound/mill weaving 120", "animate=working 2", "sleep=1", "produce=spidercloth" @@ -82,6 +83,7 @@ "return=skipped unless economy needs tabard", "sleep=1", "consume=spider_silk", +"play_sound=sound/mill weaving 120", "animate=working 25000", "sleep=5000", "produce=tabard" @@ -95,6 +97,7 @@
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1647033-immovable-packet-no into lp:widelands
Review: Approve I could create a stable version of Gold Rush (online as version 1.2) with this branch and it loads into B19. Noteworthy, the save games of later versions still report the same error when loaded in B19. Not necessarily a problem. Savegames probably will grow incompatible anyway soon, so it's not worth fixing this part. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1647033-immovable-packet-no/+merge/312530 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1647033-immovable-packet-no. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-2 into lp:widelands
My work on colony expedition AI draws to a first conclusion. I have worked in several "printf" log messages which I don't know what to do with. The rules for coding in this point are not clear to me. Can you helo me out? It would be benefitial to keep the logs, though in out-commented status, for later use, on the other hand this would clutter up the texts. -- https://code.launchpad.net/~7010622-q/widelands/topple-seafaring-2/+merge/312111 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-seafaring-2 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_seafaring_split into lp:widelands
Review: Approve Checked the code and don't find objections. --> Approve One thing you might consider still is to group declarations in defaultai.h as to current AI segmentation, here: seafaring code. Another thing you could think about is to, in the longer run, promote segmentation of AI code by seeking to group code references (e.g. declarations) after semantic relation (topic). This would enhance maintainability of the AI code. -- https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_split/+merge/311544 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/ai_seafaring_split. ___ 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
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_seafaring_split into lp:widelands
I like to add that the entire move was your suggestion! I don't have precise conceptions for it. What does the compiler say? So I can address all references in defaultai.h or only the public ones? -- https://code.launchpad.net/~widelands-dev/widelands/ai_seafaring_split/+merge/311544 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_seafaring_split into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands
Btw, is the C++ system applied for Widelands using garbage collection? I looked through some code in defaultai.cc and didn't find any free-memory operations so far, e.g. after local list creations. -- https://code.launchpad.net/~7010622-q/widelands/topple-seafaring-1/+merge/310436 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands
I tested my proposed logic on a "one-world" island and it turned out the expedition found portspaces in secondary access although it doesn't per-se perform secondary island circling. This is because the map is a torus and the ship is reflected only onto the island again under various angles and situations. So it works! Regarding your considerations, however, I would suggest a repetition probability of 25% (instead of 0). In this manner we could safely implement the improvements implied and work on more profound revisions later on. Would that find your agreement? -- https://code.launchpad.net/~7010622-q/widelands/topple-seafaring-1/+merge/310436 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands
It does a job though! :) >Well, current logic was that if known portspace is found, the ship with >probability of 50% search for open sea and if found it sails this direction. >Otherwise it sail (keep on sailing) around the current land. One of the points is that this procedure is also activated when a ship hits an island (on a memorised spot). The new logic rests on two points. 1. make a meaningful decision once on any found port-space, 2. if you hit any known island spot (port-space or other) then seek to leave for open sea again. This new behaviour targets speeding up of the search and this is barely required. @Tibor You can aid the reformation by adding another call to "expedition_management()" in the case where both holds true: a) ship sails in modus "circle island", b) ship hits a spot which has been noted as "visited" before. I have no idea where the relevant logic is situated, and actually I would prefer if you could jump in here, in case you have an instant knowledge on how to do this mod. Perhaps you can create a branch or state the lines here. A second point that can be more easily improved is the duration of the AI expedition phase. I found on larger maps this is somewhat too short. If we can make this value, which now probably is a constant, adaptive to the size of the map, this would make a shorthand advancement. Otherwise I would just double the value, which doesn't hurt anyone. -- https://code.launchpad.net/~7010622-q/widelands/topple-seafaring-1/+merge/310436 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands. ___ 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
Re: [Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands
repeat_island_prob is a repetition probability polled when a ship hits an island at a spot which was encountered before. So it is quaranteed that an island is at least circled once (when being found). repeat_island_prob is not a cessation probability, which it would have to be to justify your concerns. ;) As for my observations, cessation happens flawlessly after one circle. Then the ship heads for open sea again. (This holds for hit islands, it is not tested at this point for the "motherland" from where exploration started. Assertions there are subject to further investigation.) -- https://code.launchpad.net/~7010622-q/widelands/topple-seafaring-1/+merge/310436 Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-seafaring-1 into lp:widelands. ___ 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
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands
toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-4/+merge/309656
These are the adjustment time values for weapon and armour production sites
(all races) which were changed recently for more efficient use of their
schemes. The new values are required to compensate increased production speed
in the "mixed resources" cases, which must be considered standard. Mixed
resources means there are not all resources supplied for the entire set of
products the economy needs.
Though these changes may appear voluminous to some, actually they are still
rather weak. I test-played them all and they render nicely. With only 2 houses
"weapon-smith" (and 2 for armour) you receive a constant flow of equipment and
can run your training camp at 100% if all raw resources are supplied.
The effects are two-fold:
1) production time values are lifted (e.g.t o allow for resupplies of raw
material)
2) times of products are diversified according to their value. That means for a
higher product more time is invested than for a lower. Values in seconds.
Site : Product OldNew Change Factor
--
BA AxeWo : Axe 57 73 16 0.28
BA AxeWo : Axe-Sharp57 76 19 0.33
BA AxeWo : Axe-Broad57 79 22 0.38
BA Warmill : Axe57 73 16 0.28
BA Warmill : Axe-Sharp 57 76 19 0.33
BA Warmill : Axe-Broad 57 79 22 0.38
BA Warmill : Axe-Bronze 57 82 25 0.44
BA Warmill : Axe-Battle 57 87 30 0.53
BA Warmill : Axe-Warrio 57 92 35 0.61
BA Helms : Helmet 67 80 13 0.19
BA Helms : Mask 77 90 15 0.18
BA Helms : Warhelm 87 100 17 0.15
EM Weapons : Wood Spear 50 64 14 0.28
EM Weapons : Spear 77 102 25 0.32
EM Weapons : Adv. Spear 77 110 33 0.43
EM Weapons : Hv. Spear 77 115 38 0.49
EM Weapons : War-Spear 77 120 43 0.56
EM Armors : Helmet 67 80 13 0.19
EM Armors : Armor 77 90 13 0.17
EM Armors : Chain Armor 77 108 31 0.40
EM Armors : Guild Armor 77 115 38 0.49
AT Weapons : Tri Light 50 64 14 0.28
AT Weapons : Tri Long 77 102 25 0.32
AT Weapons : Tri Steel 77 110 33 0.43
AT Weapons : Tri Double 77 115 38 0.49
AT Weapons : Tri H-D77 120 43 0.56
AT Armors : Shld Steel 67 90 23 0.34
AT Armors : Shld Adv. 77 110 33 0.43
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-4 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-24 10:09:01 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-10-31 07:27:05 +
@@ -132,10 +132,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging a steel shield because ...
descname = _"forging a steel shield",
actions = {
+-- time total: 90
"return=skipped unless economy needs shield_steel",
-"sleep=32000",
+"sleep=45000", -- +13 enlarge
"consume=iron:2 coal:2",
-"animate=working 35000",
+"animate=working 45000", -- +10 enlarge
"produce=shield_steel"
}
},
@@ -143,10 +144,11 @@
-- TRANSLATORS: Completed/Skipped/Did not start forging an advanced shield because ...
descname = _"forging an advanced shield",
actions = {
+-- time total: 110
"return=skipped unless economy needs shield_advanced",
"consume=iron:2 coal:2 gold",
-"sleep=32000",
-"animate=working 45000",
+"sleep=5", -- +18 enlarge
+"animate=working 6", -- +15 enlarge
"produce=shield_advanced"
}
},
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-10-24 10:09:01 +
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-atlantean-update-1 into lp:widelands
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 +
+++ data/tribes/buildings/productionsites/atlanteans/mill/init.lua 2016-10-28 06:40:19 +
@@ -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 +
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2016-10-28 06:40:19 +
@@ -69,7 +69,9 @@
"sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=iron_ore coal",
"sleep=2",
+"play_sound=sound/metal fizzle 150",
"animate=working 35000",
+"play_sound=sound/metal ironping 80",
"produce=iron"
}
},
@@ -81,7 +83,9 @@
"sleep=1", -- 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 +
+++ data/tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua 2016-10-28 06:40:19 +
@@ -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 @@
desc
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-3 into lp:widelands
toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-3 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-3/+merge/309403
This is the completion of my "production-logic" series regarding avoidance of
not intended wait times. This one improves Barbarian Inn + Big-Inn, Empire Inn
and Atlantean Smokery.
In a second step I have added some smaller increments to the higher products
for Barbarians and Empire. This is a little compensation for improved
efficiency and adds to natural economy rendering. The resulting production
times for each product is stated in comments in the lua files.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-3 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/smokery/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smokery/init.lua 2016-09-03 14:59:10 +
+++ data/tribes/buildings/productionsites/atlanteans/smokery/init.lua 2016-10-26 21:34:29 +
@@ -67,11 +67,13 @@
-- TRANSLATORS: Completed/Skipped/Did not start smoking meat because ...
descname = _"smoking meat",
actions = {
+-- time total: 60
"return=skipped when site has fish and economy needs smoked_fish and not economy needs smoked_meat",
"return=skipped unless economy needs smoked_meat",
-"sleep=3",
+"sleep=1",
"consume=meat:2 log",
"animate=working 3",
+"sleep=2",
"produce=smoked_meat:2"
}
},
@@ -79,11 +81,13 @@
-- TRANSLATORS: Completed/Skipped/Did not start smoking fish because ...
descname = _"smoking fish",
actions = {
+-- time total: 60
"return=skipped when site has meat and economy needs smoked_meat and not economy needs smoked_fish",
"return=skipped unless economy needs smoked_fish",
-"sleep=3",
+"sleep=1",
"consume=fish:2 log",
"animate=working 3",
+"sleep=2",
"produce=smoked_fish:2"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2016-10-24 10:10:06 +
+++ data/tribes/buildings/productionsites/barbarians/big_inn/init.lua 2016-10-26 21:34:29 +
@@ -69,11 +69,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start preparing a ration because ...
descname = _"preparing a ration",
actions = {
+-- time total: 33
"return=skipped unless economy needs ration",
-"sleep=3",
+"sleep=23000",
"consume=barbarians_bread,fish,meat",
"play_sound=sound/barbarians/taverns tavern 100",
-"sleep=3000",
+"sleep=1",
"produce=ration"
}
},
@@ -81,11 +82,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start preparing a snack because ...
descname = _"preparing a snack",
actions = {
+-- time total: 37
"return=skipped unless economy needs snack",
-"sleep=3",
+"sleep=5000",
"consume=barbarians_bread fish,meat beer",
"play_sound=sound/barbarians/taverns biginn 100",
-"sleep=5000",
+"sleep=32000",
"produce=snack"
}
},
@@ -93,11 +95,12 @@
-- TRANSLATORS: Completed/Skipped/Did not start preparing a meal because ...
descname = _"preparing a meal",
actions = {
+-- time total: 40
"return=skipped unless economy needs meal",
-"sleep=32000",
+"sleep=5000",
"consume=barbarians_bread fish,meat beer_strong",
"play_sound=sound/barbarians/taverns biginn 100",
-"sleep=5000",
+"sleep=35000",
"produce=meal"
}
},
=== modified file 'data/tribes/buildings/productionsites/barbarians/inn/init.lua'
--- data/tribes/buildings/productionsites/barbarians/inn/init.lua 2016-10-24 10:10:06 +
+++ data/tribes/buildings/productionsites/barbarians/inn/init.lua 2016-10-26 21:34:29 +
@@ -66
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-2 into lp:widelands
toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-2 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-2/+merge/301477
Modified LUA scripts for weapon- and armour-smithies of all races to omit all
wait times for complex products if their resource restraints are not met.
The effect of this is that all products which can be produced in a production
run are produced without penalty times for products which cannot be produced
due to resource shortage.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-2 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2015-12-11 16:54:00 +
+++ data/tribes/buildings/productionsites/atlanteans/armorsmithy/init.lua 2016-07-29 11:40:20 +
@@ -76,8 +76,8 @@
descname = _"forging an advanced shield",
actions = {
"return=skipped unless economy needs shield_advanced",
-"sleep=32000",
"consume=iron:2 coal:2 gold",
+"sleep=32000",
"animate=working 45000",
"produce=shield_advanced"
}
=== modified file 'data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-07-07 09:58:30 +
+++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-07-29 11:40:20 +
@@ -87,8 +87,8 @@
descname = _"forging a long trident",
actions = {
"return=skipped unless economy needs trident_long",
-"sleep=32000",
"consume=iron coal planks",
+"sleep=32000",
"play_sound=sound/smiths smith 192",
"animate=working 36000",
"play_sound=sound/smiths sharpening 120",
@@ -101,8 +101,8 @@
descname = _"forging a steel trident",
actions = {
"return=skipped unless economy needs trident_steel",
-"sleep=32000",
"consume=iron:2 coal planks",
+"sleep=32000",
"play_sound=sound/smiths smith 192",
"animate=working 36000",
"play_sound=sound/smiths sharpening 120",
@@ -115,8 +115,8 @@
descname = _"forging a double trident",
actions = {
"return=skipped unless economy needs trident_double",
-"sleep=32000",
"consume=iron coal:2 planks gold",
+"sleep=32000",
"play_sound=sound/smiths smith 192",
"animate=working 36000",
"play_sound=sound/smiths sharpening 120",
@@ -129,8 +129,8 @@
descname = _"forging a heavy double trident",
actions = {
"return=skipped unless economy needs trident_heavy_double",
-"sleep=32000",
"consume=iron:2 coal:2 planks gold",
+"sleep=32000",
"play_sound=sound/smiths smith 192",
"animate=working 36000",
"play_sound=sound/smiths sharpening 120",
=== modified file 'data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-07-07 09:58:30 +
+++ data/tribes/buildings/productionsites/barbarians/ax_workshop/init.lua 2016-07-29 11:40:20 +
@@ -89,8 +89,8 @@
descname = _"forging a sharp ax",
actions = {
"return=skipped unless economy needs ax_sharp",
-"sleep=26000",
"consume=coal iron:2",
+"sleep=26000",
"play_sound=sound/smiths smith 192",
"animate=working 22000",
"play_sound=sound/smiths sharpening 120",
@@ -103,8 +103,8 @@
descname = _"forging a broad ax",
actions = {
"return=skipped unless economy needs ax_broad",
-"sleep=26000",
"consume=coal:2 iron:2",
+"sleep=26000",
"play_sound=sound/smiths smith 192",
"animate=working 22000",
"play_sound=sound/smiths sharpening 120",
=== modified file 'data/tribes/buildings/productionsites/barbarians/helmsm
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands
toptopple has proposed merging
lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~7010622-q/widelands/topple-production-logic-1/+merge/301359
Modified the LUA scripts for all races' smelting_works so that the penalty
production time for not supplying iron-ore or gold-ore are reduced to 10
seconds for each kind of resource per production run.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~7010622-q/widelands/topple-production-logic-1 into lp:widelands.
=== modified file 'data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2015-12-11 16:54:00 +
+++ data/tribes/buildings/productionsites/atlanteans/smelting_works/init.lua 2016-07-28 06:45:41 +
@@ -66,8 +66,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
-"sleep=25000",
+"sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=iron_ore coal",
+"sleep=2",
"animate=working 35000",
"produce=iron"
}
@@ -77,8 +78,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
-"sleep=25000",
+"sleep=1", -- penalty for unavailable gold_ore
"consume=gold_ore coal",
+"sleep=15000",
"animate=working 35000",
"produce=gold"
}
=== modified file 'data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-06-17 07:41:37 +
+++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-07-28 06:45:41 +
@@ -69,8 +69,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
-"sleep=32000",
+"sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=coal iron_ore",
+"sleep=27000",
"play_sound=sound/metal furnace 192",
"animate=working 35000",
"play_sound=sound/metal ironping 80",
@@ -82,8 +83,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
-"sleep=32000",
+"sleep=1", -- penalty for unavailable gold_ore
"consume=coal gold_ore",
+"sleep=22000",
"play_sound=sound/metal furnace 192",
"animate=working 35000",
"play_sound=sound/metal goldping 80",
=== modified file 'data/tribes/buildings/productionsites/empire/smelting_works/init.lua'
--- data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-06-18 07:31:14 +
+++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-07-28 06:45:41 +
@@ -71,8 +71,9 @@
descname = _"smelting iron",
actions = {
"return=skipped unless economy needs iron",
-"sleep=25000",
+"sleep=5000", -- penalty for unavailable iron_ore (2x)
"consume=iron_ore coal",
+"sleep=2",
"play_sound=sound/metal fizzle 150",
"animate=working 35000",
"play_sound=sound/metal ironping 80",
@@ -84,8 +85,9 @@
descname = _"smelting gold",
actions = {
"return=skipped unless economy needs gold",
-"sleep=25000",
+"sleep=1", -- 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",
___
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
[Widelands-dev] [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 + and data/sound/barbarians/taverns/biginn_01.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/biginn_02.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/biginn_10.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/inn_01.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/inn_02.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/inn_10.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/tavern_01.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/tavern_02.ogg 2016-07-18 09:52:15 + 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 + and data/sound/barbarians/taverns/tavern_10.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/meal_01.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/meal_02.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/meal_10.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/ration_01.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/ration_02.ogg 2016-07-18 09:52:15 + 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 + and data/sound/empire/taverns/ration_10.ogg 2016-07-18 09:52:15 + differ === modified file 'data/sound/farm/ox_00.ogg' Binary files data/sound/farm/ox_00.ogg 2010-03-28 08:46:10 + and data/sound/farm/ox_00.ogg 2016-07-18 09:52:15 + 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 + and data/sound/taverns/dishes_01.ogg 1970-01-01 00:00:00 + differ === removed file 'data/sound/taverns/dishes_02.ogg' Binary files data/sound/taverns/dishes_02.ogg 2016-07-07 09:58:30 + and data/sound/taverns/dishes_02.ogg 1970-01-01 00:00:00 + differ === removed file 'data/sound/taverns/dishes_10.ogg' Binary files data/sound/taverns/dishes_10.ogg 2016-07-07 09:58:30 + and data/sound/taverns/dishes_10.ogg 1970-01-01 00:00:00 + differ === modified file 'data/tribes/buildings/productionsites/barbarians/big_inn/init.
[Widelands-dev] [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 + and data/sound/animals/elk_02.ogg 2016-07-07 21:50:29 + 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 + and data/sound/barbarians/blackwood_01.ogg 2016-07-07 21:50:29 + differ === added file 'data/sound/barbarians/mortar_01.ogg' Binary files data/sound/barbarians/mortar_01.ogg 1970-01-01 00:00:00 + and data/sound/barbarians/mortar_01.ogg 2016-07-07 21:50:29 + differ === added file 'data/sound/barbarians/stonegrind_01.ogg' Binary files data/sound/barbarians/stonegrind_01.ogg 1970-01-01 00:00:00 + and data/sound/barbarians/stonegrind_01.ogg 2016-07-07 21:50:29 + 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 + and data/sound/taverns/dishes_01.ogg 2016-07-07 21:50:29 + differ === added file 'data/sound/taverns/dishes_02.ogg' Binary files data/sound/taverns/dishes_02.ogg 1970-01-01 00:00:00 + and data/sound/taverns/dishes_02.ogg 2016-07-07 21:50:29 + differ === added file 'data/sound/taverns/dishes_10.ogg' Binary files data/sound/taverns/dishes_10.ogg 1970-01-01 00:00:00 + and data/sound/taverns/dishes_10.ogg 2016-07-07 21:50:29 + 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 + +++ data/tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua 2016-07-07 21:50:29 + @@ -76,8 +76,9 @@ "sleep=2", "consume=iron planks", "play_sound=sound/smiths smith 192", -"animate=working 3", -"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", -&quo
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-sounds-2 into lp:widelands
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 + and data/sound/empire/beerbubble_01.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/empire/beerbubble_02.ogg' Binary files data/sound/empire/beerbubble_02.ogg 1970-01-01 00:00:00 + and data/sound/empire/beerbubble_02.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/empire/winebubble_01.ogg' Binary files data/sound/empire/winebubble_01.ogg 1970-01-01 00:00:00 + and data/sound/empire/winebubble_01.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/empire/winebubble_02.ogg' Binary files data/sound/empire/winebubble_02.ogg 1970-01-01 00:00:00 + and data/sound/empire/winebubble_02.ogg 2016-06-18 08:25:35 + 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 + and data/sound/metal/fizzle_01.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/metal/furnace_01.ogg' Binary files data/sound/metal/furnace_01.ogg 1970-01-01 00:00:00 + and data/sound/metal/furnace_01.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/metal/goldping_01.ogg' Binary files data/sound/metal/goldping_01.ogg 1970-01-01 00:00:00 + and data/sound/metal/goldping_01.ogg 2016-06-18 08:25:35 + differ === added file 'data/sound/metal/ironping_01.ogg' Binary files data/sound/metal/ironping_01.ogg 1970-01-01 00:00:00 + and data/sound/metal/ironping_01.ogg 2016-06-18 08:25:35 + 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 + and data/sound/mill/mill_turning_01.ogg 2016-06-18 08:25:35 + 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 + +++ data/tribes/buildings/productionsites/barbarians/smelting_works/init.lua 2016-06-18 08:25:35 + @@ -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 + +++ data/tribes/buildings/productionsites/empire/brewery/init.lua 2016-06-18 08:25:35 + @@ -57,6 +57,7 @@ "sleep=3", "return=skipped unless economy needs beer", "consume=water wheat", +"play_sound=sound/empire beerbubble 180", "animate=working 3", "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 + +++ data/tribes/buildings/productionsites/empire/smelting_works/init.lua 2016-06-18 08:25:35 + @@ -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&q
[Widelands-dev] [Merge] lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands
toptopple has proposed merging lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands. Commit message: Added sounds for sheep, fox, elk, wolf, stag, boar. Removed "human sheep" sound. Added silence sound files to mitigate noise. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~7010622-q/widelands/topple-sounds-1/+merge/296902 Date: 09.06.16 -- == Added new sound files == data/sound/animals (some of these files have added 10 sec of silence) boar_01.ogg elk_01.ogg elk_02.ogg stag_01.ogg stag_02.ogg wolf_01.ogg wolf_02.ogg wolf_03.ogg coyote_01.ogg plus 90 sec silence coyote_02.ogg data/sound/farm sheep_01.ogg sheep_02.ogg sheep_03.ogg == Added silence files (10 seconds) == wolf_10.ogg wolf_11.ogg wolf_12.ogg wolf_13.ogg wolf_14.ogg elk_10.ogg elk_11.ogg stag_10.ogg stag_11.ogg stag_12.ogg stag_13.ogg == Modified LUA script file (added sound) == data/world/critters stag/init.lua fox/init.lua wildboar/init.lua elk/init.lua wolf/init.lua -- Your team Widelands Developers is requested to review the proposed merge of lp:~7010622-q/widelands/topple-sounds-1 into lp:widelands. === added file 'data/sound/animals/boar_01.ogg' Binary files data/sound/animals/boar_01.ogg 1970-01-01 00:00:00 + and data/sound/animals/boar_01.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/coyote_01.ogg' Binary files data/sound/animals/coyote_01.ogg 1970-01-01 00:00:00 + and data/sound/animals/coyote_01.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/coyote_02.ogg' Binary files data/sound/animals/coyote_02.ogg 1970-01-01 00:00:00 + and data/sound/animals/coyote_02.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/elk_01.ogg' Binary files data/sound/animals/elk_01.ogg 1970-01-01 00:00:00 + and data/sound/animals/elk_01.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/elk_02.ogg' Binary files data/sound/animals/elk_02.ogg 1970-01-01 00:00:00 + and data/sound/animals/elk_02.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/elk_10.ogg' Binary files data/sound/animals/elk_10.ogg 1970-01-01 00:00:00 + and data/sound/animals/elk_10.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/elk_11.ogg' Binary files data/sound/animals/elk_11.ogg 1970-01-01 00:00:00 + and data/sound/animals/elk_11.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_01.ogg' Binary files data/sound/animals/stag_01.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_01.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_02.ogg' Binary files data/sound/animals/stag_02.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_02.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_10.ogg' Binary files data/sound/animals/stag_10.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_10.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_11.ogg' Binary files data/sound/animals/stag_11.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_11.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_12.ogg' Binary files data/sound/animals/stag_12.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_12.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/stag_13.ogg' Binary files data/sound/animals/stag_13.ogg 1970-01-01 00:00:00 + and data/sound/animals/stag_13.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_01.ogg' Binary files data/sound/animals/wolf_01.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_01.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_02.ogg' Binary files data/sound/animals/wolf_02.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_02.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_03.ogg' Binary files data/sound/animals/wolf_03.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_03.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_10.ogg' Binary files data/sound/animals/wolf_10.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_10.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_11.ogg' Binary files data/sound/animals/wolf_11.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_11.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_12.ogg' Binary files data/sound/animals/wolf_12.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_12.ogg 2016-06-09 07:45:59 + differ === added file 'data/sound/animals/wolf_13.ogg' Binary files data/sound/animals/wolf_13.ogg 1970-01-01 00:00:00 + and data/sound/animals/wolf_13.ogg 2016-06-09 07:45:59 + differ ===
