Merge lp:~wl-zocker/widelands/conf_files_changes into lp:widelands
Status: | Merged |
---|---|
Merged at revision: | 7068 |
Proposed branch: | lp:~wl-zocker/widelands/conf_files_changes |
Merge into: | lp:widelands |
Diff against target: |
112 lines (+10/-11) 9 files modified
tribes/atlanteans/farm/conf (+1/-0) tribes/atlanteans/horse/conf (+1/-1) tribes/atlanteans/horsefarm/conf (+1/-2) tribes/barbarians/cattlefarm/conf (+1/-2) tribes/barbarians/cloth/conf (+2/-1) tribes/barbarians/ox/conf (+1/-1) tribes/barbarians/weaving-mill/conf (+1/-1) tribes/empire/donkey/conf (+1/-1) tribes/empire/donkeyfarm/conf (+1/-2) |
To merge this branch: | bzr merge lp:~wl-zocker/widelands/conf_files_changes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
SirVer | Approve | ||
Review via email: mp+226384@code.launchpad.net |
Description of the change
This merge request includes three issues:
- Transportation animals have been produced when they were needed, no matter if the economy had enough wares (wheat/corn and water) or not. But they were also produced when there was no need for them, only because the economy had the wares to do so. This is probably the reason why the AI always has so many animals in its warehouses at the end of the game. I removed the last case; the animals are only produced when they are needed. I increased their default_
- The same as above for the cloth of the Barbarians. The weaving-mill used to consume all thatch reed. This was not no big problem, but it caused road traffic. The default_
- Last but not least, I fixed bug 1332455. Seemingly, when no return was defined, this was interpreted as success.
Good changes! You become quite adept at those conf files tweaks :)
Cannot merge right now, but I think this should go in.