Merge lp:~widelands-dev/widelands/ferry into lp:widelands

[Benedikt Straub]

This is a feature for post-build20 of course, but it´s ready for (review and) testing now. It´ll need very extensive testing anyway due to the great economy engine changes.

Ferries are a special kind of carrier that works on waterways and can transport only a ware, no workers. Waterways are built like roads.
I pulled out common code for Roads and Waterways into a base class RoadBase.
Ferries are distributed to waterways by fleets. They are built in a ferry yard by a shipwright (build costs still need discussion).

I solved the big problem of having separate road networks connected only by ferries with an overhaul of the entire economy concept. Each PlayerImmovable, Worker etc now has one Economy for wares and one for workers. They are completely independent of each other. This change breaks saveloding compatibility.
The AI works fine (though it is completely unaware of the existence of ferries and waterways), but someone should check the changed code parts nonetheless. I added some TODOs in the places I touched.

Ferries are enabled only for maps in which the key waterway_max_length is set to >= 2 in the port_spaces packet. There´s no GUI yet; defaults to 0 (= disabled).

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3740. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/410375646.
Appveyor build 3540. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3540.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3745. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/410977319.
Appveyor build 3545. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3545.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3747. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/411195871.
Appveyor build 3547. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3547.

[Teppo Mäenpää (kxq)]

I get a compiler error on 8780:

../src/logic/map_objects/tribes/ferry.cc: In member function ‘void Widelands::Ferry::start_task_row(Widelands::Game&, Widelands::Waterway*)’:
../src/logic/map_objects/tribes/ferry.cc:106:17: error: invalid conversion from ‘const value_type*’ {aka ‘const Widelands::Coords*’} to ‘Widelands::Coords*’ [-fpermissive]
  destination_ = &(CoordPath(game.map(), ww->get_path()).get_coords()[ww->get_idle_index()]);

[Benedikt Straub (nordfriese)]

Thanks for reporting, hopefully fixed now. I can´t compile at the moment, so I don´t notice such errors until someone complains ;)
I very much hope I didn´t break the successes from 8777 with this…

[Teppo Mäenpää (kxq)]

Now I got it, thanks.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3756. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/412147917.
Appveyor build 3556. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3556.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3759. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/412376982.
Appveyor build 3559. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3559.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3772. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/415039555.
Appveyor build 3571. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3571.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3790. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/415596858.
Appveyor build 3589. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3589.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3801. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/416088423.
Appveyor build 3600. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3600.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3862. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/422757043.
Appveyor build 3660. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3660.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3874. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/423456112.
Appveyor build 3672. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3672.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3922. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/426400155.
Appveyor build 3720. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3720.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3938. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/427174251.
Appveyor build 3736. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-3736.

[lp:~widelands-dev/widelands/ferry]

8802. By Nordfriese on 2018-11-21

Fixed merge conflicts

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4260. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/458082330.
Appveyor build 4054. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4054.

[lp:~widelands-dev/widelands/ferry]

8803. By Nordfriese on 2018-11-22

Fixed ferry cancelling to row to destination

8804. By Nordfriese on 2018-11-22

Two economies connected only for wares but not for workers _have_ to be considered separate for both types

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4263. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/458376614.
Appveyor build 4057. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4057.

[lp:~widelands-dev/widelands/ferry]

8805. By Nordfriese on 2018-11-22

Seperated WareEconomy and WorkerEconomy

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4264. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/458580181.
Appveyor build 4058. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4058.

[lp:~widelands-dev/widelands/ferry]

8806. By Nordfriese on 2018-11-23

Fixed compiler errors

8807. By Nordfriese on 2018-11-23

It works./widelands !

8808. By Nordfriese on 2018-11-23

Nicer log output

8809. By Nordfriese on 2018-11-23

Removed a strange crash

8810. By Nordfriese on 2018-11-23

Finally fixed the economy bug

8811. By Nordfriese on 2018-11-23

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4277. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/458960300.
Appveyor build 4071. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4071.

[lp:~widelands-dev/widelands/ferry]

8812. By Nordfriese on 2018-11-24

Various fixes

8813. By Nordfriese on 2018-11-24

Fixed wares/workers in warehouses being counted twice

8814. By Nordfriese on 2018-11-24

Fixed crash on waterway cleanup

8815. By Nordfriese on 2018-11-24

Fixed crash on request rerouting

[Benedikt Straub (nordfriese)]

Hm... I´m found one remaining crash in this branch during loading a saved game. Sometimes it works, rarely it crashes directly after loading, and most time it crashes with a segfault while loading the waterwaydata packet. The strange thing is that the segfault always occurs in a different function. I have no idea how to debug this, any help would be appreciated...

[lp:~widelands-dev/widelands/ferry]

8816. By Nordfriese on 2018-11-24

Show ferry yards only on ferry maps

8817. By Nordfriese on 2018-11-24

Fixed codecheck warning

8818. By Nordfriese on 2018-11-24

Fixed compile error

[TiborB (tiborb95)]

I did not read the diff, but I wonder how are the two economies implemented.

A building or flag is a member of one or two economies?

As for segfault - are you using gdb to get backtrace? If this does not give enough clue than it is a problem..

[Benedikt Straub (nordfriese)]

Every building/flag/… belongs to two independent economies now. A PlayerImmovable now has the properties
    Economy* ware_economy_;
    Economy* worker_economy_;
instead of Economy* economy_;

Each Economy knows whether it is supposed to handle workers or wares (this is set when the economy is created). Low-level stuff like Requests and Supplies (and also WareInstance) belong to only one economy that matches their WareWorker type.
Exception: Workers also have two economies, because they themselves are handled by a worker economy, but they can also create wares which have to be added to a ware economy of course.

When a ware/worker or Request/Supply is added/removed to/from an economy, it is ensured that it is registered only in the Economy of the appropriate WareWorker type. When flags get connected, only economies of the same type can merge.

Most of the time (and if you don´t build waterways, always), the Ware Economy and the Worker Economy of any PlayerImmovable or Worker will encompass exactly the same PlayerImmovables. Only when you connect two separate road networks with a waterway, there will be one Ware Economy (for the whole network) and two Worker Economies (one for each road system).

Waterways and employed ferries always belongs to a Ware Economy. Since workers cannot cross a waterway and ferries can´t walk over land, the Worker Economies of WWs and Ferries are not well-defined.
For unemployed ferries, both Economies are not well-defined, because their (pseudo-)"requests" are handled by Fleets, and a Fleet can serve completely unconnected waterways.

I used gdb to analyse the crashes. Eight crashes produced eight backtraces that point to eight different functions, usually in Waterway, Ferry or Fleet. They seem completely random, except that the crash always happens at some time while loading the waterwaydata_packet. I also added lots of log output after every step in the called functions, but it segfaulted at always different seemingly random points…

[lp:~widelands-dev/widelands/ferry]

8819. By Nordfriese on 2018-11-25

Merged trunk

8820. By Nordfriese on 2018-11-25

Fixed a typo

[Benedikt Straub (nordfriese)]

Just discovered a couple of failing asserts. Perhaps debugging these will give me a hint to the nature of the crash...

[lp:~widelands-dev/widelands/ferry]

8821. By Nordfriese on 2018-11-25

Fixed a failing assert and a segfault in end-of-game cleanup

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4291. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/459456832.
Appveyor build 4085. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4085.

[GunChleoc (gunchleoc)]

I can see the Ferry Yard in the encyclopedia but i'm not allowed to build one, so I have no idea how to help with debugging, because I can't test. Can you add instructions and/or a savegame to the bug?

[Benedikt Straub (nordfriese)]

You can only build ferry yards on maps with waterways enabled. You need to edit the map´s "port_spaces" packet and add the key "waterway_max_length" (with a value >= 2) to the global section.
(Saving a map in the editor from this branch adds the key, but it defaults to 0; there is no GUI to change it yet.)

[lp:~widelands-dev/widelands/ferry]

8822. By Nordfriese on 2018-11-26

One Economy doesn´t need two types of split checks...

8823. By Nordfriese on 2018-11-26

More debug output

8824. By Nordfriese on 2018-11-26

Merged trunk

8825. By Nordfriese on 2018-11-28

Fixing a bug in the pathfinding

8826. By Nordfriese on 2018-11-28

Fixing the testsuite

8827. By Nordfriese on 2018-11-28

Fixed compile error

8828. By Nordfriese on 2018-11-29

Fixed segfault when loading waterway

[Benedikt Straub (nordfriese)]

The crash is fixed now!
It took me several days to discover the reason. The change is one line...

[lp:~widelands-dev/widelands/ferry]

8829. By Nordfriese on 2018-11-29

Do not balance expedition economies

8830. By Nordfriese on 2018-11-29

Fixing the test suite…

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4309. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/461328014.
Appveyor build 4103. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4103.

[lp:~widelands-dev/widelands/ferry]

8831. By Nordfriese on 2018-11-29

Silence gcc complaint

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4311. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/461462714.
Appveyor build 4105. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4105.

[lp:~widelands-dev/widelands/ferry]

8832. By Nordfriese on 2018-11-30

Add map tag »ferries«

8833. By Nordfriese on 2018-12-02

Fixing a bug with roadbuilding overlays. Removed RoadInfo again.

8834. By Nordfriese on 2018-12-02

Compiler error

8835. By Nordfriese on 2018-12-02

Overlooked a corner case for roadbuilding

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4316. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/462452641.
Appveyor build 4111. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4111.

[lp:~widelands-dev/widelands/ferry]

8836. By Nordfriese on 2018-12-02

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4317. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/462525707.
Appveyor build 4112. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4112.

[lp:~widelands-dev/widelands/ferry]

8837. By Nordfriese on 2019-02-27

merged trunk

8838. By Nordfriese on 2019-03-08

Documentation fix

8839. By Nordfriese on 2019-03-08

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4569. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/503691873.
Appveyor build 4356. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4356.

[lp:~widelands-dev/widelands/ferry]

8840. By Nordfriese on 2019-03-12

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4592. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/505198456.
Appveyor build 4356. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4356.

[lp:~widelands-dev/widelands/ferry]

8841. By Nordfriese on 2019-03-19

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4616. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/508307520.
Appveyor build 4403. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4403.

[GunChleoc (gunchleoc)]

Barbarian Ferry Yard needs cloth to build, but there is no Weaving Mill, because that building needs seafaring.

It would be nice to have some indicators for the range when building a new waterway - I think we best wait with that until after we have the new work areas, because there could be some common code there. It would also be nice to have visual indicators for established waterways as an overlay.

Can you please remove the ferry animations except for the first frame each? They cause the diff to be truncated, because there are so many of them. Since they are just placeholders, 1 frame should be good enough for visual quality.

Code review of the bits that I can see is done.

[lp:~widelands-dev/widelands/ferry]

8842. By Nordfriese on 2019-03-23

Removed ferry animations

8843. By Nordfriese on 2019-03-23

Merged trunk

8844. By Nordfriese on 2019-03-23

Adressed first code review

8845. By Nordfriese on 2019-03-23

Changed buildcost for barbarian ferry yard

8846. By Nordfriese on 2019-03-23

Deleted some more images

8847. By Nordfriese on 2019-03-23

Stronger waterway textures

[Benedikt Straub (nordfriese)]

Removed the duplicate code and the superfluous animation frames, downscaled the remaining images.
The barbarian ferry yard now uses reed instead of cloth.
The textures for built waterways are now better visible.

I agree about the range indicators. That will be easy to implement, but I´ll wait with that until the workareas branch is merged.

[lp:~widelands-dev/widelands/ferry]

8848. By Nordfriese on 2019-03-23

Fixed codecheck

8849. By Nordfriese on 2019-03-23

Quickfix for startup error

8850. By Nordfriese on 2019-03-24

Merged trunk

8851. By GunChleoc on 2019-03-24

Code review.

[GunChleoc (gunchleoc)]

The overlays look fine now, thank you.

I have pushed a commit with a code review. Check the "NOCOM" comments.

Some notes that are not in the review commit:

- Ferry yard needs an economy check, just like the Ox Farm etc. Otherwise, it will just keep producing en masse.

- switch is faster than if/else, so use that for distinguishing ware/worker cases if it keeps the code still readable

- And ASan is not happy. I built a ferry yard, then a waterway. Connected a construction site with a separate flag to the other end of the waterway and waited a bit. Only then did I connect the worker economy -> boom

TI(2857): destination appears to have become split from current location -> fail
=================================================================
==32501==ERROR: AddressSanitizer: heap-use-after-free on address 0x61100075fb38 at pc 0x55b7a7a1a6e7 bp 0x7ffcd58678f0 sp 0x7ffcd58678e0
READ of size 8 at 0x61100075fb38 thread T0
    #0 0x55b7a7a1a6e6 in __gnu_cxx::__normal_iterator<Widelands::Ferry**, std::vector<Widelands::Ferry*, std::allocator<Widelands::Ferry*> > >::__normal_iterator(Widelands::Ferry** const&) /usr/include/c++/7/bits/stl_iterator.h:780
    #1 0x55b7a7a127c5 in std::vector<Widelands::Ferry*, std::allocator<Widelands::Ferry*> >::begin() /usr/include/c++/7/bits/stl_vector.h:564
    #2 0x55b7a7a079d2 in Widelands::Fleet::cancel_ferry_request(Widelands::Game&, Widelands::Waterway*) ../src/economy/fleet.cc:533
    #3 0x55b7a7a5b870 in Widelands::Waterway::cleanup(Widelands::EditorGameBase&) ../src/economy/waterway.cc:227
    #4 0x55b7a7084ea7 in Widelands::MapObject::remove(Widelands::EditorGameBase&) ../src/logic/map_objects/map_object.cc:434
    #5 0x55b7a7081626 in Widelands::ObjectManager::cleanup(Widelands::EditorGameBase&) ../src/logic/map_objects/map_object.cc:162
    #6 0x55b7a6ccb2d7 in Widelands::EditorGameBase::cleanup_objects() ../src/logic/editor_game_base.h:170
    #7 0x55b7a6f6dd40 in Widelands::Game::run(UI::ProgressWindow*, Widelands::Game::StartGameType, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) ../src/logic/game.cc:554
    #8 0x55b7a6c6cef0 in WLApplication::new_game() ../src/wlapplication.cc:1320
    #9 0x55b7a6c6b29c in WLApplication::mainmenu_singleplayer() ../src/wlapplication.cc:1177
    #10 0x55b7a6c6a3d3 in WLApplication::mainmenu() ../src/wlapplication.cc:1082
    #11 0x55b7a6c61699 in WLApplication::run() ../src/wlapplication.cc:454
    #12 0x55b7a6c5dbee in main ../src/main.cc:44
    #13 0x7f0401bfbb96 in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x21b96)
    #14 0x55b7a6c5da69 in _start (/media/cuideigin/Linux/sources/widelands/ferry/widelands+0xd94a69)

[lp:~widelands-dev/widelands/ferry]

8852. By Nordfriese on 2019-03-24

Started to adress code review

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4638. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/510643337.
Appveyor build 4425. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4425.

[lp:~widelands-dev/widelands/ferry]

8853. By Nordfriese on 2019-03-25

Fixed request creation for simultanously created waterways

[Benedikt Straub (nordfriese)]

Implemented or replied to your diff comments in revision 8852.
I can´t reproduce the ASan complaint you reported anymore, but I fixed several others that surfaced now, except for one on game-end that will follow soon.

Regarding the ferry target quantity: IMHO the ferry yards work like shipyards, which also produce until the player stops them manually. A target quantity would be especially difficult if the ferry yard is close two several oceans.

Some of the waterway code which you annotated is copied 1:1 from road code. Should I therefore leave it as it is, or change both the new waterway code and the original road code?

And saveloading – I don´t think it is really possible to preserve compatibility here, see my comment in MapFlagPacket…

[GunChleoc (gunchleoc)]

I did not think of the several oceans problem.

I think it would be good if you could fix both the new and the original road code. This branch is huge anyway, so I don't mind having more changes in it.

I can look into the saveloading if you want. Just leave the annotations in until everything else has been finalized and I'll have a look if I can make it work.

[lp:~widelands-dev/widelands/ferry]

8854. By Nordfriese on 2019-03-25

Implemented remaining diff comments and fixed a crash

8855. By Nordfriese on 2019-03-25

Merged trunk

8856. By Nordfriese on 2019-03-26

Make travis happy

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4653. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/511594641.
Appveyor build 4440. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4440.

[lp:~widelands-dev/widelands/ferry]

8857. By Nordfriese on 2019-04-04

Merged trunk

8858. By Nordfriese on 2019-04-04

Fixed loadgame bug

8859. By Nordfriese on 2019-04-07

Improved ferry movement rules and cleaned up economy code

8860. By Nordfriese on 2019-04-07

Fixed bug in ferry assignment on waterway split

8861. By Nordfriese on 2019-04-07

Trigger economy balance when corresponding economy receives wares/workers

[Benedikt Straub (nordfriese)]

Uploaded the changes discussed in the bug report.
Ferries can now travel along any edge where both adjacent triangles are navigable terrain.
I cleaned up the economy code, removed lots of duplicate functionality for wares and workers, and fixed a bug in worker creation.

If you have two road networks connected only by waterways, and economy A requests a fisherman but all fishing nets are in economy B, nothing will happen. This is intentional because it mirrors the behaviour when a needed worker requires two tools which are in different warehouses. Newly produced fishing nets will be distributed to warehouses independent of such requests. Micromanaging is needed to get a fishing net from B to A, then it´ll be used to create a fisher as soon as it arrives there.

[lp:~widelands-dev/widelands/ferry]

8862. By Nordfriese on 2019-04-07

Undid accidental change

8863. By Nordfriese on 2019-04-07

Renamed duplicate StepEvalFindFleet

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4682. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/516878831.
Appveyor build 4468. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4468.

[Benedikt Straub (nordfriese)]

Can´t reply this in the bug report for some reason…:

Let W and E be the end flags of the waterway that has a ferry.
– Destroy both waterways.
– Build a waterway from W to a new flag F on the tiny island south of the warehouse. It´ll get the ferry that used to service the waterway from W to E.
– Build a waterway from F to E. It´ll get a new ferry.
– Now rebuild the other waterway – and it´ll also get a new ferry.

I´m no closer to finding the source of the problem yet though. I suspect the underlying reason may be related to the pathfinder…

[lp:~widelands-dev/widelands/ferry]

8864. By Nordfriese on 2019-04-08

Small cleanup and better debug info

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4696. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/517213969.
Appveyor build 4482. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4482.

[lp:~widelands-dev/widelands/ferry]

8865. By Nordfriese on 2019-04-09

Fixing the test suite

8866. By Nordfriese on 2019-04-09

Fixed duplication of fleets during loading

8867. By Nordfriese on 2019-04-13

fixed bug 1824586

[kaputtnik (franku)]

This is really a nice feature. Played two games (Map Twinkling Waves and The Nile) a lot but found no strange issues anymore. There is one small thing:

If you have the option 'Start building road after placing a flag' turned on, and place a flag at a coast, roadbuilding mode is immediately enabled. So if you wanted to start building a waterway, you have to make few more clicks to get into 'build waterway' mode (cancel roadbuilding -> click on flag -> click on build waterway).

No idea how to solve this in an easy manner. Just show the flag action window is a flag is placed where also a waterway can be build, regardless of the option 'Start building road after placing a flag'?

review: Approve (testing)

[lp:~widelands-dev/widelands/ferry]

8868. By Nordfriese on 2019-04-14

merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4720. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/520014396.
Appveyor build 4506. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4506.

[GunChleoc (gunchleoc)]

Or maybe the 2 functions could be the same thing, with Widelands detecting automatically whether it will become a road or a waterway?

[Benedikt Straub (nordfriese)]

Autodetection is not possible because there are paths where you can build both.
Having one mode for both where you get to choose on finish whether you want a road or waterway is possible but difficult to implement because of different placement rules.
+1 for showing the flagaction window instead of entering roadbuilding mode after placing a flag where both can be built if the option is enabled. Will implement this next week.

[GunChleoc (gunchleoc)]

Sounds like a plan :)

[lp:~widelands-dev/widelands/ferry]

8869. By Nordfriese on 2019-04-19

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4742. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/522276339.
Appveyor build 4527. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4527.

[lp:~widelands-dev/widelands/ferry]

8870. By Nordfriese on 2019-04-20

Fixing the testsuite

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4752. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/522535128.
Appveyor build 4537. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4537.

[lp:~widelands-dev/widelands/ferry]

8871. By Nordfriese on 2019-04-22

Open fieldaction instead of starting roadbuilding if waterway can be built

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4759. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/523086402.
Appveyor build 4543. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4543.

[Benedikt Straub (nordfriese)]

New behaviour is implemented and tested.
@GunChleoc Could you please re-review the latest changes in economy.cc, especially create_requested_worker(), and CheckStepFerry?

[lp:~widelands-dev/widelands/ferry]

8872. By Nordfriese on 2019-04-29

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4836. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/526029169.
Appveyor build 4617. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4617.

[Klaus Halfmann (klaus-halfmann)]

OK this is a little Monster and in depends on some workarea change?
Please direkt me to that branch or was this mereged by now?

Im checking this out now. and (try to) do some code review.

[Klaus Halfmann (klaus-halfmann)]

CLang gives me some comppiler warnings:

src/economy/economy.cc:854:45: warning: loop variable 'r' has type
    'const std::pair<Request *, uint32_t> &'
    (aka 'const pair<Widelands::Request *, unsigned int> &')
but is initialized with type 'std::__1::__map_iterator<std::__1::__tree_iterator<std::__1::__value_type<Widelands::Request *, unsigned int>, std::__1::__tree_node<std::__1::__value_type<Widelands::Request *, unsigned int>, void *> *, long> >::value_type'
(aka 'pair<Widelands::Request *const, unsigned int>')
resulting in a copy [-Wrange-loop-analysis]
          for (const std::pair<Request*, uint32_t>& r : open_requests) {
                                                          ^
../src/economy/economy.cc:854:8: note: use non-reference type 'std::pair<Request *, uint32_t>' (aka 'pair<Widelands::Request *, unsigned int>') to keep the copy or type 'const std::__1::__map_iterator<std::__1::__tree_iterator<std::__1::__value_type<Widelands::Request *, unsigned int>, std::__1::__tree_node<std::__1::__value_type<Widelands::Request *, unsigned int>, void *> *, long> >::value_type &'
(aka 'const pair<Widelands::Request *const, unsigned int> &') to prevent copying
                for (const std::pair<Request*, uint32_t>& r : open_requests)

I think you need more const inside the declaration of r?

/src/wui/economy_options_window.cc:20:
../src/wui/economy_options_window.h:56:25: warning: private field 'type_' is not used
[-Wunused-private-field] Widelands::WareWorker type_;

You should see them in the automated builds, too

[lp:~widelands-dev/widelands/ferry]

8873. By Nordfriese on 2019-05-01

Removed some unused variables

[Benedikt Straub (nordfriese)]

The automated builds only warn about some unused variables which I now removed. I don´t see the warning in economy.cc either there or when compiling myself…

[Klaus Halfmann (klaus-halfmann)]

Plaaying Calvission for a while now:

In case a location is reachabel by road and by waterway, but there is no ferry,
wares may get stuck waiting at the flag for the waterway, mmh. But well, works as designed.

[Klaus Halfmann (klaus-halfmann)]

The ccode is basiccally OK, I did not read all of it, sorry.

I noticed some odd Behavior that carrriees tried to use a wterway to reach theire destination,
but got stuck on the waterway. This way neither wares no carriers where transported in the end.

I think we cann still merge this one (nice work Benedikt!) and create Bugtickets later.

I got a saveagme and some movie showing the Problem.

review: Approve (compile, review, testplay)

[Benedikt Straub (nordfriese)]

> I noticed some odd Behavior that carriers tried to use a waterway to reach their destination,
but got stuck on the waterway. This way neither wares no carriers where transported in the end.

That sounds like a fairly serious bug. Could you upload the savegame to the bugreport linked to this branch please?

[lp:~widelands-dev/widelands/ferry]

8874. By Nordfriese on 2019-05-01

Fixed workers walking on waterways

[Benedikt Straub (nordfriese)]

Thanks for the video, bug should be fixed. I had overlooked the possibility that two flags can be connected by a road and a waterway.

[Klaus Halfmann (klaus-halfmann)]

I now get a compile Error at:

../src/economy/transfer.cc:166:72: error: non-pointer operand type 'Widelands::MapObjectType' incompatible with nullptr
                if (!curflag.get_roadbase(nextflag, request_->get_type() == wwWORKER ? MapObjectType::ROAD : nullptr)) {
                                                                                     ^ ~~~~~~~~~~~~~~~~~~~
../src/economy/transfer.cc:184:78: error: non-pointer operand type 'Widelands::MapObjectType' incompatible with nullptr
                        if (!nextflag.get_roadbase(nextnextflag, request_->get_type() == wwWORKER ? MapObjectType::ROAD : nullptr)) {

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4849. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/526968452.
Appveyor build 4630. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4630.

[lp:~widelands-dev/widelands/ferry]

8875. By Nordfriese on 2019-05-02

Compile error

8876. By Nordfriese on 2019-05-02

Compile error

[Klaus Halfmann (klaus-halfmann)]

Loading may savegame I now get:

Assertion failed: (wh), function get_next_step, file ../src/economy/transfer.cc, line 188.

Do I have to restart that Map now?

[Benedikt Straub (nordfriese)]

The worker already is in an impossible situation, so you need to load an older savegame that doesn´t contain the bug yet.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4855. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/527387898.
Appveyor build 4636. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4636.

[GunChleoc (gunchleoc)]

Fieldaction code looks OK.

How about passing wwWORKER/wwWARE to get_roadbase and checking for that there? Then you could just call get_roadbase as in your original attempt in r8874.

[lp:~widelands-dev/widelands/ferry]

8877. By Nordfriese on 2019-05-03

Errors in some cases

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4865. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/527627946.
Appveyor build 4646. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4646.

[Klaus Halfmann (klaus-halfmann)]

Played Calvission a #1 with a Barbarian at #2 , Imperial at #3 and Frisisan at #4

Got an assert aftree trying to build two woodcutters:

Forcing flag at (70, 164)
Message: adding warehouse for player 1 at (69, 163)
Forcing flag at (73, 163)
Forcing flag at (66, 165)
Forcing flag at (65, 169)
Forcing flag at (157, 27)
Message: adding warehouse for player 2 at (157, 26)
Forcing flag at (168, 141)
Message: adding warehouse for player 3 at (168, 140)
Forcing flag at (56, 45)
Message: adding warehouse for player 4 at (56, 44)
InternetGaming: Received a client list update with 18 items.
InternetGaming: Received a game list update with 1 items.
Assertion failed: (wh), function get_next_step, file ../src/economy/transfer.cc, line 186.
Abort trap: 6

....

4 widelands 0x00000001049b4f48 Widelands::Transfer::get_next_step(Widelands::PlayerImmovable*, bool&) + 3320 (transfer.cc:186)
5 widelands 0x00000001049bc711 Widelands::WareInstance::update(Widelands::Game&) + 1841 (ware_instance.cc:330)
6 widelands 0x00000001048f73f4 Widelands::Flag::add_ware(Widelands::EditorGameBase&, Widelands::WareInstance&) + 1524 (flag.cc:462)
7 widelands 0x0000000102f0cbfd Widelands::Worker::dropoff_update(Widelands::Game&, Widelands::Bob::State&) + 2381 (worker.cc:2123)
8 widelands 0x0000000102abc710 Widelands::Bob::do_act(Widelands::Game&) + 704 (bob.cc:195)

Do you need a savegame?

review: Needs Fixing

[Benedikt Straub (nordfriese)]

This one function with this one assert yet again... yes, please provide a savegame

[Klaus Halfmann (klaus-halfmann)]

Here is the SaveGame: https://www.magentacloud.de/share/tu4ayusx.k

Ferries2.wgf (Multiplayer Game)

[lp:~widelands-dev/widelands/ferry]

8878. By Nordfriese on 2019-05-16

Some transfer confusion

[Benedikt Straub (nordfriese)]

Thanks for the savegame :)
There were three different bugs overlayed here. All of them are fixed now.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5000. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/533393374.
Appveyor build 4781. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4781.

[Klaus Halfmann (klaus-halfmann)]

I played Calvission again fo about 4 hours gametime.
This was fine for the most parts, I found some of
the expected Issued: e.g. Buildings not attachted to roads dont get workers.
I found one Issue where ferries are not built.
But now I hit an seertion that should be reproducible, please check:
   https://www.magentacloud.de/share/tu4ayusx.k
   Unferry.wgf

If we really want this feature, we should get it in _now_ and fix such bugs
with seperate bugs. Otherwsie this Brnach will diverge more and more.

Lets get this decided soon.

review: Needs Fixing (testplay)

[Benedikt Straub (nordfriese)]

That assert is in trunk – it´s our famous Fleet::is_path_favourable problem...

A reason this is not being merged yet is, GunChleoc wanted to check if we can merge this without breaking savegame compatibility (I think it´s not possible).
I agree that apart from that this branch should be merged soon, and any not-yet-found bugs reported then on trunk.

Will merge trunk soon to fix the diverging

[lp:~widelands-dev/widelands/ferry]

8879. By Nordfriese on 2019-05-23

Merged trunk

[GunChleoc (gunchleoc)]

We are merging a lot of branches today, so maybe do the merging tomorrow and ping me so I'll take over and have a look?

[lp:~widelands-dev/widelands/ferry]

8880. By Nordfriese on 2019-05-26

Merged trunk

8881. By Nordfriese on 2019-05-28

Corrected thatch_reed → reed

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5075. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/538201201.
Appveyor build 4855. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4855.

[lp:~widelands-dev/widelands/ferry]

8882. By Nordfriese on 2019-05-28

Codecheck complains

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5077. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/538358799.
Appveyor build 4857. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4857.

[lp:~widelands-dev/widelands/ferry]

8883. By Nordfriese on 2019-05-31

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5106. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/539673312.
Appveyor build 4887. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4887.

[Klaus Halfmann (klaus-halfmann)]

Now, how do we get progress here?
Will try to play this again on Cavisson

[GunChleoc (gunchleoc)]

I'll need to set aside a weekend for this, so it can take some time until I get around to it.

[TiborB (tiborb95)]

I added some question in the diff

[TiborB (tiborb95)]

AI uses send_player_build_road() to build roads, I tried to find something like send_player_build_waterway() but nothing like this exists, correct?

Also, does particular fields have some MOVECAPS, like for roads:
f->nodecaps() & MOVECAPS_WALK

[Benedikt Straub (nordfriese)]

There is a method Game::send_player_build_waterway(int32_t, Path&) that works just like for roads.

Waterways have a special placement rule: They can go along any edge which is located between two water triangles. They can therefore reach all fields with MOVECAPS_SWIM plus some other fields. Always use a CheckStepFerry when checking ferry or waterway paths.

[TiborB (tiborb95)]

I cannot see that method in the diff, so it is probably something older, but fine...

AI will need to use CheckStepFerry or whatever to get list of all fields from which regular road can lead, I will investigate it...

Please look at this code: https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/src/ai/defaultai.cc#L3849

It would be convenient if equivalent of this was possible for waterroads, what do you think?

I still would like to have MOVECAPS_FERRY capability, so that AI would take random flag, and if it has this capability it would run map.find_reachable_fields() from this point to collect possible destinations for waterroads...

These are just few thougts for discussion...

[TiborB (tiborb95)]

Can ferries be transferred by ships? If not in some maps more then 1 ferryyard can be needed.

I had an impression that waterroads will work the same as normal roads, but now I see that quite a lot of management is needed for them...

[Benedikt Straub (nordfriese)]

Launchpad limits the diff preview to the first 5000 lines. The other >9000 lines remain hidden…

A MOVECAPS_FERRY is not possible. For MOVECAPS_WALK and MOVECAPS_SWIM, you always know that if two adjacent nodes both have this movecap, a bob that also has that movecap can pass directly from one node to the other. For ferries, it is possible that a waterway may pass both of two adjacent nodes, but it might not be allowed to go directly from the one to the other. They might even be in different oceans. Imagine e.g. situation with two lakes separated by a 1-tile-wide strip of land. If you want to check whether a spot is suited for waterways at all, always use CheckStepFerry::reachable_dest.

The equivalent of the function you linked is easily possible. Instead of plain CheckStepRoad, use this:
Widelands::CheckStepAnd cstep;
cstep.add(Widelands::CheckStepFerry(egbase()));
cstep.add(Widelands::CheckStepRoad(player, Widelands::MOVECAPS_SWIM | Widelands::MOVECAPS_WALK));

Also note that in lines like
if (dynamic_cast<const Road*>(map[reachable_coords].get_immovable())) {
Road should be replaces by RoadBase (the superclass of Road and Waterway).
Also keep in mind that waterways can transport only wares, no workers. The AI should build one between two flags only if they belong to the same worker economy, or if their respective worker economies both are "functional" (i.e. have a warehouse). Just so it doesn´t build a constructionsite on an unreachable shore – a road is still needed so a builder can come.

You need to build one ferry yard per Ferry Ocean, just as you need one shipyard per Ship Ocean. Ferries can use every path that is also suited for ships plus narrow channels where ships can´t pass, so a ferry ocean tends to encompass more places than a ship ocean. Ferries are implemented similar to ships, they´ll swim around idly until assigned to a waterway, then they swim to it autonomously.

And it´s not that much additional management that´s needed (less than e.g. for ports and ships), it only seems so because the concept is so different ;)

[TiborB (tiborb95)]

For ships the single ship is enough to attend all ports, with ferries it is the opposite, you need the same number of ferries as waterroads.

It would be convenient if AI can built "virtual roads" - from flag to flag, but if crossing the water this virtual road would break down into 3 roads - 2x actual roads and one waterroad. But this is more coding and bigger complexity....

[TiborB (tiborb95)]

Is there any function that returns number of ferries for a player or Fleet? Also I presume there is a way how to query the waterroad if it has a ferry...

[Benedikt Straub (nordfriese)]

To get all ferries in a fleet:
Waterway::get_fleet() or Ferry::get_fleet()
FerryFleet::count_ferries()
Counting stuff per player should not be needed, count per FerryFleet instead.
I´ll add some functions to query a waterway whether it has a ferry, and to query the fleet how many waterways are unemployed.
Btw, the FerryFleet does not keep a list of all waterways that belong to it. They are remembered only while they need a ferry; when they get one, the ferryfleet forgets that waterway.

[lp:~widelands-dev/widelands/ferry]

8884. By Nordfriese on 2019-06-11

Add some functions to query waterways and ferryfleets

[TiborB (tiborb95)]

And is there any link between ferryyard and a fleet?
Can I query the waterroad if if has a ferryyard to provide it with ferry?

[Benedikt Straub (nordfriese)]

No, because it can be close to several unconnected oceans, just like a shipyard.
You could keep a list of all ferry-reachable fields within the workarea of a ferry yard (*), and then check for a given waterway whether a CheckStepFerry-approved path exists from any node on the waterway to any of these fields.
(* this is actually an incorrect approximation in some corner cases but that shouldn´t matter normally)

[TiborB (tiborb95)]

AI currently is not able to cope with multiple oceans in the case of ships, just to remind this fact...

[TiborB (tiborb95)]

Another question is how can AI know if ferries are necessary. In case of ships - it builds shipyard and ports always - if there are portspaces. With ferries it can check if map has a water - but this is not sufficient check. Most maps have water, but will not need ferries at all.

So I see a lot of issues with implementing it in AI.

[TiborB (tiborb95)]

Also - another idea: It would be nice if the ferries were per economy and AI would know in advance if the waterroad will be supplied by a ferry immediately = if there is an available ferry. Without painfully calculating whatever.

The logic would be - AI is considering connecting flags A and B - no matter where they are.
If ferries are available - it can use pathfinding including waterroads, otherwise it falls back to current one.

But even this logic is stupid, because there will be non-critical sections where waterroads will be luxury and waste of precious material - but AI will not be able to distinguish such spots...

[Benedikt Straub (nordfriese)]

Whether waterways/ferries are enabled can be checked as
  map.get_waterway_max_length() >= 2
Typically, they are enabled only on maps where they make sense. Waterways have a maximum length that is map-dependent.
If two flags can be connected both by a new road and by a new waterway, the AI should build a waterway only if a road connection is much much longer. Building waterways if a road is also possible nearby makes sense in a handful of corner cases but not in the majority of cases.
Also, if there are two flags with the same ware economy but different worker economies, the AI should try very hard to connect them with a normal road if somehow possible.

> It would be nice if the ferries were per economy

Completely impossible, sorry. A ferry can be sent to any waterway that is in the same FerryFleet as itself – and there can be multiple economies adjacent to the same ocean (not to mention that each economy can be adjacent to multiple oceans). Per-economy distribution (or bookkeeping) of ferries is just not possible.

> and AI would know in advance if the waterroad will be supplied by a ferry immediately

You could either
– Build the waterway; some 10 seconds later query its fleet whether a ferry is coming, and if not, destroy the new waterway and remember not to retry for some time.
– Or if you really want to check before you build a waterway: Check out FerryFleet::find_other_fleet, and copy the pathfinding code from there to obtain the ferryfleet that belongs to the ocean you are interested in; then you can query that fleet for unoccupied ferries.

[TiborB (tiborb95)]

I am thinking a lot about this feature, but for AI it is relay difficult.

On most maps it will not be applicable and AI should be very cautious to use it at all.
It has complex logic for implementation.

So the conclusion is that it is not worth the effort to implement in AI.

What could be considered to make it more AI-friendly:

- to allow transfer of workers on ferries
- not to produce more ferries than needed
- allow transport of ferries over roads, or at least extend work radius of ferryyard significantly
- introduce WATERROAD_CAPS, and allow a waterroad between two such fields, or WALK_MOVECAPS and WATERROAD_CAPS. These WATERROAD_CAPS can be calculated and/or set by map creator (to restrict fields where waterroad can be built)
- not to route the wares over unattended waterroads (to avoid transportation blockages)

But I know that all of that violates your intentions for this branch, but an improvement in one of few of them would make AI implementation easier.

I will still keep thinking about this, because idea is interesting...

[lp:~widelands-dev/widelands/ferry]

8885. By Nordfriese on 2019-06-21

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5208. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/548539708.
Appveyor build 4987. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-4987.

[lp:~widelands-dev/widelands/ferry]

8886. By Nordfriese on 2019-06-28

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5251. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/551745114.
Appveyor build 5030. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5030.

[lp:~widelands-dev/widelands/ferry]

8887. By Nordfriese on 2019-06-28

Merge conflicts

8888. By Nordfriese on 2019-06-28

Merge conflicts

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5254. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/551923331.
Appveyor build 5033. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5033.

[lp:~widelands-dev/widelands/ferry]

8889. By Nordfriese on 2019-08-09

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5300. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/569856062.
Appveyor build 5073. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5073.

[Benedikt Straub (nordfriese)]

What´s the status here?

[Klaus Halfmann (klaus-halfmann)]

Ohh, what a history, but I must confess , I lost track.

Can we merge this now (as only map with a falg are affcetd anyway?)

[TiborB (tiborb95)]

The status regarding AI is that it is not supported and probably not be anytime soon if ever.

[kaputtnik (franku)]

Will it be problem if the AI can't handle ferrys?

Need this branch more testing?

[Benedikt Straub (nordfriese)]

The AI will simply ignore the new feature, it will continue playing exactly as before. There are some AI code parts that should be looked into eventually (I added TODOs there), but they should most likely have no effect whatever as long as it doesn´t build a waterway.

This branch was tested quite extensively, IMHO it would be better to merge this now and report any bugs that might still be contained against trunk. (Only downside is that this branch breaks savegame compatibility.)

[TiborB (tiborb95)]

I am also for merging into trunk to get better testing.
Personally I dont like splitting the economy into two parallel economies, but if there is a consensus about this...

[kaputtnik (franku)]

I get some text conflicts when merging trunk. Benedikt, can look into this and make the call for merging?

[Benedikt Straub (nordfriese)]

I just had an idea how I might just perhaps be able to write savegame compatibility, give me a few days to try it out...

[lp:~widelands-dev/widelands/ferry]

8890. By GunChleoc on 2019-08-29

Code review.

[GunChleoc (gunchleoc)]

I have pushed a new commit with a code style review. I'll have to return later to go through the discussion.

[lp:~widelands-dev/widelands/ferry]

8891. By Nordfriese on 2019-08-29

Addressed code review

8892. By Nordfriese on 2019-08-29

Merged trunk

8893. By GunChleoc on 2019-08-29

More code review & code style fixes.

8894. By GunChleoc on 2019-08-29

Remove obsolete NOCOM comments.

[GunChleoc (gunchleoc)]

I have pushed another commit with code review. I'm done with this for now. I also did a grep on data and test for lua changes, and it looks like we didn't miss anything.

The following 2 bits in the code are a bit complicated and could do with testing:

* worker creation over multiple economies
* Barracks
* ferry paths, especially around coasts

For ferry oceans separated very narrowly, how about allowing portage there? This might simplify the CheckStepFerry.
https://en.wikipedia.org/wiki/Portage
Just an idea, don't feel obligagted to implement this.

The following new Lua functions don't have tests yet (we can implement those in a follow-up branch though):
* get_waterway_max_length
* set_waterway_max_length
* get_ferry

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5359. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/578495337.
Appveyor build 5129. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5129.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5359. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/578495337.
Appveyor build 5129. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5129.

[lp:~widelands-dev/widelands/ferry]

8895. By Nordfriese on 2019-08-31

Savegame compatibility

[Benedikt Straub (nordfriese)]

Savegame compatibility hack is up :)
Thanks for the review and codestyle.

[lp:~widelands-dev/widelands/ferry]

8896. By GunChleoc on 2019-08-31

Code review

[GunChleoc (gunchleoc)]

I have pushed a commit with a comment.

[lp:~widelands-dev/widelands/ferry]

8897. By Nordfriese on 2019-09-02

Addressed code review

[Benedikt Straub (nordfriese)]

Implemented your suggestion for Ferry and clarified the comment in EconomyDataPacket.
Economy::create_requested_workers is called directly from balance() for every economy, so we can just ignore it for ware ecos.

[lp:~widelands-dev/widelands/ferry]

8898. By GunChleoc on 2019-09-03

Fix clang compiler warnings.

[GunChleoc (gunchleoc)]

I have pushed a commit that shuts up clang compiler warnings, so you need to pull before continuing to work.

I think that Checkstep should ignore waterways that don't have ferries - I have attached a savegame to illustrate the issue.

https://bugs.launchpad.net/widelands/+bug/1584203/comments/47

[GunChleoc (gunchleoc)]

And another thing that can be improved in checkstep, but will probably be non-trivial:

https://bugs.launchpad.net/widelands/+bug/1584203/comments/48

I'd be OK with doing this in a follow-up branch.

[GunChleoc (gunchleoc)]

When I have 2 economies only liked by a waterway, the metal workshop won't produce the necessary wares - I expect the request is generated by the wrong warehouse.

Savegame: https://bugs.launchpad.net/widelands/+bug/1584203/comments/50

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5382. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/580127580.
Appveyor build 5152. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5152.

[kaputtnik (franku)]

Looks like the metal workshop 'hangs', it always shows 'The Economy doesn't need the ware Bradpaddle', although the game run more than 5 Minutes.

[Benedikt Straub (nordfriese)]

No, the workshop just skips everything because no tools are needed. I´m trying to implement that the tools will be transported from one warehouse to another one so the missing workers can be created in the correct economy…

[GunChleoc (gunchleoc)]

Hm, at this point I'm wondering whether it might be easier to allow ferries to carry workers and have them waiting for it at the nearest flag. Then we would not need the separate economies.

[lp:~widelands-dev/widelands/ferry]

8899. By Nordfriese on 2019-09-07

Fix worker creation across economies

[Benedikt Straub (nordfriese)]

Pushed a fix for worker creation. As soon as you now trigger an economy update (e.g. by building a flag), the necessary tools are transported from the HQ to the warehouse and there turned into workers.

[lp:~widelands-dev/widelands/ferry]

8900. By Nordfriese on 2019-09-07

Merged trunk

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5408. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/582051006.
Appveyor build 5178. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5178.

[lp:~widelands-dev/widelands/ferry]

8901. By Nordfriese on 2019-09-08

Fixed merge conflicts

8902. By Nordfriese on 2019-09-08

Compile error

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 5418. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/582382256.
Appveyor build 5188. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_ferry-5188.

Unmerged revisions

8902. By Nordfriese on 2019-09-08

Compile error

8901. By Nordfriese on 2019-09-08

Fixed merge conflicts

8900. By Nordfriese on 2019-09-07

Merged trunk

8899. By Nordfriese on 2019-09-07

Fix worker creation across economies

8898. By GunChleoc on 2019-09-03

Fix clang compiler warnings.

8897. By Nordfriese on 2019-09-02

Addressed code review

8896. By GunChleoc on 2019-08-31

Code review

8895. By Nordfriese on 2019-08-31

Savegame compatibility

8894. By GunChleoc on 2019-08-29

Remove obsolete NOCOM comments.

8893. By GunChleoc on 2019-08-29

More code review & code style fixes.

=== modified file 'data/campaigns/emp03.wmf/scripting/mission_thread.lua'
--- data/campaigns/emp03.wmf/scripting/mission_thread.lua	2019-07-21 21:40:24 +0000
+++ data/campaigns/emp03.wmf/scripting/mission_thread.lua	2019-09-08 17:15:28 +0000
@@ -97,7 +97,7 @@
    local objective = add_campaign_objective(obj_lower_marble_column_demand)
 
    --- Check the headquarters' flag's economy
-   while sf.brn.immovable.economy:ware_target_quantity("marble_column") ~= 4 do
+   while sf.brn.immovable.ware_economy:target_quantity("marble_column") ~= 4 do
       sleep(2434)
    end
    sleep(4000)

=== modified file 'data/campaigns/emp04.wmf/scripting/starting_conditions.lua'
--- data/campaigns/emp04.wmf/scripting/starting_conditions.lua	2019-05-19 11:25:28 +0000
+++ data/campaigns/emp04.wmf/scripting/starting_conditions.lua	2019-09-08 17:15:28 +0000
@@ -20,7 +20,7 @@
    r4 = p3:place_road(field_mill.immovable.flag, "br", "r", true)
 
 p3:forbid_buildings("all")
-field_warehouse.brn.immovable.economy:set_ware_target_quantity("beer", 180)
+field_warehouse.brn.immovable.ware_economy:set_target_quantity("beer", 180)
 
 -- =======================================================================
 --                                 Player 1

=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2019-06-01 16:05:26 +0000
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2019-09-08 17:15:28 +0000
@@ -7,7 +7,7 @@
 local function wait_for_quarry_road_connection(field, cs, objective)
    -- Wait till the construction site is connected to the headquarters
    sleep(10 * wl.Game().desired_speed)
-   while not field.immovable or field.brn.immovable.debug_economy ~= sf.brn.immovable.debug_economy do
+   while not field.immovable or field.brn.immovable.debug_worker_economy ~= sf.brn.immovable.debug_worker_economy do
       if not field.immovable then
          campaign_message_box(quarry_illegally_destroyed)
          scroll_to_field(field)
@@ -308,7 +308,6 @@
 
    -- Wait for the constructionsite to be placed
    while not cs do sleep(200) end
-
    wait_for_quarry_road_connection(second_quarry_field, cs, o)
 end
 

=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua	2019-06-01 16:05:26 +0000
+++ data/campaigns/tutorial04_economy.wmf/scripting/mission_thread.lua	2019-09-08 17:15:28 +0000
@@ -143,7 +143,7 @@
    campaign_message_box(economy_settings2)
    o = campaign_message_with_objective(economy_settings3, obj_produce_marble_columns)
 
-   while sf.brn.immovable.economy:ware_target_quantity("marble_column") ~= 20 do
+   while sf.brn.immovable.ware_economy:target_quantity("marble_column") ~= 20 do
       sleep(200)
    end
    -- wait that the player has really changed the target quantity

=== added file 'data/images/ui_basic/fsel_waterwaybuilding.png'
Binary files data/images/ui_basic/fsel_waterwaybuilding.png	1970-01-01 00:00:00 +0000 and data/images/ui_basic/fsel_waterwaybuilding.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/fieldaction/menu_build_water.png'
Binary files data/images/wui/fieldaction/menu_build_water.png	1970-01-01 00:00:00 +0000 and data/images/wui/fieldaction/menu_build_water.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/fieldaction/menu_rem_water.png'
Binary files data/images/wui/fieldaction/menu_rem_water.png	1970-01-01 00:00:00 +0000 and data/images/wui/fieldaction/menu_rem_water.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/fieldaction/menu_tab_buildwaterway.png'
Binary files data/images/wui/fieldaction/menu_tab_buildwaterway.png	1970-01-01 00:00:00 +0000 and data/images/wui/fieldaction/menu_tab_buildwaterway.png	2019-09-08 17:15:28 +0000 differ
=== renamed file 'data/images/wui/overlays/roadb_green.png' => 'data/images/wui/overlays/road_building_green.png'
=== renamed file 'data/images/wui/overlays/roadb_red.png' => 'data/images/wui/overlays/road_building_red.png'
=== renamed file 'data/images/wui/overlays/roadb_reddown.png' => 'data/images/wui/overlays/road_building_reddown.png'
=== renamed file 'data/images/wui/overlays/roadb_yellow.png' => 'data/images/wui/overlays/road_building_yellow.png'
=== renamed file 'data/images/wui/overlays/roadb_yellowdown.png' => 'data/images/wui/overlays/road_building_yellowdown.png'
=== added file 'data/images/wui/overlays/waterway_building_down.png'
Binary files data/images/wui/overlays/waterway_building_down.png	1970-01-01 00:00:00 +0000 and data/images/wui/overlays/waterway_building_down.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/overlays/waterway_building_even.png'
Binary files data/images/wui/overlays/waterway_building_even.png	1970-01-01 00:00:00 +0000 and data/images/wui/overlays/waterway_building_even.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/overlays/waterway_building_steepdown.png'
Binary files data/images/wui/overlays/waterway_building_steepdown.png	1970-01-01 00:00:00 +0000 and data/images/wui/overlays/waterway_building_steepdown.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/overlays/waterway_building_steepup.png'
Binary files data/images/wui/overlays/waterway_building_steepup.png	1970-01-01 00:00:00 +0000 and data/images/wui/overlays/waterway_building_steepup.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/images/wui/overlays/waterway_building_up.png'
Binary files data/images/wui/overlays/waterway_building_up.png	1970-01-01 00:00:00 +0000 and data/images/wui/overlays/waterway_building_up.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/maps/Archipelago_Sea.wmf/elemental'
--- data/maps/Archipelago_Sea.wmf/elemental	2016-04-01 09:21:48 +0000
+++ data/maps/Archipelago_Sea.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="King of nowhere"
 descr=_"Between Sweden and Finland lies the archipelago sea. This place of incredible beauty is not land, and it is not sea, but it is both. Within a few hundred kilometers, there are no less than 50,000 islands and islets, most no more than a few acres across. The climate is quite mild for its latitude; farming thrives, berries are abundant, and fish plentiful. The small human population of this place never knew famine. You warlording bastards just couldn’t leave this little paradise in peace, could you?"
 hint=_"Large plots are rare on those small islands. Prioritize construction of large buildings on them. Sometimes you will need big military buildings to expand all the way to the next island. The AI will perform poorly."
-tags="official"
+tags="ferries,official"

=== modified file 'data/maps/Archipelago_Sea.wmf/port_spaces'
--- data/maps/Archipelago_Sea.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Archipelago_Sea.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="3"
 
 [port_spaces]

=== modified file 'data/maps/Calvisson.wmf/elemental'
--- data/maps/Calvisson.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Calvisson.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,7 +9,7 @@
 author="Kristin"
 descr=_"It’s a pleasure to settle in the beauty of this fissured countryside. But the ways to encompass these large territories are long and meandering, so it is easy to err into the land of the foreign clans."
 hint=
-tags="2teams,official,seafaring"
+tags="2teams,ferries,official,seafaring"
 
 [teams00]
 team1="0"

=== modified file 'data/maps/Calvisson.wmf/port_spaces'
--- data/maps/Calvisson.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Calvisson.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="5"
 number_of_port_spaces="45"
 
 [port_spaces]

=== modified file 'data/maps/Fellowships_v2.wmf/elemental'
--- data/maps/Fellowships_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Fellowships_v2.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Teppo"
 descr=_"Ships are your best fellows. Starting positions are similar, so the map should be fair."
 hint=_"This is a somewhat technical map, and it is best suited for two or three human players. Coal is hard to find – consider making some. There is gold near the starting point – do you see it?"
-tags="ffa,seafaring,official"
+tags="ferries,ffa,seafaring,official"

=== modified file 'data/maps/Fellowships_v2.wmf/port_spaces'
--- data/maps/Fellowships_v2.wmf/port_spaces	2016-03-22 10:38:29 +0000
+++ data/maps/Fellowships_v2.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="6"
 number_of_port_spaces="9"
 
 [port_spaces]

=== modified file 'data/maps/Finnish_Lakes.wmf/port_spaces'
--- data/maps/Finnish_Lakes.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Finnish_Lakes.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="8"
 
 [port_spaces]

=== modified file 'data/maps/Four_Castles.wmf/elemental'
--- data/maps/Four_Castles.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Four_Castles.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,7 +9,7 @@
 author="Winterwind"
 descr=_"Well protected in their mighty fortresses, four power-hungry warlords are completing their schemes to dominate these lands…"
 hint=
-tags="2teams,artifacts,ffa,official"
+tags="2teams,artifacts,ferries,ffa,official"
 
 [teams00]
 team1="0,1"

=== modified file 'data/maps/Four_Castles.wmf/port_spaces'
--- data/maps/Four_Castles.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Four_Castles.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="8"
 
 [port_spaces]

=== modified file 'data/maps/Golden_Peninsula.wmf/elemental'
--- data/maps/Golden_Peninsula.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Golden_Peninsula.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Winterwind"
 descr=_"Two empires race for the treasures of a legendary peninsula…"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,ferries,official"

=== modified file 'data/maps/Golden_Peninsula.wmf/port_spaces'
--- data/maps/Golden_Peninsula.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Golden_Peninsula.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="4"
 
 [port_spaces]

=== modified file 'data/maps/Ice_wars.wmf/elemental'
--- data/maps/Ice_wars.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Ice_wars.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Einstein13"
 descr=_"Autumn became winter. Some things are frozen, but not the war."
 hint=_"Start positions are clockwise"
-tags="2teams,3teams,4teams,official,seafaring"
+tags="2teams,3teams,4teams,ferries,official,seafaring"

=== modified file 'data/maps/Ice_wars.wmf/port_spaces'
--- data/maps/Ice_wars.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Ice_wars.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="12"
 number_of_port_spaces="56"
 
 [port_spaces]

=== modified file 'data/maps/Impact.wmf/elemental'
--- data/maps/Impact.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Impact.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="deviant"
 descr=_"After an impact of an asteroid and the following harsh winter, three isles are connected by ice and stone, setting an end to the peaceful coexistence of three tribes."
 hint=
-tags="official,unbalanced"
+tags="ferries,official,unbalanced"

=== modified file 'data/maps/Impact.wmf/port_spaces'
--- data/maps/Impact.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Impact.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="6"
 
 [port_spaces]

=== modified file 'data/maps/Islands_at_War.wmf/elemental'
--- data/maps/Islands_at_War.wmf/elemental	2016-10-31 11:14:07 +0000
+++ data/maps/Islands_at_War.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Tuxlands"
 descr=_"For centuries, you’ve lived peacefully side by side with the other tribe on the neighboring island. This peace seems to come to an end now – your neighbor has begun to expand."
 hint=
-tags="1v1,official,unbalanced"
+tags="1v1,ferries,official,unbalanced"

=== modified file 'data/maps/Islands_at_War.wmf/port_spaces'
--- data/maps/Islands_at_War.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Islands_at_War.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="6"
 
 [port_spaces]

=== modified file 'data/maps/Kings_and_Queens_v2.wmf/elemental'
--- data/maps/Kings_and_Queens_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Kings_and_Queens_v2.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="fk"
 descr=_"An old legend tells that these seven kingdoms, that have flourished for ages in prosperity, will someday collapse into a devastating war. Has your latest betrayal been one too many and will the prophecy come true?"
 hint=
-tags="ffa,unbalanced,official"
+tags="ferries,ffa,unbalanced,official"

=== modified file 'data/maps/Kings_and_Queens_v2.wmf/port_spaces'
--- data/maps/Kings_and_Queens_v2.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Kings_and_Queens_v2.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="20"
 number_of_port_spaces="0"
 
 [port_spaces]

=== modified file 'data/maps/Lake_of_Tranquility.wmf/elemental'
--- data/maps/Lake_of_Tranquility.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Lake_of_Tranquility.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Winterwind"
 descr=_"This lake, deep in the most ancient forests, has long been known for its beauty and idyllic peace. However, its sanctity has been disturbed now, as two hostile tribes have arrived at its shores…"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,ferries,official"

=== modified file 'data/maps/Lake_of_Tranquility.wmf/port_spaces'
--- data/maps/Lake_of_Tranquility.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Lake_of_Tranquility.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="13"
 
 [port_spaces]

=== modified file 'data/maps/Last_Bastion_v2.wmf/elemental'
--- data/maps/Last_Bastion_v2.wmf/elemental	2018-02-14 18:29:07 +0000
+++ data/maps/Last_Bastion_v2.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author=_"Another Barbarian – edited by king_of_nowhere"
 descr=_"The whimsical Gods didn’t answer our prayers. Instead, the increasing sunlight heated up the Earth a thousandfold and melted glaciers and people were plunged into the deep. But now – high in the majestic mountains, on the last scrap of land – two surviving tribes are sheltering. Even though the Gods showed mercy and the climate thus turned cooler again, the water is still rising and rising. Onto the last secure place – the highest mountain range where the amount of gold and the space to live merely suffice for one tribe – only two opposite paths lead. But remember, be careful… this last living space is also a hard and small place to live."
 hint=_"Don’t forget to take care of your timber supplies, you’ll need them."
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,ferries,official"

=== modified file 'data/maps/Last_Bastion_v2.wmf/port_spaces'
--- data/maps/Last_Bastion_v2.wmf/port_spaces	2018-02-02 16:03:06 +0000
+++ data/maps/Last_Bastion_v2.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="5"
 
 [port_spaces]

=== modified file 'data/maps/Rendez-Vous.wmf/elemental'
--- data/maps/Rendez-Vous.wmf/elemental	2016-09-18 07:01:55 +0000
+++ data/maps/Rendez-Vous.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Quappo"
 descr=_"Only a small hill in the centre of the map connects these four competing tribes. Lead your army to this hill right away and build a giant stronghold as a sign of your superiority!"
 hint=_"There is space for only one stronghold in the centre. Water can be found everywhere, so there is no need to send out geologists."
-tags="2teams,ffa,official"
+tags="2teams,ferries,ffa,official"

=== modified file 'data/maps/Rendez-Vous.wmf/port_spaces'
--- data/maps/Rendez-Vous.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Rendez-Vous.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="20"
 
 [port_spaces]

=== modified file 'data/maps/River_Explorers.wmf/elemental'
--- data/maps/River_Explorers.wmf/elemental	2016-09-27 18:40:12 +0000
+++ data/maps/River_Explorers.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Jenia"
 descr=_"Each player has a different obstacle to expansion, and there’s always more than one way to overcome it. While the AI can be defeated here without building a single ship, players are advised to make ports and shipyards a priority – expeditions are universally useful and are often the fastest way to gold deposits."
 hint=
-tags="artifacts,official,seafaring,unbalanced"
+tags="artifacts,ferries,official,seafaring,unbalanced"

=== modified file 'data/maps/River_Explorers.wmf/port_spaces'
--- data/maps/River_Explorers.wmf/port_spaces	2016-09-27 18:40:12 +0000
+++ data/maps/River_Explorers.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="16"
 number_of_port_spaces="19"
 
 [port_spaces]

=== modified file 'data/maps/Riverlands.wmf/elemental'
--- data/maps/Riverlands.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Riverlands.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="ISCH"
 descr=_"A mystical land, full of different landscapes, which are all crossed by a handful of big rivers."
 hint=
-tags="artifacts,official,unbalanced"
+tags="artifacts,ferries,official,unbalanced"

=== modified file 'data/maps/Riverlands.wmf/port_spaces'
--- data/maps/Riverlands.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Riverlands.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="4"
 
 [port_spaces]

=== modified file 'data/maps/Sun_of_Fire.wmf/elemental'
--- data/maps/Sun_of_Fire.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Sun_of_Fire.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"For hundreds of years, this island was kept as a sanctuary of the Gods. No human ever ventured to set a foot on it. But now that a tribe had finally been barefaced enough to settle on the coast of that island, a lot of others followed in its wake."
 hint=_"Start positions are clockwise"
-tags="2teams,3teams,4teams,ffa,official"
+tags="2teams,3teams,4teams,ferries,ffa,official"

=== modified file 'data/maps/Sun_of_Fire.wmf/port_spaces'
--- data/maps/Sun_of_Fire.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Sun_of_Fire.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="14"
 
 [port_spaces]

=== modified file 'data/maps/The_Far_North.wmf/elemental'
--- data/maps/The_Far_North.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Far_North.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Another Barbarian"
 descr=_"Some say that impenetrable lands to the far north scared away even the most courageous settlers and the bravest of the brave warriors. Big and old forests, full of big and predatory game, cut across by wetlands and hills were shrouded in mystery. The ones who had managed to come back mentioned tremendous buildings, decorated with carvings and gold from majestic mountain ranges somewhere amongst the wilderness. Dozens of years after only some crumbly ruins remain of these good old times, covered with moss and trees. Their shapes give only an idea about the craftsmanship of ancient constructors. Nobody knows why they (have) disappeared. Nobody knows why. People say that now nothing is blocking the road to wealth. But many will die pulled apart by wolves, engulfed by swamp… encircled by hostile tribes."
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,ferries,official"

=== modified file 'data/maps/The_Far_North.wmf/port_spaces'
--- data/maps/The_Far_North.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/The_Far_North.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="7"
 
 [port_spaces]

=== modified file 'data/maps/The_Long_Way.wmf/elemental'
--- data/maps/The_Long_Way.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/The_Long_Way.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="ISCH"
 descr=_"Another strange test by the Gods. To reach the other side, there seems to be no other way but to occupy the land of your enemies."
 hint=
-tags="official,unbalanced"
+tags="ferries,official,unbalanced"

=== modified file 'data/maps/The_Long_Way.wmf/port_spaces'
--- data/maps/The_Long_Way.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/The_Long_Way.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="14"
 
 [port_spaces]

=== modified file 'data/maps/The_Nile_v2.wmf/elemental'
--- data/maps/The_Nile_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/The_Nile_v2.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -10,7 +10,7 @@
 descr=_"The river has always provided food and communication. This time, eight empires will fight for control over this land."
 hint=_"Use the river wisely. Your opponents will do the same. You will find the main ore resources deep in the desert."
 hint=
-tags="1v1,2teams,3teams,4teams,seafaring,official"
+tags="1v1,2teams,3teams,4teams,ferries,seafaring,official"
 
 [teams00]
 team1="0"

=== modified file 'data/maps/The_Nile_v2.wmf/port_spaces'
--- data/maps/The_Nile_v2.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/The_Nile_v2.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="10"
 number_of_port_spaces="137"
 
 [port_spaces]

=== modified file 'data/maps/The_Pass_Through_the_Mountains.wmf/elemental'
--- data/maps/The_Pass_Through_the_Mountains.wmf/elemental	2016-10-31 09:34:27 +0000
+++ data/maps/The_Pass_Through_the_Mountains.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Quappo"
 descr=_"In this mountainous area two princes have settled. Now they are expanding their territories, unaware of the fact that they are not alone!"
 hint=
-tags="1v1,artifacts,official"
+tags="1v1,artifacts,ferries,official"

=== modified file 'data/maps/The_Pass_Through_the_Mountains.wmf/port_spaces'
--- data/maps/The_Pass_Through_the_Mountains.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/The_Pass_Through_the_Mountains.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -3,5 +3,6 @@
 [global]
 packet_version="1"
 number_of_port_spaces="0"
+waterway_max_length="10"
 
 [port_spaces]

=== modified file 'data/maps/Twin_Lagoons_v2.wmf/elemental'
--- data/maps/Twin_Lagoons_v2.wmf/elemental	2016-03-29 18:29:13 +0000
+++ data/maps/Twin_Lagoons_v2.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="fk"
 descr=_"When the wind swelled up and the first dunes were formed on these abandoned twin lagoons, nobody could have expected that two tribes that are desperately searching for more resources to support their endlessly ongoing wars, would end up in this forgotten place at the same time and for the same well-known reason."
 hint=_"Defend your transport lines, or use ships to bypass the opponent. Then remove all enemy activity."
-tags="1v1,seafaring,official"
+tags="1v1,ferries,seafaring,official"

=== modified file 'data/maps/Twin_Lagoons_v2.wmf/port_spaces'
--- data/maps/Twin_Lagoons_v2.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Twin_Lagoons_v2.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="10"
 number_of_port_spaces="38"
 
 [port_spaces]

=== modified file 'data/maps/Twinkling_Waves.wmf/elemental'
--- data/maps/Twinkling_Waves.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Twinkling_Waves.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"Many beautiful, green islands await the ones brave enough to pass the thousand waves, twinkling in the sun."
 hint=
-tags="artifacts,official,seafaring,unbalanced"
+tags="artifacts,ferries,official,seafaring,unbalanced"

=== modified file 'data/maps/Twinkling_Waves.wmf/port_spaces'
--- data/maps/Twinkling_Waves.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Twinkling_Waves.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="7"
 number_of_port_spaces="13"
 
 [port_spaces]

=== modified file 'data/maps/Volcanic_Winter.wmf/elemental'
--- data/maps/Volcanic_Winter.wmf/elemental	2016-03-25 09:45:18 +0000
+++ data/maps/Volcanic_Winter.wmf/elemental	2019-09-08 17:15:28 +0000
@@ -9,4 +9,4 @@
 author="Nasenbaer"
 descr=_"In the middle of summer, a series of volcanic eruptions drew the winter in. Suddenly, the sun seemed to be gone and the only light and heat sources left were those that enforced this dramatic change. Continents, oceans and seas are frozen now, only the volcanic islands seem to be left as habitable land."
 hint=
-tags="1v1,artifacts,official,seafaring"
+tags="1v1,artifacts,ferries,official,seafaring"

=== modified file 'data/maps/Volcanic_Winter.wmf/port_spaces'
--- data/maps/Volcanic_Winter.wmf/port_spaces	2016-03-21 19:29:24 +0000
+++ data/maps/Volcanic_Winter.wmf/port_spaces	2019-09-08 17:15:28 +0000
@@ -2,6 +2,7 @@
 
 [global]
 packet_version="1"
+waterway_max_length="4"
 number_of_port_spaces="12"
 
 [port_spaces]

=== modified file 'data/tribes/atlanteans.lua'
--- data/tribes/atlanteans.lua	2019-05-28 17:01:30 +0000
+++ data/tribes/atlanteans.lua	2019-09-08 17:15:28 +0000
@@ -17,7 +17,7 @@
 --
 --    **animations**: Global animations. Contains subtables for ``frontier`` and ``flag``. Each animation needs the parameters ``pictures`` (table of filenames) and ``hotspot`` (2 integer coordinates), and may also define ``fps`` (integer frames per second).
 --
---    **roads**: The file paths for the tribes' road textures in 2 subtables ``busy`` and ``normal``
+--    **roads**: The file paths for the tribe's road textures in 3 subtables ``busy``, ``normal`` and ``waterway``.
 --
 --    **resource_indicators**: The names for the resource indicators. This table contains a subtable for each resource name plus a subtable named "" for no resources. Each subtable is an array, in which the index of each entry is the highest amount of resources the indicator may indicate.
 --
@@ -43,6 +43,8 @@
 --
 --    **ship**: The internal name of the tribe's ship.
 --
+--    **ferry**: The internal name of the tribe's ferry.
+--
 --    **port**: The internal name of the tribe's port building. This unit needs to be defined in the ``buildings`` table too.
 --
 --    **toolbar**: *Optional*. Replace the default toolbar images with these custom images. Example:
@@ -68,7 +70,7 @@
    name = "atlanteans",
    animations = animations,
 
-   -- Image file paths for this tribe's road textures
+   -- Image file paths for this tribe's road and waterway textures
    roads = {
       busy = {
          image_dirname .. "roadt_busy.png",
@@ -77,6 +79,9 @@
          image_dirname .. "roadt_normal_00.png",
          image_dirname .. "roadt_normal_01.png",
       },
+      waterway = {
+         "tribes/images/atlanteans/waterway_0.png",
+      },
    },
 
    resource_indicators = {
@@ -176,6 +181,7 @@
       {
          -- Carriers
          "atlanteans_carrier",
+         "atlanteans_ferry",
          "atlanteans_horse",
          "atlanteans_horsebreeder"
       },
@@ -278,6 +284,7 @@
       "atlanteans_weaponsmithy",
       "atlanteans_armorsmithy",
       "atlanteans_shipyard",
+      "atlanteans_ferry_yard",
       "atlanteans_barracks",
 
       -- Big
@@ -378,6 +385,7 @@
    geologist = "atlanteans_geologist",
    soldier = "atlanteans_soldier",
    ship = "atlanteans_ship",
+   ferry = "atlanteans_ferry",
    port = "atlanteans_port",
    ironore = "iron_ore",
    rawlog = "log",

=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua	2019-05-26 01:46:18 +0000
+++ data/tribes/barbarians.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    name = "barbarians",
    animations = animations,
 
-   -- Image file paths for this tribe's road textures
+   -- Image file paths for this tribe's road and waterway textures
    roads = {
       busy = {
          image_dirname .. "roadt_busy.png",
@@ -17,6 +17,9 @@
          image_dirname .. "roadt_normal_00.png",
          image_dirname .. "roadt_normal_01.png",
       },
+      waterway = {
+         "tribes/images/barbarians/waterway_0.png",
+      },
    },
 
    resource_indicators = {
@@ -112,6 +115,7 @@
       {
          -- Carriers
          "barbarians_carrier",
+         "barbarians_ferry",
          "barbarians_ox",
          "barbarians_cattlebreeder"
       },
@@ -220,6 +224,7 @@
       "barbarians_warmill",
       "barbarians_ax_workshop",
       "barbarians_shipyard",
+      "barbarians_ferry_yard",
       "barbarians_barracks",
 
       -- Big
@@ -300,6 +305,7 @@
    geologist = "barbarians_geologist",
    soldier = "barbarians_soldier",
    ship = "barbarians_ship",
+   ferry = "barbarians_ferry",
    port = "barbarians_port",
    ironore = "iron_ore",
    rawlog = "log",

=== added directory 'data/tribes/buildings/productionsites/atlanteans/ferry_yard'
=== added file 'data/tribes/buildings/productionsites/atlanteans/ferry_yard/helptexts.lua'
--- data/tribes/buildings/productionsites/atlanteans/ferry_yard/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ferry_yard/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,27 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
+function building_helptext_lore()
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
+end
+
+function building_helptext_lore_author()
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
+end
+
+function building_helptext_purpose()
+   -- TRANSLATORS: Purpose helptext for a building
+   return pgettext("building", "Builds ferries.")
+end
+
+function building_helptext_note()
+   -- TRANSLATORS: Note helptext for a building
+   return pgettext("building", "Needs water nearby.")
+end
+
+function building_helptext_performance()
+   -- TRANSLATORS#: Performance helptext for a building
+   return no_performance_text_yet()
+end

=== added file 'data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00.png'
Binary files data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/ferry_yard/idle_00_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/atlanteans/ferry_yard/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/ferry_yard/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/atlanteans/ferry_yard/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,59 @@
+dirname = path.dirname(__file__)
+
+tribes:new_productionsite_type {
+   msgctxt = "atlanteans_building",
+   name = "atlanteans_ferry_yard",
+   -- TRANSLATORS: This is a building name used in lists of buildings
+   descname = pgettext("atlanteans_building", "Ferry Yard"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   size = "medium",
+   map_check = {"waterways"},
+
+   buildcost = {
+      log = 3,
+      planks = 2,
+      granite = 3,
+      spidercloth = 2
+   },
+   return_on_dismantle = {
+      log = 1,
+      planks = 1,
+      granite = 2,
+      spidercloth = 1
+   },
+
+   -- TODO(Nordfriese): Make animations
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "idle_??.png"),
+         hotspot = { 53, 66 },
+      }
+   },
+
+   aihints = {},
+
+   indicate_workarea_overlaps = {
+      atlanteans_ferry_yard = false,
+   },
+
+   working_positions = {
+      atlanteans_shipwright = 1
+   },
+
+   inputs = {
+      { name = "log", amount = 8 },
+   },
+
+   programs = {
+      work = {
+         -- TRANSLATORS: Completed/Skipped/Did not start working because ...
+         descname = _"working",
+         actions = {
+            "sleep=20000",
+            "consume=log:3",
+            "callworker=buildferry"
+         }
+      },
+   },
+}

=== added file 'data/tribes/buildings/productionsites/atlanteans/ferry_yard/menu.png'
Binary files data/tribes/buildings/productionsites/atlanteans/ferry_yard/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/atlanteans/ferry_yard/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2019-06-06 09:11:02 +0000
+++ data/tribes/buildings/productionsites/atlanteans/shipyard/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== added directory 'data/tribes/buildings/productionsites/barbarians/ferry_yard'
=== added file 'data/tribes/buildings/productionsites/barbarians/ferry_yard/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/ferry_yard/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ferry_yard/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,27 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
+function building_helptext_lore()
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
+end
+
+function building_helptext_lore_author()
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
+end
+
+function building_helptext_purpose()
+   -- TRANSLATORS: Purpose helptext for a building
+   return pgettext("building", "Builds ferries.")
+end
+
+function building_helptext_note()
+   -- TRANSLATORS: Note helptext for a building
+   return pgettext("building", "Needs water nearby.")
+end
+
+function building_helptext_performance()
+   -- TRANSLATORS#: Performance helptext for a building
+   return no_performance_text_yet()
+end

=== added file 'data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00.png'
Binary files data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/ferry_yard/idle_00_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/barbarians/ferry_yard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/ferry_yard/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/barbarians/ferry_yard/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,58 @@
+dirname = path.dirname(__file__)
+
+tribes:new_productionsite_type {
+   msgctxt = "barbarians_building",
+   name = "barbarians_ferry_yard",
+   -- TRANSLATORS: This is a building name used in lists of buildings
+   descname = pgettext("barbarians_building", "Ferry Yard"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   size = "medium",
+   map_check = {"waterways"},
+
+   buildcost = {
+      log = 3,
+      blackwood = 2,
+      granite = 3,
+      cloth = 2
+   },
+   return_on_dismantle = {
+      log = 1,
+      blackwood = 1,
+      granite = 2
+   },
+
+   -- TODO(Nordfriese): Make animations
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "idle_??.png"),
+         hotspot = { 62, 48 },
+      }
+   },
+
+   aihints = {},
+
+   indicate_workarea_overlaps = {
+      barbarians_ferry_yard = false,
+   },
+
+   working_positions = {
+      barbarians_shipwright = 1
+   },
+
+   inputs = {
+      { name = "log", amount = 8 },
+   },
+
+   programs = {
+      work = {
+         -- TRANSLATORS: Completed/Skipped/Did not start working because ...
+         descname = _"working",
+         actions = {
+            "sleep=20000",
+            "consume=log:3",
+            "callworker=buildferry"
+         }
+      },
+   },
+}

=== added file 'data/tribes/buildings/productionsites/barbarians/ferry_yard/menu.png'
Binary files data/tribes/buildings/productionsites/barbarians/ferry_yard/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/barbarians/ferry_yard/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/barbarians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2019-06-06 09:11:02 +0000
+++ data/tribes/buildings/productionsites/barbarians/shipyard/init.lua	2019-09-08 17:15:28 +0000
@@ -14,7 +14,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== modified file 'data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua	2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/productionsites/barbarians/weaving_mill/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "big",
-   needs_seafaring = true,
+   map_check = {"seafaring", "waterways"},
 
    buildcost = {
       log = 5,

=== added directory 'data/tribes/buildings/productionsites/empire/ferry_yard'
=== added file 'data/tribes/buildings/productionsites/empire/ferry_yard/helptexts.lua'
--- data/tribes/buildings/productionsites/empire/ferry_yard/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/empire/ferry_yard/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,27 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
+function building_helptext_lore()
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
+end
+
+function building_helptext_lore_author()
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
+end
+
+function building_helptext_purpose()
+   -- TRANSLATORS: Purpose helptext for a building
+   return pgettext("building", "Builds ferries.")
+end
+
+function building_helptext_note()
+   -- TRANSLATORS: Note helptext for a building
+   return pgettext("building", "Needs water nearby.")
+end
+
+function building_helptext_performance()
+   -- TRANSLATORS#: Performance helptext for a building
+   return no_performance_text_yet()
+end

=== added file 'data/tribes/buildings/productionsites/empire/ferry_yard/idle_00.png'
Binary files data/tribes/buildings/productionsites/empire/ferry_yard/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/ferry_yard/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/empire/ferry_yard/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/empire/ferry_yard/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/ferry_yard/idle_00_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/empire/ferry_yard/init.lua'
--- data/tribes/buildings/productionsites/empire/ferry_yard/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/empire/ferry_yard/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,58 @@
+dirname = path.dirname(__file__)
+
+tribes:new_productionsite_type {
+   msgctxt = "empire_building",
+   name = "empire_ferry_yard",
+   -- TRANSLATORS: This is a building name used in lists of buildings
+   descname = pgettext("empire_building", "Ferry Yard"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   size = "medium",
+   map_check = {"waterways"},
+
+   buildcost = {
+      log = 3,
+      planks = 2,
+      granite = 3,
+      cloth = 2
+   },
+   return_on_dismantle = {
+      log = 1,
+      granite = 2,
+      cloth = 1
+   },
+
+   -- TODO(Nordfriese): Make animations
+   animations = {
+      idle = {
+         pictures = path.list_files(dirname .. "idle_??.png"),
+         hotspot = { 50, 63 },
+      }
+   },
+
+   aihints = {},
+
+   indicate_workarea_overlaps = {
+      empire_ferry_yard = false,
+   },
+
+   working_positions = {
+      empire_shipwright = 1
+   },
+
+   inputs = {
+      { name = "log", amount = 8 },
+   },
+
+   programs = {
+      work = {
+         -- TRANSLATORS: Completed/Skipped/Did not start working because ...
+         descname = _"working",
+         actions = {
+            "sleep=20000",
+            "consume=log:3",
+            "callworker=buildferry"
+         }
+      },
+   },
+}

=== added file 'data/tribes/buildings/productionsites/empire/ferry_yard/menu.png'
Binary files data/tribes/buildings/productionsites/empire/ferry_yard/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/empire/ferry_yard/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/empire/shipyard/init.lua'
--- data/tribes/buildings/productionsites/empire/shipyard/init.lua	2019-06-06 09:11:02 +0000
+++ data/tribes/buildings/productionsites/empire/shipyard/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== added directory 'data/tribes/buildings/productionsites/frisians/ferry_yard'
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/helptexts.lua'
--- data/tribes/buildings/productionsites/frisians/ferry_yard/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/frisians/ferry_yard/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,27 @@
+-- This include can be removed when all help texts have been defined.
+include "tribes/scripting/help/global_helptexts.lua"
+
+function building_helptext_lore()
+   -- TRANSLATORS#: Lore helptext for a building
+   return no_lore_text_yet()
+end
+
+function building_helptext_lore_author()
+   -- TRANSLATORS#: Lore author helptext for a building
+   return no_lore_author_text_yet()
+end
+
+function building_helptext_purpose()
+   -- TRANSLATORS: Purpose helptext for a building
+   return pgettext("building", "Builds ferries.")
+end
+
+function building_helptext_note()
+   -- TRANSLATORS: Note helptext for a building
+   return pgettext("building", "Needs water nearby.")
+end
+
+function building_helptext_performance()
+   -- TRANSLATORS#: Performance helptext for a building
+   return no_performance_text_yet()
+end

=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_00_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_01_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_02_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_03_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_04_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_05_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_06_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_07_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_08_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/idle_09_pc.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/init.lua'
--- data/tribes/buildings/productionsites/frisians/ferry_yard/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/buildings/productionsites/frisians/ferry_yard/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,63 @@
+dirname = path.dirname(__file__)
+
+tribes:new_productionsite_type {
+   msgctxt = "frisians_building",
+   name = "frisians_ferry_yard",
+   -- TRANSLATORS: This is a building name used in lists of buildings
+   descname = pgettext("frisians_building", "Ferry Yard"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   size = "medium",
+   map_check = {"waterways"},
+
+   buildcost = {
+      brick = 3,
+      granite = 1,
+      log = 3,
+      reed = 2,
+      cloth = 1
+   },
+   return_on_dismantle = {
+      brick = 2,
+      log = 2,
+      reed = 1
+   },
+
+   animations = {
+      idle = {
+         pictures = path.list_files (dirname .. "idle_??.png"),
+         hotspot = {56, 87},
+         fps = 10,
+      },
+      unoccupied = {
+         pictures = path.list_files (dirname .. "unoccupied_?.png"),
+         hotspot = {56, 66},
+      },
+   },
+
+   aihints = {},
+
+   indicate_workarea_overlaps = {
+      frisians_ferry_yard = false,
+   },
+
+   working_positions = {
+      frisians_shipwright = 1
+   },
+
+   inputs = {
+      { name = "log", amount = 8 },
+   },
+
+   programs = {
+      work = {
+         -- TRANSLATORS: Completed/Skipped/Did not start working because ...
+         descname = _"working",
+         actions = {
+            "sleep=20000",
+            "consume=log:3",
+            "callworker=buildferry"
+         }
+      },
+   },
+}

=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/menu.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/menu.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0_pc.png'
Binary files data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/buildings/productionsites/frisians/ferry_yard/unoccupied_0_pc.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/buildings/productionsites/frisians/shipyard/init.lua'
--- data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2019-06-06 09:11:02 +0000
+++ data/tribes/buildings/productionsites/frisians/shipyard/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       brick = 3,

=== modified file 'data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua'
--- data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua	2019-05-29 18:29:28 +0000
+++ data/tribes/buildings/productionsites/frisians/weaving_mill/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "medium",
-   needs_seafaring = true,
+   map_check = {"seafaring", "waterways"},
 
    buildcost = {
       brick = 4,

=== modified file 'data/tribes/buildings/warehouses/atlanteans/port/init.lua'
--- data/tribes/buildings/warehouses/atlanteans/port/init.lua	2018-04-07 08:53:42 +0000
+++ data/tribes/buildings/warehouses/atlanteans/port/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "port",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== modified file 'data/tribes/buildings/warehouses/barbarians/port/init.lua'
--- data/tribes/buildings/warehouses/barbarians/port/init.lua	2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/warehouses/barbarians/port/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "port",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== modified file 'data/tribes/buildings/warehouses/empire/port/init.lua'
--- data/tribes/buildings/warehouses/empire/port/init.lua	2018-04-07 08:53:42 +0000
+++ data/tribes/buildings/warehouses/empire/port/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "port",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       log = 3,

=== modified file 'data/tribes/buildings/warehouses/frisians/port/init.lua'
--- data/tribes/buildings/warehouses/frisians/port/init.lua	2019-05-19 11:25:28 +0000
+++ data/tribes/buildings/warehouses/frisians/port/init.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    helptext_script = dirname .. "helptexts.lua",
    icon = dirname .. "menu.png",
    size = "port",
-   needs_seafaring = true,
+   map_check = {"seafaring"},
 
    buildcost = {
       brick = 6,

=== modified file 'data/tribes/empire.lua'
--- data/tribes/empire.lua	2019-05-26 01:46:18 +0000
+++ data/tribes/empire.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    name = "empire",
    animations = animations,
 
-   -- Image file paths for this tribe's road textures
+   -- Image file paths for this tribe's road and waterway textures
    roads = {
       busy = {
          image_dirname .. "roadt_busy.png",
@@ -18,6 +18,9 @@
          image_dirname .. "roadt_normal_01.png",
          image_dirname .. "roadt_normal_02.png",
       },
+      waterway = {
+         "tribes/images/empire/waterway_0.png",
+      },
    },
 
    resource_indicators = {
@@ -116,6 +119,7 @@
       {
          -- Carriers
          "empire_carrier",
+         "empire_ferry",
          "empire_donkey",
          "empire_donkeybreeder"
       },
@@ -224,6 +228,7 @@
       "empire_toolsmithy",
       "empire_armorsmithy",
       "empire_shipyard",
+      "empire_ferry_yard",
       "empire_barracks",
 
       -- Big
@@ -340,6 +345,7 @@
    geologist = "empire_geologist",
    soldier = "empire_soldier",
    ship = "empire_ship",
+   ferry = "empire_ferry",
    port = "empire_port",
    ironore = "iron_ore",
    rawlog = "log",

=== modified file 'data/tribes/frisians.lua'
--- data/tribes/frisians.lua	2019-05-26 01:46:18 +0000
+++ data/tribes/frisians.lua	2019-09-08 17:15:28 +0000
@@ -8,7 +8,7 @@
    name = "frisians",
    animations = animations,
 
-   -- Image file paths for this tribe's road textures
+   -- Image file paths for this tribe's road and waterway textures
    roads = {
       busy = {
          image_dirname .. "roadt_busy.png",
@@ -17,6 +17,9 @@
          image_dirname .. "roadt_normal_00.png",
          image_dirname .. "roadt_normal_01.png",
       },
+      waterway = {
+         "tribes/images/frisians/waterway_0.png",
+      },
    },
 
    resource_indicators = {
@@ -122,6 +125,7 @@
       {
          -- Carriers
          "frisians_carrier",
+         "frisians_ferry",
          "frisians_reindeer",
          "frisians_reindeer_breeder"
       },
@@ -280,6 +284,7 @@
       "frisians_barracks",
       "frisians_weaving_mill",
       "frisians_shipyard",
+      "frisians_ferry_yard",
 
       -- Big
       "frisians_reindeer_farm",
@@ -341,6 +346,7 @@
    geologist = "frisians_geologist",
    soldier = "frisians_soldier",
    ship = "frisians_ship",
+   ferry = "frisians_ferry",
    port = "frisians_port",
    ironore = "iron_ore",
    rawlog = "log",

=== added file 'data/tribes/images/atlanteans/waterway_0.png'
Binary files data/tribes/images/atlanteans/waterway_0.png	1970-01-01 00:00:00 +0000 and data/tribes/images/atlanteans/waterway_0.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/images/barbarians/waterway_0.png'
Binary files data/tribes/images/barbarians/waterway_0.png	1970-01-01 00:00:00 +0000 and data/tribes/images/barbarians/waterway_0.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/images/empire/waterway_0.png'
Binary files data/tribes/images/empire/waterway_0.png	1970-01-01 00:00:00 +0000 and data/tribes/images/empire/waterway_0.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/images/frisians/waterway_0.png'
Binary files data/tribes/images/frisians/waterway_0.png	1970-01-01 00:00:00 +0000 and data/tribes/images/frisians/waterway_0.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua	2019-05-19 11:25:28 +0000
+++ data/tribes/init.lua	2019-09-08 17:15:28 +0000
@@ -208,6 +208,7 @@
 
    print_loading_message("┃    Workers", function()
       include "tribes/workers/atlanteans/carrier/init.lua"
+      include "tribes/workers/atlanteans/ferry/init.lua"
       include "tribes/workers/atlanteans/armorsmith/init.lua"
       include "tribes/workers/atlanteans/baker/init.lua"
       include "tribes/workers/atlanteans/blackroot_farmer/init.lua"
@@ -239,6 +240,7 @@
       include "tribes/workers/atlanteans/woodcutter/init.lua"
 
       include "tribes/workers/barbarians/carrier/init.lua"
+      include "tribes/workers/barbarians/ferry/init.lua"
       include "tribes/workers/barbarians/baker/init.lua"
       include "tribes/workers/barbarians/blacksmith_master/init.lua"
       include "tribes/workers/barbarians/blacksmith/init.lua"
@@ -272,6 +274,7 @@
       include "tribes/workers/barbarians/weaver/init.lua"
 
       include "tribes/workers/empire/carrier/init.lua"
+      include "tribes/workers/empire/ferry/init.lua"
       include "tribes/workers/empire/armorsmith/init.lua"
       include "tribes/workers/empire/baker/init.lua"
       include "tribes/workers/empire/brewer/init.lua"
@@ -306,6 +309,7 @@
       include "tribes/workers/empire/weaver/init.lua"
 
       include "tribes/workers/frisians/carrier/init.lua"
+      include "tribes/workers/frisians/ferry/init.lua"
       include "tribes/workers/frisians/reindeer/init.lua"
       include "tribes/workers/frisians/builder/init.lua"
       include "tribes/workers/frisians/soldier/init.lua"
@@ -385,6 +389,7 @@
       include "tribes/buildings/productionsites/atlanteans/bakery/init.lua"
       include "tribes/buildings/productionsites/atlanteans/charcoal_kiln/init.lua"
       include "tribes/buildings/productionsites/atlanteans/smelting_works/init.lua"
+      include "tribes/buildings/productionsites/atlanteans/ferry_yard/init.lua"
       include "tribes/buildings/productionsites/atlanteans/shipyard/init.lua"
       include "tribes/buildings/productionsites/atlanteans/toolsmithy/init.lua"
       include "tribes/buildings/productionsites/atlanteans/weaponsmithy/init.lua"
@@ -424,6 +429,7 @@
       include "tribes/buildings/productionsites/barbarians/tavern/init.lua"
       include "tribes/buildings/productionsites/barbarians/charcoal_kiln/init.lua"
       include "tribes/buildings/productionsites/barbarians/smelting_works/init.lua"
+      include "tribes/buildings/productionsites/barbarians/ferry_yard/init.lua"
       include "tribes/buildings/productionsites/barbarians/shipyard/init.lua"
       include "tribes/buildings/productionsites/barbarians/warmill/init.lua"
       include "tribes/buildings/productionsites/barbarians/ax_workshop/init.lua"
@@ -466,6 +472,7 @@
       include "tribes/buildings/productionsites/empire/tavern/init.lua"
       include "tribes/buildings/productionsites/empire/charcoal_kiln/init.lua"
       include "tribes/buildings/productionsites/empire/smelting_works/init.lua"
+      include "tribes/buildings/productionsites/empire/ferry_yard/init.lua"
       include "tribes/buildings/productionsites/empire/shipyard/init.lua"
       include "tribes/buildings/productionsites/empire/toolsmithy/init.lua"
       include "tribes/buildings/productionsites/empire/armorsmithy/init.lua"
@@ -523,6 +530,7 @@
       include "tribes/buildings/productionsites/frisians/brewery/init.lua"
       include "tribes/buildings/productionsites/frisians/weaving_mill/init.lua"
       include "tribes/buildings/productionsites/frisians/smokery/init.lua"
+      include "tribes/buildings/productionsites/frisians/ferry_yard/init.lua"
       include "tribes/buildings/productionsites/frisians/shipyard/init.lua"
       include "tribes/buildings/productionsites/frisians/furnace/init.lua"
       include "tribes/buildings/productionsites/frisians/recycling_center/init.lua"

=== added directory 'data/tribes/workers/atlanteans/ferry'
=== added file 'data/tribes/workers/atlanteans/ferry/helptexts.lua'
--- data/tribes/workers/atlanteans/ferry/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/atlanteans/ferry/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Ferry
+   return pgettext("frisians_worker", "Ships wares across narrow rivers.")
+end

=== added file 'data/tribes/workers/atlanteans/ferry/idle_00.png'
Binary files data/tribes/workers/atlanteans/ferry/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/ferry/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/workers/atlanteans/ferry/init.lua'
--- data/tribes/workers/atlanteans/ferry/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/atlanteans/ferry/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,34 @@
+dirname = path.dirname (__file__)
+
+-- TODO(Nordfriese): Make animations
+animations = {
+   pictures = path.list_files (dirname .. "idle_??.png"),
+   hotspot = {22, 21},
+}
+animations = {
+   idle = animations,
+   walk_se = animations,
+   walk_sw = animations,
+   walk_ne = animations,
+   walk_nw = animations,
+   walk_e = animations,
+   walk_w = animations,
+   walkload_se = animations,
+   walkload_sw = animations,
+   walkload_ne = animations,
+   walkload_nw = animations,
+   walkload_e = animations,
+   walkload_w = animations,
+}
+
+tribes:new_ferry_type {
+   msgctxt = "atlanteans_worker",
+   name = "atlanteans_ferry",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext ("atlanteans_worker", "Ferry"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/atlanteans/ferry/menu.png'
Binary files data/tribes/workers/atlanteans/ferry/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/ferry/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/workers/atlanteans/shipwright/init.lua'
--- data/tribes/workers/atlanteans/shipwright/init.lua	2019-04-21 14:57:55 +0000
+++ data/tribes/workers/atlanteans/shipwright/init.lua	2019-09-08 17:15:28 +0000
@@ -38,7 +38,13 @@
          "construct",
          "animate=idle 5000",
          "return"
-      }
+      },
+      buildferry = {
+         "findspace=size:swim radius:4",
+         "walk=coords",
+         "buildferry",
+         "return"
+      },
    },
 
    animations = animations,

=== added directory 'data/tribes/workers/barbarians/ferry'
=== added file 'data/tribes/workers/barbarians/ferry/helptexts.lua'
--- data/tribes/workers/barbarians/ferry/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/barbarians/ferry/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Ferry
+   return pgettext("frisians_worker", "Ships wares across narrow rivers.")
+end

=== added file 'data/tribes/workers/barbarians/ferry/idle_00.png'
Binary files data/tribes/workers/barbarians/ferry/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/ferry/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/workers/barbarians/ferry/init.lua'
--- data/tribes/workers/barbarians/ferry/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/barbarians/ferry/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,34 @@
+dirname = path.dirname (__file__)
+
+-- TODO(Nordfriese): Make animations
+animations = {
+   pictures = path.list_files (dirname .. "idle_??.png"),
+   hotspot = {29, 19},
+}
+animations = {
+   idle = animations,
+   walk_se = animations,
+   walk_sw = animations,
+   walk_ne = animations,
+   walk_nw = animations,
+   walk_e = animations,
+   walk_w = animations,
+   walkload_se = animations,
+   walkload_sw = animations,
+   walkload_ne = animations,
+   walkload_nw = animations,
+   walkload_e = animations,
+   walkload_w = animations,
+}
+
+tribes:new_ferry_type {
+   msgctxt = "barbarians_worker",
+   name = "barbarians_ferry",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext ("barbarians_worker", "Ferry"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/barbarians/ferry/menu.png'
Binary files data/tribes/workers/barbarians/ferry/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/ferry/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/workers/barbarians/shipwright/init.lua'
--- data/tribes/workers/barbarians/shipwright/init.lua	2019-04-28 09:14:59 +0000
+++ data/tribes/workers/barbarians/shipwright/init.lua	2019-09-08 17:15:28 +0000
@@ -34,7 +34,13 @@
          "construct",
          "animate=work 5000",
          "return"
-      }
+      },
+      buildferry = {
+         "findspace=size:swim radius:4",
+         "walk=coords",
+         "buildferry",
+         "return"
+      },
    },
 
    animations = animations,

=== added directory 'data/tribes/workers/empire/ferry'
=== added file 'data/tribes/workers/empire/ferry/helptexts.lua'
--- data/tribes/workers/empire/ferry/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/empire/ferry/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Ferry
+   return pgettext("frisians_worker", "Ships wares across narrow rivers.")
+end

=== added file 'data/tribes/workers/empire/ferry/idle_00.png'
Binary files data/tribes/workers/empire/ferry/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/ferry/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/workers/empire/ferry/init.lua'
--- data/tribes/workers/empire/ferry/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/empire/ferry/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,34 @@
+dirname = path.dirname (__file__)
+
+-- TODO(Nordfriese): Make animations
+animations = {
+   pictures = path.list_files (dirname .. "idle_??.png"),
+   hotspot = {29, 25},
+}
+animations = {
+   idle = animations,
+   walk_se = animations,
+   walk_sw = animations,
+   walk_ne = animations,
+   walk_nw = animations,
+   walk_e = animations,
+   walk_w = animations,
+   walkload_se = animations,
+   walkload_sw = animations,
+   walkload_ne = animations,
+   walkload_nw = animations,
+   walkload_e = animations,
+   walkload_w = animations,
+}
+
+tribes:new_ferry_type {
+   msgctxt = "empire_worker",
+   name = "empire_ferry",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext ("empire_worker", "Ferry"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/empire/ferry/menu.png'
Binary files data/tribes/workers/empire/ferry/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/ferry/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/workers/empire/shipwright/init.lua'
--- data/tribes/workers/empire/shipwright/init.lua	2019-04-21 14:57:55 +0000
+++ data/tribes/workers/empire/shipwright/init.lua	2019-09-08 17:15:28 +0000
@@ -42,7 +42,13 @@
          "construct",
          "animate=work 5000",
          "return"
-      }
+      },
+      buildferry = {
+         "findspace=size:swim radius:4",
+         "walk=coords",
+         "buildferry",
+         "return"
+      },
    },
 
    animations = animations,

=== added directory 'data/tribes/workers/frisians/ferry'
=== added file 'data/tribes/workers/frisians/ferry/helptexts.lua'
--- data/tribes/workers/frisians/ferry/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/frisians/ferry/helptexts.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Ferry
+   return pgettext("frisians_worker", "Ships wares across narrow rivers.")
+end

=== added file 'data/tribes/workers/frisians/ferry/idle_00.png'
Binary files data/tribes/workers/frisians/ferry/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/frisians/ferry/idle_00.png	2019-09-08 17:15:28 +0000 differ
=== added file 'data/tribes/workers/frisians/ferry/init.lua'
--- data/tribes/workers/frisians/ferry/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/frisians/ferry/init.lua	2019-09-08 17:15:28 +0000
@@ -0,0 +1,34 @@
+dirname = path.dirname (__file__)
+
+-- TODO(Nordfriese): Make animations
+animations = {
+   pictures = path.list_files (dirname .. "idle_??.png"),
+   hotspot = {20, 36},
+}
+animations = {
+   idle = animations,
+   walk_se = animations,
+   walk_sw = animations,
+   walk_ne = animations,
+   walk_nw = animations,
+   walk_e = animations,
+   walk_w = animations,
+   walkload_se = animations,
+   walkload_sw = animations,
+   walkload_ne = animations,
+   walkload_nw = animations,
+   walkload_e = animations,
+   walkload_w = animations,
+}
+
+tribes:new_ferry_type {
+   msgctxt = "frisians_worker",
+   name = "frisians_ferry",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext ("frisians_worker", "Ferry"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/frisians/ferry/menu.png'
Binary files data/tribes/workers/frisians/ferry/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/frisians/ferry/menu.png	2019-09-08 17:15:28 +0000 differ
=== modified file 'data/tribes/workers/frisians/shipwright/init.lua'
--- data/tribes/workers/frisians/shipwright/init.lua	2019-04-21 14:57:55 +0000
+++ data/tribes/workers/frisians/shipwright/init.lua	2019-09-08 17:15:28 +0000
@@ -40,7 +40,13 @@
          "construct",
          "animate=work 5000",
          "return"
-      }
+      },
+      buildferry = {
+         "findspace=size:swim radius:4",
+         "walk=coords",
+         "buildferry",
+         "return"
+      },
    },
 
    ware_hotspot = {0, 20},

=== modified file 'src/ai/ai_help_structs.h'
--- src/ai/ai_help_structs.h	2019-09-06 16:23:33 +0000
+++ src/ai/ai_help_structs.h	2019-09-08 17:15:28 +0000
@@ -79,6 +79,7 @@
 	kUpgradeExtends,
 	kLogRefiner,
 	kIronMine,
+	// TODO(Nordfriese): Someone should update the AI code to handle buildings that need waterways enabled
 	kNeedsSeafaring,
 	kSupportingProducer,
 	kNeedsBerry,

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2019-09-07 21:17:23 +0000
+++ src/ai/defaultai.cc	2019-09-08 17:15:28 +0000
@@ -1699,7 +1699,8 @@
 			assert(building->owner().player_number() == pn);
 
 			// connected to a warehouse
-			bool connected = !building->get_economy()->warehouses().empty();
+			// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+			bool connected = !building->get_economy(wwWORKER)->warehouses().empty();
 			if (connected) {
 				any_connected_imm = true;
 			}
@@ -2057,8 +2058,9 @@
 	for (uint32_t i = 0; i < productionsites.size(); ++i) {
 		assert(productionsites.front().bo->cnt_built > 0);
 		// is connected
+		// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
 		const bool connected_to_wh =
-		   !productionsites.front().site->get_economy()->warehouses().empty();
+		   !productionsites.front().site->get_economy(wwWORKER)->warehouses().empty();
 
 		// unconnected buildings are excluded from statistics review
 		if (connected_to_wh) {
@@ -2084,7 +2086,7 @@
 	for (uint32_t i = 0; i < mines_.size(); ++i) {
 		assert(mines_.front().bo->cnt_built > 0);
 
-		const bool connected_to_wh = !mines_.front().site->get_economy()->warehouses().empty();
+		const bool connected_to_wh = !mines_.front().site->get_economy(wwWORKER)->warehouses().empty();
 
 		// unconnected mines are excluded from statistics review
 		if (connected_to_wh) {
@@ -3496,8 +3498,8 @@
 	const uint16_t stepping = roads.size() / 25 + 1;
 
 	for (uint16_t i = 0; i < roads.size(); i += stepping) {
-		const Flag& roadstartflag = roads[i]->get_flag(Road::FlagStart);
-		const Flag& roadendflag = roads[i]->get_flag(Road::FlagEnd);
+		const Flag& roadstartflag = roads[i]->get_flag(RoadBase::FlagStart);
+		const Flag& roadendflag = roads[i]->get_flag(RoadBase::FlagEnd);
 
 		if (!roadstartflag.get_building() && roadstartflag.is_dead_end()) {
 			game().send_player_bulldoze(*const_cast<Flag*>(&roadstartflag));
@@ -3617,7 +3619,8 @@
 	if (flag_warehouse_distance.is_road_prohibited(flag_coords_hash, gametime)) {
 		return false;
 	}
-	const bool needs_warehouse = flag.get_economy()->warehouses().empty();
+	// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+	const bool needs_warehouse = flag.get_economy(wwWORKER)->warehouses().empty();
 
 	uint32_t tmp_wh;
 
@@ -3653,8 +3656,8 @@
 // the road can be dismantled
 bool DefaultAI::dispensable_road_test(const Widelands::Road& road) {
 
-	Flag& roadstartflag = road.get_flag(Road::FlagStart);
-	Flag& roadendflag = road.get_flag(Road::FlagEnd);
+	Flag& roadstartflag = road.get_flag(RoadBase::FlagStart);
+	Flag& roadendflag = road.get_flag(RoadBase::FlagEnd);
 
 	// Calculating full road (from crossing/building to another crossing/building),
 	// this means we calculate vector of all flags of the "full road"
@@ -3677,11 +3680,11 @@
 				}
 
 				Flag* other_end;
-				if (near_road->get_flag(Road::FlagStart).get_position().hash() ==
+				if (near_road->get_flag(RoadBase::FlagStart).get_position().hash() ==
 				    full_road.back()->get_position().hash()) {
-					other_end = &near_road->get_flag(Road::FlagEnd);
+					other_end = &near_road->get_flag(RoadBase::FlagEnd);
 				} else {
-					other_end = &near_road->get_flag(Road::FlagStart);
+					other_end = &near_road->get_flag(RoadBase::FlagStart);
 				}
 
 				// Have we already the end of road in our full_road?
@@ -3776,10 +3779,10 @@
 				continue;
 			}
 
-			Flag* endflag = &near_road->get_flag(Road::FlagStart);
+			Flag* endflag = &near_road->get_flag(RoadBase::FlagStart);
 
 			if (endflag == nf.flag) {
-				endflag = &near_road->get_flag(Road::FlagEnd);
+				endflag = &near_road->get_flag(RoadBase::FlagEnd);
 			}
 
 			// When walking on nearby roads, we do not go too far from start and end of road
@@ -3820,14 +3823,15 @@
 
 	// Increasing the failed_connection_tries counter
 	// At the same time it indicates a time an economy is without a warehouse
-	EconomyObserver* eco = get_economy_observer(flag.economy());
+	// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+	EconomyObserver* eco = get_economy_observer(flag.economy(wwWORKER));
 	// if we passed grace time this will be last attempt and if it fails
 	// building is destroyed
 	bool last_attempt_ = false;
 
 	// this should not happen, but if the economy has a warehouse and a dismantle
 	// grace time set, we must 'zero' the dismantle grace time
-	if (!flag.get_economy()->warehouses().empty() && eco->dismantle_grace_time != kNever) {
+	if (!flag.get_economy(wwWORKER)->warehouses().empty() && eco->dismantle_grace_time != kNever) {
 		eco->dismantle_grace_time = kNever;
 	}
 
@@ -3835,7 +3839,7 @@
 	// and this is a flag belonging to a building/constructionsite
 	// such economy must get dismantle grace time (if not set yet)
 	// end sometimes extended checkradius
-	if (flag.get_economy()->warehouses().empty() && flag.get_building()) {
+	if (flag.get_economy(wwWORKER)->warehouses().empty() && flag.get_building()) {
 
 		// occupied military buildings get special treatment
 		// (extended grace time + longer radius)
@@ -3943,12 +3947,13 @@
 
 			// testing if a flag/road's economy has a warehouse, if not we are not
 			// interested to connect to it
-			if (player_immovable->economy().warehouses().size() == 0) {
+			// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+			if (player_immovable->economy(wwWORKER).warehouses().size() == 0) {
 				continue;
 			}
 
 			// This is a candidate, sending all necessary info to RoadCandidates
-			const bool is_different_economy = (player_immovable->get_economy() != flag.get_economy());
+			const bool is_different_economy = (player_immovable->get_economy(wwWORKER) != flag.get_economy(wwWORKER));
 			const uint16_t air_distance = map.calc_distance(flag.get_position(), reachable_coords);
 
 			if (!flag_candidates.has_candidate(reachable_coords_hash) &&
@@ -4051,7 +4056,8 @@
 	// Usually we block for 2 minutes, but if it is a last attempt we block for 10 minutes
 	// Note: we block the vicinity only if this economy (usually a sole flag with a building) is not
 	// connected to a warehouse
-	if (flag.get_economy()->warehouses().empty()) {
+	// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+	if (flag.get_economy(wwWORKER)->warehouses().empty()) {
 
 		// blocking only if latest block was less then 60 seconds ago or it is last attempt
 		if (eco->fields_block_last_time + kOneMinute < gametime || last_attempt_) {
@@ -4167,7 +4173,8 @@
 	while (!new_flags.empty()) {
 		const Flag& flag = *new_flags.front();
 		new_flags.pop_front();
-		get_economy_observer(flag.economy())->flags.push_back(&flag);
+		// TODO(Nordfriese): Someone must urgently update the code since the big economy splitting for the ferries
+		get_economy_observer(flag.economy(wwWORKER))->flags.push_back(&flag);
 	}
 
 	for (std::deque<EconomyObserver*>::iterator obs_iter = economies.begin();
@@ -4176,9 +4183,9 @@
 		std::deque<Flag const*>& fl = (*obs_iter)->flags;
 
 		for (std::deque<Flag const*>::iterator j = fl.begin(); j != fl.end();) {
-			if (&(*obs_iter)->economy != &(*j)->economy()) {
+			if (&(*obs_iter)->economy != &(*j)->economy(wwWORKER)) {
 				// the flag belongs to other economy so we must assign it there
-				get_economy_observer((*j)->economy())->flags.push_back(*j);
+				get_economy_observer((*j)->economy(wwWORKER))->flags.push_back(*j);
 				// and erase from this economy's observer
 				j = fl.erase(j);
 			} else {
@@ -4227,7 +4234,8 @@
 	}
 
 	// is it connected to wh at all?
-	const bool connected_to_wh = !site.site->get_economy()->warehouses().empty();
+	// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+	const bool connected_to_wh = !site.site->get_economy(wwWORKER)->warehouses().empty();
 
 	// do not dismantle or upgrade the same type of building too soon - to give some time to update
 	// statistics
@@ -4724,7 +4732,8 @@
 	// Get link to productionsite that should be checked
 	ProductionSiteObserver& site = mines_.front();
 
-	const bool connected_to_wh = !site.site->get_economy()->warehouses().empty();
+	// TODO(Nordfriese): Someone should update the code since the big economy splitting for the ferries
+	const bool connected_to_wh = !site.site->get_economy(wwWORKER)->warehouses().empty();
 
 	// First we dismantle mines that are marked as such, generally we wait till all wares all gone
 	if (site.dismantle_pending_since != kNever) {

=== modified file 'src/ai/defaultai_seafaring.cc'
--- src/ai/defaultai_seafaring.cc	2019-08-21 17:57:37 +0000
+++ src/ai/defaultai_seafaring.cc	2019-09-08 17:15:28 +0000
@@ -19,7 +19,7 @@
 
 #include "ai/defaultai.h"
 
-#include "economy/fleet.h"
+#include "economy/ship_fleet.h"
 
 using namespace Widelands;
 

=== modified file 'src/economy/CMakeLists.txt'
--- src/economy/CMakeLists.txt	2019-05-05 18:53:14 +0000
+++ src/economy/CMakeLists.txt	2019-09-08 17:15:28 +0000
@@ -8,10 +8,10 @@
     economy_data_packet.h
     expedition_bootstrap.cc
     expedition_bootstrap.h
+    ferry_fleet.cc
+    ferry_fleet.h
     flag.cc
     flag.h
-    fleet.cc
-    fleet.h
     idleworkersupply.cc
     idleworkersupply.h
     iroute.h
@@ -20,6 +20,8 @@
     portdock.h
     request.cc
     request.h
+    roadbase.cc
+    roadbase.h
     road.cc
     road.h
     route.cc
@@ -29,6 +31,8 @@
     router.cc
     router.h
     routing_node.h
+    ship_fleet.cc
+    ship_fleet.h
     shippingitem.cc
     shippingitem.h
     supply.h
@@ -44,6 +48,8 @@
     input_queue.h
     wares_queue.cc
     wares_queue.h
+    waterway.cc
+    waterway.h
     workers_queue.cc
     workers_queue.h
   DEPENDS

=== modified file 'src/economy/cmd_call_economy_balance.cc'
--- src/economy/cmd_call_economy_balance.cc	2019-02-23 11:00:49 +0000
+++ src/economy/cmd_call_economy_balance.cc	2019-09-08 17:15:28 +0000
@@ -34,8 +34,11 @@
                                              Economy* const economy,
                                              uint32_t const timerid)
    : GameLogicCommand(starttime) {
-	flag_ = economy->get_arbitrary_flag();
+	Flag* flag = economy->get_arbitrary_flag();
+	flag_ = flag;
 	timerid_ = timerid;
+	type_ = economy->type();
+	assert(flag->get_economy(type_) == economy);
 }
 
 /**
@@ -44,10 +47,10 @@
  */
 void CmdCallEconomyBalance::execute(Game& game) {
 	if (Flag* const flag = flag_.get(game))
-		flag->get_economy()->balance(timerid_);
+		flag->get_economy(type_)->balance(timerid_);
 }
 
-constexpr uint16_t kCurrentPacketVersion = 3;
+constexpr uint16_t kCurrentPacketVersion = 4;
 
 /**
  * Read and write
@@ -55,12 +58,26 @@
 void CmdCallEconomyBalance::read(FileRead& fr, EditorGameBase& egbase, MapObjectLoader& mol) {
 	try {
 		uint16_t const packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersion) {
+		if (packet_version <= kCurrentPacketVersion && packet_version >= 3) {
 			GameLogicCommand::read(fr, egbase, mol);
 			uint32_t serial = fr.unsigned_32();
-			if (serial)
+			if (serial) {
 				flag_ = &mol.get<Flag>(serial);
+			}
 			timerid_ = fr.unsigned_32();
+			if (packet_version >= 4) {
+				type_ = fr.unsigned_8() ? wwWORKER : wwWARE;
+			} else {
+				// TODO(Nordfriese): Savegame compatibility
+				type_ = wwWARE;
+				if (serial) {
+					if (upcast(Game, game, &egbase)) {
+						Economy* e = flag_.get(egbase)->get_economy(wwWORKER);
+						assert(e);
+						game->cmdqueue().enqueue(new CmdCallEconomyBalance(duetime(), e, e->request_timerid_));
+					}
+				}
+			}
 		} else {
 			throw UnhandledVersionError(
 			   "CmdCallEconomyBalance", packet_version, kCurrentPacketVersion);
@@ -79,5 +96,6 @@
 	else
 		fw.unsigned_32(0);
 	fw.unsigned_32(timerid_);
+	fw.unsigned_8(type_);
 }
 }  // namespace Widelands

=== modified file 'src/economy/cmd_call_economy_balance.h'
--- src/economy/cmd_call_economy_balance.h	2019-02-23 11:00:49 +0000
+++ src/economy/cmd_call_economy_balance.h	2019-09-08 17:15:28 +0000
@@ -46,6 +46,7 @@
 
 private:
 	OPtr<Flag> flag_;
+	WareWorker type_;
 	uint32_t timerid_;
 };
 }  // namespace Widelands

=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc	2019-09-07 14:19:17 +0000
+++ src/economy/economy.cc	2019-09-08 17:15:28 +0000
@@ -48,35 +48,39 @@
 	last_economy_serial_ = 0;
 }
 
-Economy::Economy(Player& player) : Economy(player, last_economy_serial_++) {
+Economy::Economy(Player& player, WareWorker wwtype) : Economy(player, last_economy_serial_++, wwtype) {
 }
 
+<<<<<<< TREE
 Economy::Economy(Player& player, Serial init_serial)
    : serial_(init_serial), owner_(player), request_timerid_(0), options_window_(nullptr) {
+=======
+Economy::Economy(Player& player, Serial init_serial, WareWorker wwtype)
+   : serial_(init_serial), owner_(player), type_(wwtype), request_timerid_(0), has_window_(false) {
+>>>>>>> MERGE-SOURCE
 	last_economy_serial_ = std::max(last_economy_serial_, serial_ + 1);
 	const TribeDescr& tribe = player.tribe();
-	DescriptionIndex const nr_wares = player.egbase().tribes().nrwares();
-	DescriptionIndex const nr_workers = player.egbase().tribes().nrworkers();
-	wares_.set_nrwares(nr_wares);
-	workers_.set_nrwares(nr_workers);
+	DescriptionIndex const nr_wares_or_workers = wwtype == wwWARE ?
+			player.egbase().tribes().nrwares() : player.egbase().tribes().nrworkers();
+	wares_or_workers_.set_nrwares(nr_wares_or_workers);
 
-	ware_target_quantities_ = new TargetQuantity[nr_wares];
-	for (DescriptionIndex i = 0; i < nr_wares; ++i) {
+	target_quantities_ = new TargetQuantity[nr_wares_or_workers];
+	for (DescriptionIndex i = 0; i < nr_wares_or_workers; ++i) {
 		TargetQuantity tq;
-		if (tribe.has_ware(i)) {
-			tq.permanent = tribe.get_ware_descr(i)->default_target_quantity(tribe.name());
-		} else {
-			tq.permanent = 0;
+		switch (type_) {
+			case wwWARE:
+				if (tribe.has_ware(i)) {
+					tq.permanent = tribe.get_ware_descr(i)->default_target_quantity(tribe.name());
+				} else {
+					tq.permanent = 0;
+				}
+				break;
+			case wwWORKER:
+				tq.permanent = tribe.get_worker_descr(i)->default_target_quantity();
+				break;
 		}
 		tq.last_modified = 0;
-		ware_target_quantities_[i] = tq;
-	}
-	worker_target_quantities_ = new TargetQuantity[nr_workers];
-	for (DescriptionIndex i = 0; i < nr_workers; ++i) {
-		TargetQuantity tq;
-		tq.permanent = tribe.get_worker_descr(i)->default_target_quantity();
-		tq.last_modified = 0;
-		worker_target_quantities_[i] = tq;
+		target_quantities_[i] = tq;
 	}
 
 	router_.reset(new Router(boost::bind(&Economy::reset_all_pathfinding_cycles, this)));
@@ -92,8 +96,7 @@
 	if (warehouses_.size())
 		log("Warning: Economy still has warehouses left on destruction\n");
 
-	delete[] ware_target_quantities_;
-	delete[] worker_target_quantities_;
+	delete[] target_quantities_;
 }
 
 /**
@@ -112,9 +115,9 @@
  * Since we could merge into both directions, we preserve the economy that is
  * currently bigger (should be more efficient).
  */
-void Economy::check_merge(Flag& f1, Flag& f2) {
-	Economy* e1 = f1.get_economy();
-	Economy* e2 = f2.get_economy();
+void Economy::check_merge(Flag& f1, Flag& f2, WareWorker type) {
+	Economy* e1 = f1.get_economy(type);
+	Economy* e2 = f2.get_economy(type);
 	if (e1 != e2) {
 		if (e1->get_nrflags() < e2->get_nrflags())
 			std::swap(e1, e2);
@@ -126,11 +129,11 @@
  * Notify the economy that there may no longer be a connection between
  * the given flags in the road and seafaring network.
  */
-void Economy::check_split(Flag& f1, Flag& f2) {
+void Economy::check_split(Flag& f1, Flag& f2, WareWorker type) {
 	assert(&f1 != &f2);
-	assert(f1.get_economy() == f2.get_economy());
+	assert(f1.get_economy(type) == f2.get_economy(type));
 
-	Economy* e = f1.get_economy();
+	Economy* e = f1.get_economy(type);
 	// No economy in the editor.
 	if (!e)
 		return;
@@ -151,22 +154,24 @@
 				continue;
 			if (!f1)
 				f1 = f2;
-			if (f1->get_economy() != this)
+			if (f1->get_economy(type_) != this)
 				continue;
 
 			// Handle the case when two or more roads are removed simultaneously
-			RouteAStar<AStarZeroEstimator> astar(*router_, wwWORKER, AStarZeroEstimator());
+			RouteAStar<AStarZeroEstimator> astar(*router_, type_, AStarZeroEstimator());
 			astar.push(*f1);
 			std::set<OPtr<Flag>> reachable;
-			while (RoutingNode* current = astar.step())
+			while (RoutingNode* current = astar.step()) {
 				reachable.insert(&current->base_flag());
-			if (reachable.size() != flags_.size())
+			}
+			if (reachable.size() != flags_.size()) {
 				split(reachable);
+			}
 			continue;
 		}
 
 		// If one (or both) of the flags have already been split off, we do not need to re-check
-		if (f1->get_economy() != this || f2->get_economy() != this)
+		if (f1->get_economy(type_) != this || f2->get_economy(type_) != this)
 			continue;
 
 		// Start an A-star searches from f1 with a heuristic bias towards f2,
@@ -176,7 +181,7 @@
 		// This means that the newly created economy, which contains all the
 		// flags that have been split, is already connected.
 		RouteAStar<AStarEstimator> astar(
-		   *router_, wwWORKER, AStarEstimator(*egbase.mutable_map(), *f2));
+		   *router_, type_, AStarEstimator(*egbase.mutable_map(), *f2));
 		astar.push(*f1);
 		std::set<OPtr<Flag>> reachable;
 
@@ -185,8 +190,9 @@
 			if (!current) {
 				split(reachable);
 				break;
-			} else if (current == f2)
+			} else if (current == f2) {
 				break;
+			}
 			reachable.insert(&current->base_flag());
 		}
 	}
@@ -199,11 +205,11 @@
  * merely a delegator.
  */
 bool Economy::find_route(
-   Flag& start, Flag& end, Route* const route, WareWorker const type, int32_t const cost_cutoff) {
-	assert(start.get_economy() == this);
-	assert(end.get_economy() == this);
+   Flag& start, Flag& end, Route* const route, int32_t const cost_cutoff) {
+	assert(start.get_economy(type_) == this);
+	assert(end.get_economy(type_) == this);
 	return router_->find_route(
-	   start, end, route, type, cost_cutoff, *owner().egbase().mutable_map());
+	   start, end, route, type_, cost_cutoff, *owner().egbase().mutable_map());
 }
 
 struct ZeroEstimator {
@@ -219,13 +225,11 @@
  * a route is also computed.
  *
  * \param start starting flag
- * \param type whether to path-find as if the path were for a ware
  * \param route if non-null, fill in a route to the warehouse
  * \param cost_cutoff if positive, find paths of at most
  * that length (in milliseconds)
  */
 Warehouse* Economy::find_closest_warehouse(Flag& start,
-                                           WareWorker type,
                                            Route* route,
                                            uint32_t cost_cutoff,
                                            const Economy::WarehouseAcceptFn& acceptfn) {
@@ -233,12 +237,14 @@
 		return nullptr;
 
 	// A-star with zero estimator = Dijkstra
-	RouteAStar<ZeroEstimator> astar(*router_, type);
+	RouteAStar<ZeroEstimator> astar(*router_, type_);
 	astar.push(start);
 
 	while (RoutingNode* current = astar.step()) {
-		if (cost_cutoff && current->mpf_realcost > static_cast<int32_t>(cost_cutoff))
+		if (cost_cutoff && (type_ == wwWARE ?
+							current->mpf_realcost_ware : current->mpf_realcost_worker) > static_cast<int32_t>(cost_cutoff)) {
 			return nullptr;
+		}
 
 		Flag& flag = current->base_flag();
 		if (upcast(Warehouse, warehouse, flag.get_building())) {
@@ -258,12 +264,12 @@
  * Only call from Flag init and split/merger code!
  */
 void Economy::add_flag(Flag& flag) {
-	assert(flag.get_economy() == nullptr);
+	assert(flag.get_economy(type_) == nullptr);
 
 	flags_.push_back(&flag);
-	flag.set_economy(this);
+	flag.set_economy(this, type_);
 
-	flag.reset_path_finding_cycle();
+	flag.reset_path_finding_cycle(type_);
 }
 
 /**
@@ -271,7 +277,7 @@
  * Only call from Flag cleanup and split/merger code!
  */
 void Economy::remove_flag(Flag& flag) {
-	assert(flag.get_economy() == this);
+	assert(flag.get_economy(type_) == this);
 
 	do_remove_flag(flag);
 
@@ -286,7 +292,7 @@
  * This is called from the merge code.
  */
 void Economy::do_remove_flag(Flag& flag) {
-	flag.set_economy(nullptr);
+	flag.set_economy(nullptr, type_);
 
 	// fast remove
 	for (Flags::iterator flag_iter = flags_.begin(); flag_iter != flags_.end(); ++flag_iter) {
@@ -304,7 +310,7 @@
  */
 void Economy::reset_all_pathfinding_cycles() {
 	for (Flag* flag : flags_) {
-		flag->reset_path_finding_cycle();
+		flag->reset_path_finding_cycle(type_);
 	}
 }
 
@@ -315,20 +321,17 @@
  *
  * This is called from Cmd_ResetTargetQuantity and Cmd_SetTargetQuantity
  */
-void Economy::set_ware_target_quantity(DescriptionIndex const ware_type,
+void Economy::set_target_quantity(DescriptionIndex const ware_or_worker_type,
                                        Quantity const permanent,
                                        Time const mod_time) {
-	assert(owner().egbase().tribes().ware_exists(ware_type));
-	TargetQuantity& tq = ware_target_quantities_[ware_type];
-	tq.permanent = permanent;
-	tq.last_modified = mod_time;
-}
-
-void Economy::set_worker_target_quantity(DescriptionIndex const ware_type,
-                                         Quantity const permanent,
-                                         Time const mod_time) {
-	assert(owner().egbase().tribes().worker_exists(ware_type));
-	TargetQuantity& tq = worker_target_quantities_[ware_type];
+#ifndef NDEBUG
+	if (type_ == wwWARE) {
+		assert(owner().egbase().tribes().ware_exists(ware_or_worker_type));
+	} else {
+		assert(owner().egbase().tribes().worker_exists(ware_or_worker_type));
+	}
+#endif
+	TargetQuantity& tq = target_quantities_[ware_or_worker_type];
 	tq.permanent = permanent;
 	tq.last_modified = mod_time;
 }
@@ -338,16 +341,16 @@
  * has felled a tree.
  * This is also called when a ware is added to the economy through trade or
  * a merger.
+ * Also notifies the corresponding other-type economy, if desired,
+ * so it may check e.g. whether a worker for whom a tool was missing can now be created.
  */
-void Economy::add_wares(DescriptionIndex const id, Quantity const count) {
-	wares_.add(id, count);
-	start_request_timer();
-
-	// TODO(unknown): add to global player inventory?
-}
-void Economy::add_workers(DescriptionIndex const id, Quantity const count) {
-	workers_.add(id, count);
-	start_request_timer();
+void Economy::add_wares_or_workers(DescriptionIndex const id, Quantity const count, Economy* other_economy) {
+	wares_or_workers_.add(id, count);
+	start_request_timer();
+	if (other_economy) {
+		assert(other_economy->type() != type_);
+		other_economy->start_request_timer();
+	}
 
 	// TODO(unknown): add to global player inventory?
 }
@@ -358,20 +361,15 @@
  * This is also called when a ware is removed from the economy through trade or
  * a split of the Economy.
  */
-void Economy::remove_wares(DescriptionIndex const id, Quantity const count) {
-	assert(owner_.egbase().tribes().ware_exists(id));
-	wares_.remove(id, count);
-
-	// TODO(unknown): remove from global player inventory?
-}
-
-/**
- * Call this whenever a worker is destroyed.
- * This is also called when a worker is removed from the economy through
- * a split of the Economy.
- */
-void Economy::remove_workers(DescriptionIndex const id, Quantity const count) {
-	workers_.remove(id, count);
+void Economy::remove_wares_or_workers(DescriptionIndex const id, Quantity const count) {
+#ifndef NDEBUG
+	if (type_ == wwWARE) {
+		assert(owner().egbase().tribes().ware_exists(id));
+	} else {
+		assert(owner().egbase().tribes().worker_exists(id));
+	}
+#endif
+	wares_or_workers_.remove(id, count);
 
 	// TODO(unknown): remove from global player inventory?
 }
@@ -460,51 +458,29 @@
 	supplies_.remove_supply(supply);
 }
 
-bool Economy::needs_ware(DescriptionIndex const ware_type) const {
-	Quantity const t = ware_target_quantity(ware_type).permanent;
-
-	// we have a target quantity set
-	if (t > 0) {
-		Quantity quantity = 0;
-		for (const Warehouse* wh : warehouses_) {
-			quantity += wh->get_wares().stock(ware_type);
-			if (t <= quantity)
-				return false;
-		}
-		return true;
-
-		// we have target quantity set to 0, we need to check if there is an open request
-	} else {
-		for (const Request* temp_req : requests_) {
-			const Request& req = *temp_req;
-
-			if (req.get_type() == wwWARE && req.get_index() == ware_type)
-				return true;
-		}
-		return false;
-	}
-}
-
-bool Economy::needs_worker(DescriptionIndex const worker_type) const {
-	Quantity const t = worker_target_quantity(worker_type).permanent;
-
-	// we have a target quantity set
-	if (t > 0) {
-		Quantity quantity = 0;
-		for (const Warehouse* wh : warehouses_) {
-			quantity += wh->get_workers().stock(worker_type);
-			if (t <= quantity)
-				return false;
-		}
-		return true;
-
-		// we have target quantity set to 0, we need to check if there is an open request
-	} else {
-		for (const Request* temp_req : requests_) {
-			const Request& req = *temp_req;
-
-			if (req.get_type() == wwWORKER && req.get_index() == worker_type)
-				return true;
+bool Economy::needs_ware_or_worker(DescriptionIndex const ware_or_worker_type) const {
+	Quantity const t = target_quantity(ware_or_worker_type).permanent;
+
+	// we have a target quantity set
+	if (t > 0) {
+		Quantity quantity = 0;
+		for (const Warehouse* wh : warehouses_) {
+			quantity += type_ == wwWARE ?
+					wh->get_wares().stock(ware_or_worker_type) : wh->get_workers().stock(ware_or_worker_type);
+			if (t <= quantity) {
+				return false;
+			}
+		}
+		return true;
+
+		// we have target quantity set to 0, we need to check if there is an open request
+	} else {
+		for (const Request* temp_req : requests_) {
+			const Request& req = *temp_req;
+
+			if (req.get_type() == type_ && req.get_index() == ware_or_worker_type) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -517,17 +493,10 @@
  * requests if possible.
  */
 void Economy::merge(Economy& e) {
-	for (const DescriptionIndex& ware_index : owner_.tribe().wares()) {
-		TargetQuantity other_tq = e.ware_target_quantities_[ware_index];
-		TargetQuantity& this_tq = ware_target_quantities_[ware_index];
-		if (this_tq.last_modified < other_tq.last_modified) {
-			this_tq = other_tq;
-		}
-	}
-
-	for (const DescriptionIndex& worker_index : owner_.tribe().workers()) {
-		TargetQuantity other_tq = e.worker_target_quantities_[worker_index];
-		TargetQuantity& this_tq = worker_target_quantities_[worker_index];
+	assert(e.type() == type_);
+	for (const DescriptionIndex& w_index : (type_ == wwWARE ? owner_.tribe().wares() : owner_.tribe().workers())) {
+		TargetQuantity other_tq = e.target_quantities_[w_index];
+		TargetQuantity& this_tq = target_quantities_[w_index];
 		if (this_tq.last_modified < other_tq.last_modified) {
 			this_tq = other_tq;
 		}
@@ -559,14 +528,10 @@
 void Economy::split(const std::set<OPtr<Flag>>& flags) {
 	assert(!flags.empty());
 
-	Economy* e = owner_.create_economy();
-
-	for (const DescriptionIndex& ware_index : owner_.tribe().wares()) {
-		e->ware_target_quantities_[ware_index] = ware_target_quantities_[ware_index];
-	}
-
-	for (const DescriptionIndex& worker_index : owner_.tribe().workers()) {
-		e->worker_target_quantities_[worker_index] = worker_target_quantities_[worker_index];
+	Economy* e = owner_.create_economy(type_);
+
+	for (const DescriptionIndex& w_index : (type_ == wwWARE ? owner_.tribe().wares() : owner_.tribe().workers())) {
+		e->target_quantities_[w_index] = target_quantities_[w_index];
 	}
 
 	for (const OPtr<Flag>& temp_flag : flags) {
@@ -584,11 +549,15 @@
 
 /**
  * Make sure the request timer is running.
+ * We can skip this for flagless economies (expedition ships don't need economy balancing...).
  */
 void Economy::start_request_timer(int32_t const delta) {
-	if (upcast(Game, game, &owner_.egbase()))
-		game->cmdqueue().enqueue(
-		   new CmdCallEconomyBalance(game->get_gametime() + delta, this, request_timerid_));
+	if (!flags_.empty()) {
+		if (upcast(Game, game, &owner_.egbase())) {
+			game->cmdqueue().enqueue(
+			   new CmdCallEconomyBalance(game->get_gametime() + delta, this, request_timerid_));
+		}
+	}
 }
 
 /**
@@ -642,14 +611,17 @@
 		// will be cleared by find_route()
 
 		if (!find_route(
-		       supp.get_position(game)->base_flag(), target_flag, route, req.get_type(), best_cost)) {
+		       supp.get_position(game)->base_flag(), target_flag, route, best_cost)) {
 			if (!best_route) {
-				log("Economy::find_best_supply: Error, COULD NOT FIND A ROUTE!");
+				log("Economy::find_best_supply: %s-Economy %u of player %u: Error, COULD NOT FIND A ROUTE!",
+						type_ ? "WORKER" : "WARE", serial_, owner_.player_number());
 				// To help to debug this a bit:
-				log(" ... ware at: %3dx%3d, requestor at: %3dx%3d!",
+				log(" ... ware/worker at: %3dx%3d, requestor at: %3dx%3d! Item: %s.\n",
 				    supp.get_position(game)->base_flag().get_position().x,
 				    supp.get_position(game)->base_flag().get_position().y, target_flag.get_position().x,
-				    target_flag.get_position().y);
+				    target_flag.get_position().y, type_ == wwWARE ?
+		    		game.tribes().get_ware_descr(req.get_index())->name().c_str() :
+		    		game.tribes().get_worker_descr(req.get_index())->name().c_str());
 			}
 			continue;
 		}
@@ -802,12 +774,14 @@
  * worker request without supply, attempt to create a new worker in a warehouse.
  */
 void Economy::create_requested_worker(Game& game, DescriptionIndex index) {
-	uint32_t demand = 0;
+	assert(type_ == wwWORKER);
 
 	bool soldier_level_check;
 	const TribeDescr& tribe = owner().tribe();
 	const WorkerDescr& w_desc = *tribe.get_worker_descr(index);
-	Request* open_request = nullptr;
+	// Request mapped to demand
+	std::map<Request*, uint32_t> open_requests;
+	uint32_t total_demand = 0;
 
 	// Make a dummy soldier, which should never be assigned to any economy
 	// Minimal invasive fix of bug 1236538: never create a rookie for a request
@@ -840,111 +814,96 @@
 		}
 
 		uint32_t current_demand = req.get_open_count();
-		demand += current_demand;
 		if (current_demand > 0) {
-			open_request = temp_req;
+			open_requests.emplace(temp_req, current_demand);
+			total_demand += current_demand;
 		}
 	}
 
-	if (!demand)
+	if (total_demand == 0) {
+		assert(open_requests.empty());
 		return;
+	}
+	assert(!open_requests.empty());
 
-	// We have worker demand that is not fulfilled by supplies
+	// We have worker demands that are not fulfilled by supplies.
 	// Find warehouses where we can create the required workers,
-	// and collect stats about existing build prerequisites
+	// and collect stats about existing build prerequisites.
+	// Since the wares may be in places belonging to a different worker economy,
+	// we will request their ware economies to bring them into warehouses belonging to this worker economy.
 	const WorkerDescr::Buildcost& cost = w_desc.buildcost();
-	std::vector<Quantity> total_available;
 	Quantity total_planned = 0;
-
-	total_available.insert(total_available.begin(), cost.size(), 0);
-
-	for (uint32_t n_wh = 0; n_wh < warehouses().size(); ++n_wh) {
-		Warehouse* wh = warehouses_[n_wh];
-
+	std::map<Economy*, std::map<DescriptionIndex, Quantity>> available_wares;
+
+	for (Warehouse* wh : warehouses_) {
 		uint32_t planned = wh->get_planned_workers(game, index);
 		total_planned += planned;
 
 		while (wh->can_create_worker(game, index)) {
 			wh->create_worker(game, index);
-			if (!--demand)
+			--open_requests.begin()->second;
+			--total_demand;
+			if (!open_requests.begin()->second) {
+				open_requests.erase(open_requests.begin());
+			}
+			if (total_demand == 0) {
+				assert(open_requests.empty());
 				return;
-		}
-
-		std::vector<Quantity> wh_available = wh->calc_available_for_worker(game, index);
-		assert(wh_available.size() == total_available.size());
-
-		for (Quantity idx = 0; idx < total_available.size(); ++idx)
-			total_available[idx] += wh_available[idx];
-	}
-
-	// Couldn't create enough workers now.
-	// Let's see how many we have resources for that may be scattered
-	// throughout the economy.
-	uint32_t can_create = std::numeric_limits<uint32_t>::max();
-	uint32_t idx = 0;
-	uint32_t scarcest_idx = 0;
-	bool plan_at_least_one = false;
-	for (const auto& bc : cost) {
-		uint32_t cc = total_available[idx] / bc.second;
-		if (cc <= can_create) {
-			scarcest_idx = idx;
-			can_create = cc;
-		}
-
-		// if the target quantity of a resource is set to 0
-		// plan at least one worker, so a request for that resource is triggered
-		DescriptionIndex id_w = tribe.ware_index(bc.first);
-		if (id_w != INVALID_INDEX && 0 == ware_target_quantity(id_w).permanent) {
-			plan_at_least_one = true;
-		}
-		idx++;
-	}
-
-	if (total_planned > can_create && (!plan_at_least_one || total_planned > 1)) {
-		// Eliminate some excessive plans, to make sure we never request more than
-		// there are supplies for (otherwise, cyclic transportation might happen)
-		// except in case of planAtLeastOne we continue to plan at least one
-		// Note that supplies might suddenly disappear outside our control because
-		// of loss of land or silly player actions.
-		Warehouse* wh_with_plan = nullptr;
-		for (uint32_t n_wh = 0; n_wh < warehouses().size(); ++n_wh) {
-			Warehouse* wh = warehouses_[n_wh];
-
-			uint32_t planned = wh->get_planned_workers(game, index);
-			uint32_t reduce = std::min(planned, total_planned - can_create);
-
-			if (plan_at_least_one && planned > 0) {
-				wh_with_plan = wh;
-			}
-			wh->plan_workers(game, index, planned - reduce);
-			total_planned -= reduce;
-		}
-
-		// in case of planAtLeastOne undo a set to zero
-		if (nullptr != wh_with_plan && 0 == total_planned)
-			wh_with_plan->plan_workers(game, index, 1);
-
-	} else if (total_planned < demand) {
-		uint32_t plan_goal = std::min(can_create, demand);
-
-		for (uint32_t n_wh = 0; n_wh < warehouses().size(); ++n_wh) {
-			Warehouse* wh = warehouses_[n_wh];
-			uint32_t supply = wh->calc_available_for_worker(game, index)[scarcest_idx];
-
-			total_planned -= wh->get_planned_workers(game, index);
-			uint32_t plan = std::min(supply, plan_goal - total_planned);
-			wh->plan_workers(game, index, plan);
-			total_planned += plan;
-		}
-
-		// plan at least one if required and if we haven't done already
-		// we are going to ignore stock policies of all warehouses here completely
-		// the worker we are making is not going to be stocked, there is a request for him
-		if (plan_at_least_one && 0 == total_planned) {
-			Warehouse* wh = find_closest_warehouse(open_request->target_flag());
-			if (nullptr == wh)
-				wh = warehouses_[0];
-			wh->plan_workers(game, index, 1);
+			}
+		}
+
+		Economy* eco = wh->get_economy(wwWARE);
+		for (const auto& pair : cost) {
+			DescriptionIndex di = tribe.ware_index(pair.first);
+			if (tribe.has_ware(di)) {
+				available_wares[eco][di] += eco->get_wares_or_workers().stock(di);
+			}
+		}
+	}
+
+	// Couldn't create enough workers now. Adjust the warehouses' plans to bring the wares together.
+	for (const auto& pair : available_wares) {
+		uint32_t min_workers_createable = std::numeric_limits<Quantity>::max();
+		bool plan_at_least_one = false;
+		for (const auto& costpair : cost) {
+			DescriptionIndex di = tribe.ware_index(costpair.first);
+			if (tribe.has_ware(di)) {
+				min_workers_createable = std::min(min_workers_createable, pair.second.at(di) / costpair.second);
+				plan_at_least_one |= pair.first->target_quantity(di).permanent == 0;
+			} else {
+				di = tribe.safe_worker_index(costpair.first);
+				assert(tribe.has_worker(di));
+				min_workers_createable = std::max(min_workers_createable, wares_or_workers_.stock(di));
+				// TODO(Nordfriese): As long as worker buildcosts contain only wares and carriers, this is fine.
+				// Revisit this function if we ever have a worker whose buildcost contains a worker with a buildcost.
+			}
+		}
+		for (Warehouse* wh : warehouses_) {
+			if (wh->get_economy(wwWARE) == pair.first) {
+				const uint32_t planned = wh->get_planned_workers(game, index);
+				assert(total_planned >= planned);
+				uint32_t nr_to_plan = planned;
+				if (total_planned > total_demand) {
+					// Cancel some excess plans
+					nr_to_plan -= std::min(nr_to_plan, total_planned - total_demand);
+				} else if (total_planned < total_demand) {
+					// Check how many we can plan
+					if (min_workers_createable > 0) {
+						uint32_t newly_planning = std::min(min_workers_createable, total_demand - total_planned);
+						min_workers_createable -= newly_planning;
+						nr_to_plan += newly_planning;
+					} else if (plan_at_least_one) {
+						// Plan at least one worker somewhere if a target quantity is 0 to trigger tool production
+						nr_to_plan = std::max(nr_to_plan, 1u);
+						plan_at_least_one = false;
+					}
+				}
+				wh->plan_workers(game, index, nr_to_plan);
+				total_planned = total_planned + nr_to_plan - planned;
+				if (total_planned == total_demand) {
+					return;
+				}
+			}
 		}
 	}
 }
@@ -954,7 +913,7 @@
  * try to create the worker at warehouses.
  */
 void Economy::create_requested_workers(Game& game) {
-	if (!warehouses().size())
+	if (type_ != wwWORKER || !warehouses().size())
 		return;
 
 	for (const DescriptionIndex& worker_index : owner().tribe().workers()) {
@@ -991,9 +950,10 @@
 		if (supply.has_storage())
 			continue;
 
-		WareWorker type;
+		WareWorker wwtype;
 		DescriptionIndex ware;
-		supply.get_ware_type(type, ware);
+		supply.get_ware_type(wwtype, ware);
+		assert(wwtype == type_);
 
 		bool haveprefer = false;
 		bool havenormal = false;
@@ -1005,38 +965,35 @@
 
 		for (uint32_t nwh = 0; nwh < warehouses_.size(); ++nwh) {
 			Warehouse* wh = warehouses_[nwh];
-			StockPolicy policy = wh->get_stock_policy(type, ware);
+			StockPolicy policy = wh->get_stock_policy(type_, ware);
 			if (policy == StockPolicy::kPrefer) {
 				haveprefer = true;
 
 				// Getting count of worker/ware
 				uint32_t current_stock;
-				if (type == WareWorker::wwWARE) {
-					current_stock = wh->get_wares().stock(ware);
-				} else {
-					current_stock = wh->get_workers().stock(ware);
-				}
+				current_stock = type_ == wwWARE ? wh->get_wares().stock(ware) : wh->get_workers().stock(ware);
 				// Stocks lower then in previous one?
 				if (current_stock < preferred_wh_stock) {
 					preferred_wh = wh;
 					preferred_wh_stock = current_stock;
 				}
-			}
-			if (policy == StockPolicy::kNormal)
+			} else if (policy == StockPolicy::kNormal) {
 				havenormal = true;
+			}
 		}
-		if (!havenormal && !haveprefer && type == wwWARE)
+		if (!havenormal && !haveprefer && type_ == wwWARE) {
 			continue;
+		}
 
 		// We either have one preferred warehouse picked up or walk on roads to find nearest one
 		Warehouse* wh = nullptr;
 		if (preferred_wh) {
 			wh = preferred_wh;
 		} else {
-			wh = find_closest_warehouse(supply.get_position(game)->base_flag(), type, nullptr, 0,
+			wh = find_closest_warehouse(supply.get_position(game)->base_flag(), nullptr, 0,
 			                            (!havenormal) ? WarehouseAcceptFn() :
 			                                            boost::bind(&accept_warehouse_if_policy, _1,
-			                                                        type, ware, StockPolicy::kNormal));
+			                                                        type_, ware, StockPolicy::kNormal));
 		}
 		if (!wh) {
 			log("Warning: Economy::handle_active_supplies "

=== modified file 'src/economy/economy.h'
--- src/economy/economy.h	2019-09-07 14:19:17 +0000
+++ src/economy/economy.h	2019-09-08 17:15:28 +0000
@@ -86,10 +86,19 @@
  * are \b always in the same economy, but two flags in the same economy are not always
  * connected by roads or the seafaring network - though of course, most code operates
  * on the assumption that they are, with fallbacks for when they aren't.
+ *
+ * Everything that has economies now has one economy that handles only wares and one that handles
+ * only workers. The reason for this design is that two road networks connected only by ferries
+ * are the same economy from the ware point of view, but separate economies from a worker's point
+ * of view. This fix involves the least amount of code duplication.
  */
 class Economy {
 public:
 	friend class EconomyDataPacket;
+	// TODO(Nordfriese): These 3 friends are for savegame compatibility
+	friend struct CmdCallEconomyBalance;
+	friend class MapFlagPacket;
+	friend struct Ship;
 
 	// Initialize the global serial on game start
 	static void initialize_serial();
@@ -110,8 +119,8 @@
 		Time last_modified;
 	};
 
-	explicit Economy(Player&);
-	explicit Economy(Player&, Serial serial);  // For saveloading
+	explicit Economy(Player&, WareWorker);
+	explicit Economy(Player&, Serial serial, WareWorker);  // For saveloading
 	~Economy();
 
 	Serial serial() const {
@@ -122,14 +131,17 @@
 		return owner_;
 	}
 
-	static void check_merge(Flag&, Flag&);
-	static void check_split(Flag&, Flag&);
-
-	bool find_route(Flag& start, Flag& end, Route* route, WareWorker type, int32_t cost_cutoff = -1);
+	WareWorker type() const {
+		return type_;
+	}
+
+	static void check_merge(Flag&, Flag&, WareWorker);
+	static void check_split(Flag&, Flag&, WareWorker);
+
+	bool find_route(Flag& start, Flag& end, Route* route, int32_t cost_cutoff = -1);
 
 	using WarehouseAcceptFn = boost::function<bool(Warehouse&)>;
 	Warehouse* find_closest_warehouse(Flag& start,
-	                                  WareWorker type = wwWORKER,
 	                                  Route* route = nullptr,
 	                                  uint32_t cost_cutoff = 0,
 	                                  const WarehouseAcceptFn& acceptfn = WarehouseAcceptFn());
@@ -144,14 +156,10 @@
 	// (i.e. an Expedition ship).
 	Flag* get_arbitrary_flag();
 
-	void set_ware_target_quantity(DescriptionIndex, Quantity, Time);
-	void set_worker_target_quantity(DescriptionIndex, Quantity, Time);
-
-	void add_wares(DescriptionIndex, Quantity count = 1);
-	void remove_wares(DescriptionIndex, Quantity count = 1);
-
-	void add_workers(DescriptionIndex, Quantity count = 1);
-	void remove_workers(DescriptionIndex, Quantity count = 1);
+	void set_target_quantity(DescriptionIndex, Quantity, Time);
+
+	void add_wares_or_workers(DescriptionIndex, Quantity count = 1, Economy* other_economy = nullptr);
+	void remove_wares_or_workers(DescriptionIndex, Quantity count = 1);
 
 	void add_warehouse(Warehouse&);
 	void remove_warehouse(Warehouse&);
@@ -166,34 +174,20 @@
 	void remove_supply(Supply&);
 
 	/// information about this economy
-	Quantity stock_ware(DescriptionIndex const i) {
-		return wares_.stock(i);
-	}
-	Quantity stock_worker(DescriptionIndex const i) {
-		return workers_.stock(i);
+	Quantity stock_ware_or_worker(DescriptionIndex const i) {
+		return wares_or_workers_.stock(i);
 	}
 
-	/// Whether the economy needs more of this ware type.
+	/// Whether the economy needs more of this ware/worker type.
 	/// Productionsites may ask this before they produce, to avoid depleting a
 	/// ware type by overproducing another from it.
-	bool needs_ware(DescriptionIndex) const;
-
-	/// Whether the economy needs more of this worker type.
-	/// Productionsites may ask this before they produce, to avoid depleting a
-	/// ware type by overproducing a worker type from it.
-	bool needs_worker(DescriptionIndex) const;
-
-	const TargetQuantity& ware_target_quantity(DescriptionIndex const i) const {
-		return ware_target_quantities_[i];
-	}
-	TargetQuantity& ware_target_quantity(DescriptionIndex const i) {
-		return ware_target_quantities_[i];
-	}
-	const TargetQuantity& worker_target_quantity(DescriptionIndex const i) const {
-		return worker_target_quantities_[i];
-	}
-	TargetQuantity& worker_target_quantity(DescriptionIndex const i) {
-		return worker_target_quantities_[i];
+	bool needs_ware_or_worker(DescriptionIndex) const;
+
+	const TargetQuantity& target_quantity(DescriptionIndex const i) const {
+		return target_quantities_[i];
+	}
+	TargetQuantity& target_quantity(DescriptionIndex const i) {
+		return target_quantities_[i];
 	}
 
 	void* get_options_window() const {
@@ -203,11 +197,8 @@
 		options_window_ = window;
 	}
 
-	const WareList& get_wares() const {
-		return wares_;
-	}
-	const WareList& get_workers() const {
-		return workers_;
+	const WareList& get_wares_or_workers() const {
+		return wares_or_workers_;
 	}
 
 	///< called by \ref Cmd_Call_Economy_Balance
@@ -268,15 +259,15 @@
 
 	using Flags = std::vector<Flag*>;
 	Flags flags_;
-	WareList wares_;    ///< virtual storage with all wares in this Economy
-	WareList workers_;  ///< virtual storage with all workers in this Economy
+	WareList wares_or_workers_;    ///< virtual storage with all wares/workers in this Economy
 	std::vector<Warehouse*> warehouses_;
 
+	WareWorker type_;  ///< whether we are a WareEconomy or a WorkerEconomy
+
 	RequestList requests_;  ///< requests
 	SupplyList supplies_;
 
-	TargetQuantity* ware_target_quantities_;
-	TargetQuantity* worker_target_quantities_;
+	TargetQuantity* target_quantities_;
 	std::unique_ptr<Router> router_;
 
 	using SplitPair = std::pair<OPtr<Flag>, OPtr<Flag>>;

=== modified file 'src/economy/economy_data_packet.cc'
--- src/economy/economy_data_packet.cc	2019-02-23 11:00:49 +0000
+++ src/economy/economy_data_packet.cc	2019-09-08 17:15:28 +0000
@@ -27,70 +27,116 @@
 #include "map_io/map_object_loader.h"
 #include "map_io/map_object_saver.h"
 
-constexpr uint16_t kCurrentPacketVersion = 4;
+constexpr uint16_t kCurrentPacketVersion = 5;
 
 namespace Widelands {
 
 void EconomyDataPacket::read(FileRead& fr) {
 	try {
 		uint16_t const packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersion) {
+		if (packet_version <= kCurrentPacketVersion && packet_version >= 4) {
 			const Serial saved_serial = fr.unsigned_32();
 			if (eco_->serial_ != saved_serial) {
 				throw GameDataError(
 				   "Representative flag/ship has economy serial %d, but the data packet has %d",
 				   eco_->serial_, saved_serial);
 			}
-			assert(Economy::last_economy_serial_ >= eco_->serial_);
+			// TODO(Nordfriese): Savegame compatibility
+			// assert(Economy::last_economy_serial_ >= eco_->serial_); // Uncomment when we break savegame compatibility
+			assert((packet_version == kCurrentPacketVersion) ^ (mol_ != nullptr));
+			Economy* other_eco = nullptr;
+			if (mol_) {
+				assert(eco_->type() == wwWARE);
+				const Serial serial = mol_->get_existing_economy_savegame_compatibility(eco_->serial());
+				other_eco = eco_->owner().get_economy(serial);
+				assert(other_eco);
+				assert(other_eco->type() == wwWORKER);
+			}
 			try {
 				const TribeDescr& tribe = eco_->owner().tribe();
 				while (Time const last_modified = fr.unsigned_32()) {
 					char const* const type_name = fr.c_string();
 					uint32_t const permanent = fr.unsigned_32();
-					DescriptionIndex i = tribe.ware_index(type_name);
-					if (tribe.has_ware(i)) {
-						if (tribe.get_ware_descr(i)->default_target_quantity(tribe.name()) ==
-						    kInvalidWare) {
-							log("WARNING: target quantity configured for %s, "
-							    "which should not have target quantity, "
-							    "ignoring\n",
-							    type_name);
-						} else {
-							Economy::TargetQuantity& tq = eco_->ware_target_quantities_[i];
-							if (tq.last_modified) {
-								throw GameDataError("duplicated entry for %s", type_name);
-							}
-							tq.permanent = permanent;
-							tq.last_modified = last_modified;
-						}
-					} else {
-						i = tribe.worker_index(type_name);
-						if (tribe.has_worker(i)) {
-							if (tribe.get_worker_descr(i)->default_target_quantity() == kInvalidWare) {
-								log("WARNING: target quantity configured for %s, "
-								    "which should not have target quantity, "
-								    "ignoring\n",
-								    type_name);
-							} else {
-								Economy::TargetQuantity& tq = eco_->worker_target_quantities_[i];
-								if (tq.last_modified) {
-									throw GameDataError("duplicated entry for %s", type_name);
-								}
-								tq.permanent = permanent;
-								tq.last_modified = last_modified;
-							}
-						} else {
-							log("WARNING: target quantity configured for \"%s\", "
-							    "which is not a ware or worker type defined in tribe "
-							    "%s, ignoring\n",
-							    type_name, tribe.name().c_str());
-						}
+					DescriptionIndex i;
+					switch (eco_->type()) {
+						case wwWARE:
+							i = tribe.ware_index(type_name);
+							if (tribe.has_ware(i)) {
+								if (tribe.get_ware_descr(i)->default_target_quantity(tribe.name()) ==
+									kInvalidWare) {
+									log("WARNING: target quantity configured for ware %s, "
+										"which should not have target quantity, "
+										"ignoring\n",
+										type_name);
+								} else {
+									Economy::TargetQuantity& tq = eco_->target_quantities_[i];
+									if (tq.last_modified) {
+										throw GameDataError("duplicated entry for ware %s", type_name);
+									}
+									tq.permanent = permanent;
+									tq.last_modified = last_modified;
+								}
+							} else if (other_eco) {
+								i = tribe.worker_index(type_name);
+								if (tribe.has_worker(i)) {
+									if (tribe.get_worker_descr(i)->default_target_quantity() == kInvalidWare) {
+										log("WARNING: target quantity configured for worker %s, "
+											"which should not have target quantity, "
+											"ignoring\n",
+											type_name);
+									} else {
+										Economy::TargetQuantity& tq = other_eco->target_quantities_[i];
+										if (tq.last_modified) {
+											throw GameDataError("duplicated entry for worker %s", type_name);
+										}
+										tq.permanent = permanent;
+										tq.last_modified = last_modified;
+									}
+								} else {
+									log("WARNING: target quantity configured for \"%s\" in worker economy, "
+										"which is not a worker type defined in tribe "
+										"%s, ignoring\n",
+										type_name, tribe.name().c_str());
+								}
+							} else {
+								log("WARNING: target quantity configured for \"%s\" in ware economy, "
+									"which is not a ware type defined in tribe "
+									"%s, ignoring\n",
+									type_name, tribe.name().c_str());
+							}
+							break;
+						case wwWORKER:
+							i = tribe.worker_index(type_name);
+							if (tribe.has_worker(i)) {
+								if (tribe.get_worker_descr(i)->default_target_quantity() == kInvalidWare) {
+									log("WARNING: target quantity configured for worker %s, "
+										"which should not have target quantity, "
+										"ignoring\n",
+										type_name);
+								} else {
+									Economy::TargetQuantity& tq = eco_->target_quantities_[i];
+									if (tq.last_modified) {
+										throw GameDataError("duplicated entry for worker %s", type_name);
+									}
+									tq.permanent = permanent;
+									tq.last_modified = last_modified;
+								}
+							} else {
+								log("WARNING: target quantity configured for \"%s\" in worker economy, "
+									"which is not a worker type defined in tribe "
+									"%s, ignoring\n",
+									type_name, tribe.name().c_str());
+							}
+							break;
 					}
 				}
 			} catch (const WException& e) {
 				throw GameDataError("target quantities: %s", e.what());
 			}
 			eco_->request_timerid_ = fr.unsigned_32();
+			if (other_eco) {
+				other_eco->request_timerid_ = eco_->request_timerid_;
+			}
 		} else {
 			throw UnhandledVersionError("EconomyDataPacket", packet_version, kCurrentPacketVersion);
 		}
@@ -100,6 +146,7 @@
 }
 
 void EconomyDataPacket::write(FileWrite& fw) {
+	assert(!mol_);
 	fw.unsigned_16(kCurrentPacketVersion);
 
 	// We save the serial number for sanity checks
@@ -107,19 +154,15 @@
 
 	// Requests etc.
 	const TribeDescr& tribe = eco_->owner().tribe();
-	for (const DescriptionIndex& ware_index : tribe.wares()) {
-		const Economy::TargetQuantity& tq = eco_->ware_target_quantities_[ware_index];
-		if (Time const last_modified = tq.last_modified) {
-			fw.unsigned_32(last_modified);
-			fw.c_string(tribe.get_ware_descr(ware_index)->name());
-			fw.unsigned_32(tq.permanent);
-		}
-	}
-	for (const DescriptionIndex& worker_index : tribe.workers()) {
-		const Economy::TargetQuantity& tq = eco_->worker_target_quantities_[worker_index];
-		if (Time const last_modified = tq.last_modified) {
-			fw.unsigned_32(last_modified);
-			fw.c_string(tribe.get_worker_descr(worker_index)->name());
+	for (const DescriptionIndex& w_index : (eco_->type() == wwWARE ? tribe.wares() : tribe.workers())) {
+		const Economy::TargetQuantity& tq = eco_->target_quantities_[w_index];
+		if (Time const last_modified = tq.last_modified) {
+			fw.unsigned_32(last_modified);
+			if (eco_->type() == wwWARE) {
+				fw.c_string(tribe.get_ware_descr(w_index)->name());
+			} else {
+				fw.c_string(tribe.get_worker_descr(w_index)->name());
+			}
 			fw.unsigned_32(tq.permanent);
 		}
 	}

=== modified file 'src/economy/economy_data_packet.h'
--- src/economy/economy_data_packet.h	2019-02-23 11:00:49 +0000
+++ src/economy/economy_data_packet.h	2019-09-08 17:15:28 +0000
@@ -33,7 +33,8 @@
 
 class EconomyDataPacket {
 public:
-	explicit EconomyDataPacket(Economy* e) : eco_(e) {
+	explicit EconomyDataPacket(Economy* e, const MapObjectLoader* for_savegame_compatibility_only)
+			: eco_(e), mol_(for_savegame_compatibility_only) {
 		assert(eco_);
 	}
 
@@ -42,6 +43,8 @@
 
 private:
 	Economy* eco_;
+	// TODO(Nordfriese): Savegame compatibility
+	const MapObjectLoader* mol_;
 };
 }  // namespace Widelands
 

=== modified file 'src/economy/expedition_bootstrap.cc'
--- src/economy/expedition_bootstrap.cc	2019-06-13 17:32:28 +0000
+++ src/economy/expedition_bootstrap.cc	2019-09-08 17:15:28 +0000
@@ -36,7 +36,7 @@
 namespace Widelands {
 
 ExpeditionBootstrap::ExpeditionBootstrap(PortDock* const portdock)
-   : portdock_(portdock), economy_(portdock->get_economy()) {
+   : portdock_(portdock), ware_economy_(portdock->get_economy(wwWARE)), worker_economy_(portdock->get_economy(wwWORKER)) {
 }
 
 ExpeditionBootstrap::~ExpeditionBootstrap() {
@@ -98,14 +98,16 @@
 	// Put all wares from the WaresQueues back into the warehouse
 	Warehouse* const warehouse = portdock_->get_warehouse();
 	for (std::unique_ptr<InputQueue>& iq : queues_) {
-		if (iq->get_type() == wwWARE) {
-			warehouse->insert_wares(iq->get_index(), iq->get_filled());
-		} else {
-			assert(iq->get_type() == wwWORKER);
-			WorkersQueue* wq = dynamic_cast<WorkersQueue*>(iq.get());
-			while (iq->get_filled() > 0) {
-				warehouse->incorporate_worker(game, wq->extract_worker());
-			}
+		switch (iq->get_type()) {
+			case wwWARE:
+				warehouse->insert_wares(iq->get_index(), iq->get_filled());
+				break;
+			case wwWORKER:
+				WorkersQueue* wq = dynamic_cast<WorkersQueue*>(iq.get());
+				while (iq->get_filled() > 0) {
+					warehouse->incorporate_worker(game, wq->extract_worker());
+				}
+				break;
 		}
 		iq->cleanup();
 	}
@@ -141,19 +143,24 @@
 	return return_value;
 }
 
-void ExpeditionBootstrap::set_economy(Economy* new_economy) {
-	if (new_economy == economy_)
+void ExpeditionBootstrap::set_economy(Economy* new_economy, WareWorker type) {
+	if (new_economy == (type == wwWARE ? ware_economy_ : worker_economy_))
 		return;
 
 	// Transfer the wares and workers.
 	for (std::unique_ptr<InputQueue>& iq : queues_) {
-		if (economy_)
-			iq->remove_from_economy(*economy_);
-		if (new_economy)
+		if (type != iq->get_type()) {
+			continue;
+		}
+		if (Economy* e = type == wwWARE ? ware_economy_ : worker_economy_) {
+			iq->remove_from_economy(*e);
+		}
+		if (new_economy) {
 			iq->add_to_economy(*new_economy);
+		}
 	}
 
-	economy_ = new_economy;
+	(type == wwWARE ? ware_economy_ : worker_economy_) = new_economy;
 }
 
 void ExpeditionBootstrap::get_waiting_workers_and_wares(Game& game,
@@ -161,19 +168,23 @@
                                                         std::vector<Worker*>* return_workers,
                                                         std::vector<WareInstance*>* return_wares) {
 	for (std::unique_ptr<InputQueue>& iq : queues_) {
-		if (iq->get_type() == wwWARE) {
-			const DescriptionIndex ware_index = iq->get_index();
-			for (uint32_t j = 0; j < iq->get_filled(); ++j) {
-				WareInstance* temp = new WareInstance(ware_index, tribe.get_ware_descr(ware_index));
-				temp->init(game);
-				temp->set_location(game, portdock_);
-				return_wares->emplace_back(temp);
+		switch (iq->get_type()) {
+			case wwWARE: {
+				const DescriptionIndex ware_index = iq->get_index();
+				for (uint32_t j = 0; j < iq->get_filled(); ++j) {
+					WareInstance* temp = new WareInstance(ware_index, tribe.get_ware_descr(ware_index));
+					temp->init(game);
+					temp->set_location(game, portdock_);
+					return_wares->emplace_back(temp);
+				}
+				break;
 			}
-		} else {
-			assert(iq->get_type() == wwWORKER);
-			WorkersQueue* wq = dynamic_cast<WorkersQueue*>(iq.get());
-			while (iq->get_filled() > 0) {
-				return_workers->emplace_back(wq->extract_worker());
+			case wwWORKER: {
+				WorkersQueue* wq = dynamic_cast<WorkersQueue*>(iq.get());
+				while (iq->get_filled() > 0) {
+					return_workers->emplace_back(wq->extract_worker());
+				}
+				break;
 			}
 		}
 	}

=== modified file 'src/economy/expedition_bootstrap.h'
--- src/economy/expedition_bootstrap.h	2019-06-13 17:32:28 +0000
+++ src/economy/expedition_bootstrap.h	2019-09-08 17:15:28 +0000
@@ -71,7 +71,7 @@
 	                                   std::vector<WareInstance*>* return_wares);
 
 	// Changes the economy for the wares that are already in store.
-	void set_economy(Economy* economy);
+	void set_economy(Economy* economy, WareWorker);
 
 	// Returns the wares and workers currently waiting for the expedition.
 	std::vector<InputQueue*> queues() const;
@@ -110,7 +110,8 @@
 
 	/** The Expedition is bootstapped here. */
 	PortDock* const portdock_;  // not owned
-	Economy* economy_;
+	Economy* ware_economy_;
+	Economy* worker_economy_;
 
 	std::vector<std::unique_ptr<InputQueue>> queues_;
 

=== added file 'src/economy/ferry_fleet.cc'
--- src/economy/ferry_fleet.cc	1970-01-01 00:00:00 +0000
+++ src/economy/ferry_fleet.cc	2019-09-08 17:15:28 +0000
@@ -0,0 +1,502 @@
+/*
+ * Copyright (C) 2011-2019 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#include "economy/ferry_fleet.h"
+
+#include <memory>
+
+#include "base/macros.h"
+#include "economy/economy.h"
+#include "economy/flag.h"
+#include "economy/waterway.h"
+#include "io/fileread.h"
+#include "io/filewrite.h"
+#include "logic/game.h"
+#include "logic/map_objects/checkstep.h"
+#include "logic/map_objects/tribes/ferry.h"
+#include "logic/mapastar.h"
+#include "logic/path.h"
+#include "logic/player.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
+
+namespace Widelands {
+
+namespace {
+// Every MapObject() needs to have a description. So we make a dummy one for
+// Fleet.
+FerryFleetDescr g_ferry_fleet_descr("ferry_fleet", "Ferry Fleet");
+}  // namespace
+
+const FerryFleetDescr& FerryFleet::descr() const {
+	return g_ferry_fleet_descr;
+}
+
+/**
+ * Fleets are initialized empty.
+ *
+ * Intended use: @ref Ferry and @ref Waterway, when created, create a new @ref FerryFleet
+ * instance, then add themselves \em before calling the \ref init function.
+ * The FerryFleet takes care of merging with existing fleets, if any.
+ */
+FerryFleet::FerryFleet(Player* player) : MapObject(&g_ferry_fleet_descr), act_pending_(false) {
+	owner_ = player;
+}
+
+/**
+ * Whether the fleet is in fact useful for transporting wares.
+ * This is the case if we have a ferry and a request for a ferry.
+ */
+bool FerryFleet::active() const {
+	return !ferries_.empty() && !pending_ferry_requests_.empty();
+}
+
+/**
+ * Initialize the fleet, including a search through the map
+ * to rejoin with the next other fleet we can find.
+ */
+bool FerryFleet::init(EditorGameBase& egbase) {
+	MapObject::init(egbase);
+
+	if (empty()) {
+		molog("Empty fleet initialized; disband immediately\n");
+		remove(egbase);
+		return false;
+	}
+
+	return find_other_fleet(egbase);
+}
+
+struct StepEvalFindFerryFleet {
+	StepEvalFindFerryFleet(const EditorGameBase& egbase)
+		: checkstep_(new CheckStepFerry(egbase)) {
+	}
+
+	int32_t estimate(Map& /* map */, FCoords /* pos */) const {
+		return 0;
+	}
+	int32_t stepcost(Map& map, FCoords from, int32_t /* fromcost */, WalkingDir dir, FCoords to) const {
+		return checkstep_->allowed(map, from, to, dir, CheckStep::StepId::stepNormal) ? 1 : -1;
+	}
+private:
+	std::unique_ptr<CheckStepFerry> checkstep_;
+};
+
+/**
+ * Search the map, starting at our ferries and waterways, for another fleet
+ * of the same player.
+ */
+bool FerryFleet::find_other_fleet(EditorGameBase& egbase) {
+	StepEvalFindFerryFleet stepeval(egbase);
+	MapAStar<StepEvalFindFerryFleet> astar(*egbase.mutable_map(), stepeval, wwWORKER);
+	for (const Ferry* temp_ferry : ferries_) {
+		astar.push(temp_ferry->get_position());
+	}
+	for (const auto& temp_ww : pending_ferry_requests_) {
+		for (Coords& c : temp_ww.second->get_positions(egbase)) {
+			astar.push(c);
+		}
+	}
+
+	int32_t cost;
+	FCoords cur;
+	while (astar.step(cur, cost)) {
+		if (BaseImmovable* imm = cur.field->get_immovable()) {
+			const MapObjectType type = imm->descr().type();
+			if (type == MapObjectType::WATERWAY) {
+				upcast(Waterway, ww, imm);
+				if (ww->get_fleet() != this && ww->get_owner() == get_owner()) {
+					return ww->get_fleet()->merge(egbase, this);
+				}
+			}
+		}
+
+		for (Bob* bob = cur.field->get_first_bob(); bob != nullptr; bob = bob->get_next_bob()) {
+			const MapObjectType type = bob->descr().type();
+			if (type == MapObjectType::FERRY) {
+				upcast(Ferry, ferry, bob);
+				if (ferry->get_fleet() != nullptr && ferry->get_fleet() != this &&
+					ferry->get_owner() == get_owner()) {
+					return ferry->get_fleet()->merge(egbase, this);
+				}
+			}
+		}
+	}
+
+	if (active()) {
+		update(egbase);
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Merge the @p other fleet into this fleet, and remove the other fleet.
+ *
+ * Returns true if 'other' is the resulting fleet and "false" if 'this' is
+ * the resulting fleet. The values are reversed because we originally call this from
+ * another 'other' for efficiency reasons.
+ */
+bool FerryFleet::merge(EditorGameBase& egbase, FerryFleet* other) {
+	if (ferries_.empty() && !other->ferries_.empty()) {
+		other->merge(egbase, this);
+		return true;
+	}
+
+	while (!other->ferries_.empty()) {
+		Ferry* ferry = other->ferries_.back();
+		other->ferries_.pop_back();
+		add_ferry(ferry);
+	}
+
+	while (!other->pending_ferry_requests_.empty()) {
+		auto pair = other->pending_ferry_requests_.begin();
+		uint32_t time = pair->first;
+		Waterway* ww = pair->second;
+		// set_fleet() tells the associated waterway to remove this request from the other fleet
+		ww->set_fleet(this);
+		pending_ferry_requests_.emplace(time, ww);
+	}
+
+	other->remove(egbase);
+
+	update(egbase);
+	return false;
+}
+
+void FerryFleet::cleanup(EditorGameBase& egbase) {
+	while (!ferries_.empty()) {
+		Ferry* ferry = ferries_.back();
+		if (egbase.objects().object_still_available(ferry)) {
+			ferry->set_fleet(nullptr);
+		}
+		ferries_.pop_back();
+	}
+	while (!pending_ferry_requests_.empty()) {
+		auto pair = pending_ferry_requests_.begin();
+		if (egbase.objects().object_still_available(pair->second)) {
+			pair->second->set_fleet(nullptr);
+		}
+		pending_ferry_requests_.erase(pair);
+	}
+
+	MapObject::cleanup(egbase);
+}
+
+uint32_t FerryFleet::count_ferries() const {
+	return ferries_.size();
+}
+
+uint32_t FerryFleet::count_unattended_waterways() const {
+	return pending_ferry_requests_.size();
+}
+
+// Returns true of this waterway has a ferry or a ferry is on the way there
+bool FerryFleet::has_ferry(const Waterway& ww) const {
+	if (ww.get_ferry()) {
+		return true;
+	}
+	assert(ww.get_fleet() == this);
+	for (const auto& pair : pending_ferry_requests_) {
+		if (pair.second == &ww) {
+			return false;
+		}
+	}
+	return true;
+}
+
+void FerryFleet::add_ferry(Ferry* ferry) {
+	ferries_.push_back(ferry);
+	ferry->set_fleet(this);
+}
+
+void FerryFleet::remove_ferry(EditorGameBase& egbase, Ferry* ferry) {
+	std::vector<Ferry*>::iterator it = std::find(ferries_.begin(), ferries_.end(), ferry);
+	if (it != ferries_.end()) {
+		*it = ferries_.back();
+		ferries_.pop_back();
+	}
+	ferry->set_fleet(nullptr);
+
+	if (ferry->get_location(egbase)) {
+		update(egbase);
+	}
+
+	if (empty()) {
+		remove(egbase);
+	}
+}
+
+/**
+ * Adds a request for a ferry. The request will be fulfilled as soon as possible
+ * in the next call to act(). When a ferry is found, its destination will be set to the waterway.
+ * Multiple requests will be treated first come first served.
+ */
+void FerryFleet::request_ferry(EditorGameBase& egbase, Waterway* waterway, int32_t gametime) {
+	for (const auto& pair : pending_ferry_requests_) {
+		if (pair.second == waterway) {
+			if (waterway->get_fleet() != this) {
+				waterway->set_fleet(this);
+			}
+			// One and the same request may be issued twice, e.g. when splitting a waterway – ignore
+			return;
+		}
+	}
+	pending_ferry_requests_.emplace(gametime < 0 ? egbase.get_gametime() : gametime, waterway);
+	waterway->set_fleet(this);
+}
+
+void FerryFleet::cancel_ferry_request(Game& game, Waterway* waterway) {
+	for (Ferry* ferry : ferries_) {
+		if (game.objects().object_still_available(ferry) && ferry->get_destination(game) == waterway) {
+			ferry->set_destination(game, nullptr);
+			return;
+		}
+	}
+	for (auto it = pending_ferry_requests_.begin(); it != pending_ferry_requests_.end(); ++it) {
+		if (it->second == waterway) {
+
+			pending_ferry_requests_.erase(it);
+			if (empty()) {
+				// We're no longer needed, act() will destroy us soon
+				update(game);
+			}
+			return;
+		}
+	}
+}
+
+void FerryFleet::reroute_ferry_request(Game& game, Waterway* oldww, Waterway* newww) {
+	for (Ferry* ferry : ferries_) {
+		if (ferry->get_destination(game) == oldww) {
+			ferry->set_destination(game, newww);
+			return;
+		}
+	}
+	for (auto& pair : pending_ferry_requests_) {
+		if (pair.second == oldww) {
+			pair.second = newww;
+			return;
+		}
+	}
+	log("FerryFleet::reroute_ferry_request: received order to reroute inexistent request\n");
+}
+
+bool FerryFleet::empty() const {
+	return ferries_.empty() && pending_ferry_requests_.empty();
+}
+
+/**
+ * Trigger an update of ferry scheduling
+ */
+void FerryFleet::update(EditorGameBase& egbase, uint32_t tdelta) {
+	if (act_pending_) {
+		return;
+	}
+
+	if (upcast(Game, game, &egbase)) {
+		schedule_act(*game, tdelta);
+		act_pending_ = true;
+	}
+}
+
+/**
+ * Act callback updates ferry assigning. All decisions about which ferry to assign to which waterway
+ * are supposed to be made by this function.
+ *
+ * @note Do not call this directly; instead, trigger it via @ref update
+ */
+void FerryFleet::act(Game& game, uint32_t /* data */) {
+	assert(act_pending_);
+	act_pending_ = false;
+
+	if (empty()) {
+		molog("FerryFleet::act: remove empty fleet\n");
+		remove(game);
+		return;
+	}
+
+	if (!active()) {
+		// If we are here, most likely update() was called by a pending ferry request
+		// when there are no ferries yet or by a new ferry when we can't offer
+		// employment yet. We can't handle it now, so we reschedule the act()
+		molog("FerryFleet::act: inactive, retry later\n");
+		return update(game, 5000);
+	}
+
+	molog("FerryFleet::act\n");
+
+	std::vector<Ferry*> idle_ferries;
+	for (Ferry* f : ferries_) {
+		if (f->unemployed()) {
+			idle_ferries.push_back(f);
+		}
+	}
+	while (!pending_ferry_requests_.empty() && !idle_ferries.empty()) {
+		// The map is sorted by ascending gametime
+		Waterway* ww = pending_ferry_requests_.begin()->second;
+
+		Ferry* ferry = nullptr;
+		int32_t shortest_distance = 0;
+		for (Ferry* temp_ferry : idle_ferries) {
+			// Decide how far this ferry is from the waterway
+			int32_t f_distance = game.map().findpath(
+					temp_ferry->get_position(), ww->base_flag().get_position(),
+					0, *new Path(), CheckStepFerry(game));
+			if (f_distance < 0) {
+				log("FerryFleet(%u)::act: We have a ferry (%u at %dx%d) "
+						"that can't reach one of our waterways (%u at %dx%d)!\n",
+						serial_, temp_ferry->serial(), temp_ferry->get_position().x, temp_ferry->get_position().y,
+						ww->serial(), ww->base_flag().get_position().x, ww->base_flag().get_position().y);
+				continue;
+			}
+
+			if (!ferry || f_distance < shortest_distance) {
+				ferry = temp_ferry;
+				shortest_distance = f_distance;
+			}
+		}
+		assert(ferry);
+
+		idle_ferries.erase(std::find(idle_ferries.begin(), idle_ferries.end(), ferry));
+		pending_ferry_requests_.erase(pending_ferry_requests_.begin());
+
+		ferry->start_task_row(game, ww);
+	}
+
+	if (!pending_ferry_requests_.empty()) {
+		molog("... there are %" PRIuS " waterways requesting a ferry we cannot satisfy yet\n",
+				pending_ferry_requests_.size());
+		// try again later
+		return update(game, 5000);
+	}
+}
+
+void FerryFleet::log_general_info(const EditorGameBase& egbase) const {
+	MapObject::log_general_info(egbase);
+
+	molog("%" PRIuS " ferries and %" PRIuS " waterways\n", ferries_.size(), pending_ferry_requests_.size());
+	for (const Ferry* f : ferries_) {
+		molog("* Ferry %u\n", f->serial());
+	}
+	for (const auto& pair : pending_ferry_requests_) {
+		molog("* Waterway %u (requested at %u)\n", pair.second->serial(), pair.first);
+	}
+}
+
+constexpr uint8_t kCurrentPacketVersion = 1;
+
+FerryFleet::Loader::Loader() {
+}
+
+void FerryFleet::Loader::load(FileRead& fr) {
+	MapObject::Loader::load(fr);
+
+	FerryFleet& fleet = get<FerryFleet>();
+
+	fleet.act_pending_ = fr.unsigned_8();
+
+	const uint32_t nrferries = fr.unsigned_32();
+	ferries_.resize(nrferries);
+	for (uint32_t i = 0; i < nrferries; ++i) {
+		ferries_[i] = fr.unsigned_32();
+	}
+
+	const uint32_t nrww = fr.unsigned_32();
+	for (uint32_t i = 0; i < nrww; ++i) {
+		const uint32_t gametime = fr.unsigned_32();
+		const uint32_t serial = fr.unsigned_32();
+		pending_ferry_requests_.emplace(gametime, serial);
+	}
+}
+
+void FerryFleet::Loader::load_pointers() {
+	MapObject::Loader::load_pointers();
+
+	FerryFleet& fleet = get<FerryFleet>();
+
+	// Act commands created during loading are not persistent, so we need to undo any
+	// changes to the pending state.
+	bool save_act_pending = fleet.act_pending_;
+
+	for (const uint32_t& temp_ferry : ferries_) {
+		fleet.ferries_.push_back(&mol().get<Ferry>(temp_ferry));
+		fleet.ferries_.back()->set_fleet(&fleet);
+	}
+	for (const auto& temp_ww : pending_ferry_requests_) {
+		Waterway& ww = mol().get<Waterway>(temp_ww.second);
+		fleet.pending_ferry_requests_.emplace(temp_ww.first, &ww);
+		ww.set_fleet(&fleet);
+	}
+
+	fleet.act_pending_ = save_act_pending;
+}
+
+MapObject::Loader* FerryFleet::load(EditorGameBase& egbase, MapObjectLoader& mol, FileRead& fr) {
+	std::unique_ptr<Loader> loader(new Loader);
+
+	try {
+		// The header has been peeled away by the caller
+		uint8_t const packet_version = fr.unsigned_8();
+		if (packet_version == kCurrentPacketVersion) {
+			PlayerNumber owner_number = fr.unsigned_8();
+			if (!owner_number || owner_number > egbase.map().get_nrplayers()) {
+				throw GameDataError("owner number is %u but there are only %u players", owner_number,
+				                    egbase.map().get_nrplayers());
+			}
+
+			Player* owner = egbase.get_player(owner_number);
+			if (!owner) {
+				throw GameDataError("owning player %u does not exist", owner_number);
+			}
+
+			loader->init(egbase, mol, *(new FerryFleet(owner)));
+			loader->load(fr);
+		} else {
+			throw UnhandledVersionError("FerryFleet", packet_version, kCurrentPacketVersion);
+		}
+	} catch (const std::exception& e) {
+		throw wexception("loading ferry fleet: %s", e.what());
+	}
+
+	return loader.release();
+}
+
+void FerryFleet::save(EditorGameBase& egbase, MapObjectSaver& mos, FileWrite& fw) {
+	fw.unsigned_8(HeaderFerryFleet);
+	fw.unsigned_8(kCurrentPacketVersion);
+
+	fw.unsigned_8(owner_->player_number());
+
+	MapObject::save(egbase, mos, fw);
+
+	fw.unsigned_8(act_pending_ ? 1 : 0);
+
+	fw.unsigned_32(ferries_.size());
+	for (const Ferry* temp_ferry : ferries_) {
+		fw.unsigned_32(mos.get_object_file_index(*temp_ferry));
+	}
+	fw.unsigned_32(pending_ferry_requests_.size());
+	for (const auto& temp_ww : pending_ferry_requests_) {
+		fw.unsigned_32(temp_ww.first);
+		fw.unsigned_32(mos.get_object_file_index(*temp_ww.second));
+	}
+}
+
+}  // namespace Widelands

=== added file 'src/economy/ferry_fleet.h'
--- src/economy/ferry_fleet.h	1970-01-01 00:00:00 +0000
+++ src/economy/ferry_fleet.h	2019-09-08 17:15:28 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2011-2019 by the Widelands Development Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ */
+
+#ifndef WL_ECONOMY_FERRY_FLEET_H
+#define WL_ECONOMY_FERRY_FLEET_H
+
+#include <boost/shared_ptr.hpp>
+
+#include "base/macros.h"
+#include "logic/map_objects/map_object.h"
+#include "logic/widelands_geometry.h"
+
+namespace Widelands {
+
+class Economy;
+struct Flag;
+struct RoutingNodeNeighbour;
+struct Ferry;
+struct Waterway;
+
+class FerryFleetDescr : public MapObjectDescr {
+public:
+	FerryFleetDescr(char const* const init_name, char const* const init_descname)
+	   : MapObjectDescr(MapObjectType::FERRY_FLEET, init_name, init_descname, "") {
+	}
+	~FerryFleetDescr() override {
+	}
+
+private:
+	DISALLOW_COPY_AND_ASSIGN(FerryFleetDescr);
+};
+
+/**
+ * Manage all ferries and waterways of a player that are connected by ocean.
+ *
+ * @paragraph Lifetime
+ *
+ * Fleet objects are created on-the-fly by @ref Ferry and @ref Waterway,
+ * and destroy themselves when they become empty.
+ *
+ * The intention is for fleet objects to merge automatically and separate
+ * again in reaction to changes in the map. However, this may not work
+ * properly at the moment.
+ */
+struct FerryFleet : MapObject {
+	const FerryFleetDescr& descr() const;
+
+	explicit FerryFleet(Player* player);
+
+	bool active() const;
+
+	bool init(EditorGameBase&) override;
+	void cleanup(EditorGameBase&) override;
+	void update(EditorGameBase&, uint32_t tdelta = 100);
+
+	void add_ferry(Ferry* ferry);
+	void remove_ferry(EditorGameBase& egbase, Ferry* ferry);
+
+	void log_general_info(const EditorGameBase&) const override;
+
+	uint32_t count_ferries() const;
+	uint32_t count_unattended_waterways() const;
+	bool has_ferry(const Waterway& ww) const;
+
+	void request_ferry(EditorGameBase& egbase, Waterway* waterway, int32_t gametime = -1);
+	void reroute_ferry_request(Game& game, Waterway* oldww, Waterway* newww);
+	void cancel_ferry_request(Game& game, Waterway* waterway);
+
+	bool empty() const;
+
+protected:
+	void act(Game&, uint32_t data) override;
+
+private:
+	bool find_other_fleet(EditorGameBase& egbase);
+	bool merge(EditorGameBase& egbase, FerryFleet* other);
+
+	std::vector<Ferry*> ferries_;
+	std::multimap<uint32_t, Waterway*> pending_ferry_requests_;
+
+	bool act_pending_;
+
+	// saving and loading
+protected:
+	struct Loader : MapObject::Loader {
+		Loader();
+
+		void load(FileRead&);
+		void load_pointers() override;
+
+	private:
+		std::vector<uint32_t> ferries_;
+		std::multimap<uint32_t, uint32_t> pending_ferry_requests_;
+	};
+
+public:
+	bool has_new_save_support() override {
+		return true;
+	}
+	void save(EditorGameBase&, MapObjectSaver&, FileWrite&) override;
+
+	static MapObject::Loader* load(EditorGameBase&, MapObjectLoader&, FileRead&);
+};
+
+}  // namespace Widelands
+
+#endif  // end of include guard: WL_ECONOMY_FERRY_FLEET_H

=== modified file 'src/economy/flag.cc'
--- src/economy/flag.cc	2019-07-05 11:16:24 +0000
+++ src/economy/flag.cc	2019-09-08 17:15:28 +0000
@@ -26,6 +26,7 @@
 #include "economy/request.h"
 #include "economy/road.h"
 #include "economy/ware_instance.h"
+#include "economy/waterway.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
 #include "logic/map_objects/map_object.h"
@@ -112,7 +113,7 @@
 /**
  * Creates a flag at the given location.
  */
-Flag::Flag(EditorGameBase& egbase, Player* owning_player, const Coords& coords, Economy* eco)
+Flag::Flag(EditorGameBase& egbase, Player* owning_player, const Coords& coords, Economy* ware_eco, Economy* worker_eco)
    : PlayerImmovable(g_flag_descr),
      building_(nullptr),
      ware_capacity_(8),
@@ -127,25 +128,32 @@
 
 	set_flag_position(coords);
 
-	upcast(Road, road, egbase.map().get_immovable(coords));
+	upcast(RoadBase, road, egbase.map().get_immovable(coords));
 	upcast(Game, game, &egbase);
 
 	if (game) {
-		if (eco) {
-			// We're saveloading
-			eco->add_flag(*this);
-		} else {
-			//  we split a road, or a new, standalone flag is created
-			(road ? road->get_economy() : owning_player->create_economy())->add_flag(*this);
-			if (road) {
-				road->presplit(*game, coords);
-			}
+		if (ware_eco) {
+			// We're saveloading
+			ware_eco->add_flag(*this);
+		} else {
+			//  we split a road, or a new, standalone flag is created
+			(road ? road->get_economy(wwWARE) : owning_player->create_economy(wwWARE))->add_flag(*this);
+		}
+		if (worker_eco) {
+			// We're saveloading
+			worker_eco->add_flag(*this);
+		} else {
+			//  we split a road, or a new, standalone flag is created
+			(road ? road->get_economy(wwWORKER) : owning_player->create_economy(wwWORKER))->add_flag(*this);
+		}
+		if (road && !ware_eco && !worker_eco) {
+			road->presplit(*game, coords);
 		}
 	}
 
 	init(egbase);
 
-	if (!eco && road && game) {
+	if (!ware_eco && !worker_eco && road && game) {
 		road->postsplit(*game, *this);
 	}
 }
@@ -169,30 +177,34 @@
 /**
  * Call this only from Economy code!
  */
-void Flag::set_economy(Economy* const e) {
-	Economy* const old = get_economy();
+void Flag::set_economy(Economy* const e, WareWorker type) {
+	Economy* const old = get_economy(type);
 
 	if (old == e) {
 		return;
 	}
 
-	PlayerImmovable::set_economy(e);
+	PlayerImmovable::set_economy(e, type);
 
-	for (int32_t i = 0; i < ware_filled_; ++i) {
-		wares_[i].ware->set_economy(e);
+	if (type == wwWARE) {
+		for (int32_t i = 0; i < ware_filled_; ++i) {
+			wares_[i].ware->set_economy(e);
+		}
 	}
 
 	if (building_) {
-		building_->set_economy(e);
+		building_->set_economy(e, type);
 	}
 
 	for (const FlagJob& temp_job : flag_jobs_) {
-		temp_job.request->set_economy(e);
+		if (temp_job.request->get_type() == type) {
+			temp_job.request->set_economy(e);
+		}
 	}
 
 	for (int8_t i = 0; i < 6; ++i) {
 		if (roads_[i]) {
-			roads_[i]->set_economy(e);
+			roads_[i]->set_economy(e, type);
 		}
 	}
 }
@@ -207,10 +219,11 @@
 
 	const Map& map = egbase.map();
 	egbase.set_road(
-	   map.get_fcoords(map.tl_n(position_)), RoadType::kSouthEast,
+	   map.get_fcoords(map.tl_n(position_)), WALK_SE,
 	   building_->get_size() == BaseImmovable::SMALL ? RoadType::kNormal : RoadType::kBusy);
 
-	building.set_economy(get_economy());
+	building.set_economy(get_economy(wwWARE), wwWARE);
+	building.set_economy(get_economy(wwWORKER), wwWORKER);
 }
 
 /**
@@ -219,31 +232,34 @@
 void Flag::detach_building(EditorGameBase& egbase) {
 	assert(building_);
 
-	building_->set_economy(nullptr);
+	building_->set_economy(nullptr, wwWARE);
+	building_->set_economy(nullptr, wwWORKER);
 
 	const Map& map = egbase.map();
-	egbase.set_road(map.get_fcoords(map.tl_n(position_)), RoadType::kSouthEast, RoadType::kNone);
+	egbase.set_road(map.get_fcoords(map.tl_n(position_)), WALK_SE, RoadType::kNone);
 
 	building_ = nullptr;
 }
 
 /**
- * Call this only from the Road init!
+ * Call this only from the RoadBase init!
  */
-void Flag::attach_road(int32_t const dir, Road* const road) {
+void Flag::attach_road(int32_t const dir, RoadBase* const road) {
 	assert(!roads_[dir - 1] || roads_[dir - 1] == road);
 
 	roads_[dir - 1] = road;
-	roads_[dir - 1]->set_economy(get_economy());
+	roads_[dir - 1]->set_economy(get_economy(wwWARE), wwWARE);
+	roads_[dir - 1]->set_economy(get_economy(wwWORKER), wwWORKER);
 }
 
 /**
- * Call this only from the Road init!
+ * Call this only from the RoadBase init!
  */
 void Flag::detach_road(int32_t const dir) {
 	assert(roads_[dir - 1]);
 
-	roads_[dir - 1]->set_economy(nullptr);
+	roads_[dir - 1]->set_economy(nullptr, wwWARE);
+	roads_[dir - 1]->set_economy(nullptr, wwWORKER);
 	roads_[dir - 1] = nullptr;
 }
 
@@ -261,18 +277,23 @@
  */
 void Flag::get_neighbours(WareWorker type, RoutingNodeNeighbours& neighbours) {
 	for (int8_t i = 0; i < 6; ++i) {
-		Road* const road = roads_[i];
+		RoadBase* const road = roads_[i];
 		if (!road) {
 			continue;
 		}
 
-		Flag* f = &road->get_flag(Road::FlagEnd);
+		// Only wares, workers cannot use ferries
+		if (Waterway::is_waterway_descr(&road->descr()) && type == wwWORKER) {
+		    continue;
+		}
+
+		Flag* f = &road->get_flag(RoadBase::FlagEnd);
 		int32_t nb_cost;
 		if (f != this) {
-			nb_cost = road->get_cost(Road::FlagStart);
+			nb_cost = road->get_cost(RoadBase::FlagStart);
 		} else {
-			f = &road->get_flag(Road::FlagStart);
-			nb_cost = road->get_cost(Road::FlagEnd);
+			f = &road->get_flag(RoadBase::FlagStart);
+			nb_cost = road->get_cost(RoadBase::FlagEnd);
 		}
 		if (type == wwWARE) {
 			nb_cost += nb_cost * (get_waitcost() + f->get_waitcost()) / 2;
@@ -294,10 +315,20 @@
 /**
  * \return the road that leads to the given flag.
  */
+RoadBase* Flag::get_roadbase(Flag& flag) {
+	for (int8_t i = 0; i < 6; ++i) {
+		if (RoadBase* const road = roads_[i]) {
+			if (&road->get_flag(RoadBase::FlagStart) == &flag || &road->get_flag(RoadBase::FlagEnd) == &flag) {
+				return road;
+			}
+		}
+	}
+	return nullptr;
+}
 Road* Flag::get_road(Flag& flag) {
-	for (int8_t i = 0; i < 6; ++i) {
-		if (Road* const road = roads_[i]) {
-			if (&road->get_flag(Road::FlagStart) == &flag || &road->get_flag(Road::FlagEnd) == &flag) {
+	for (int8_t i = 1; i <= 6; ++i) {
+		if (Road* const road = get_road(i)) {
+			if (&road->get_flag(RoadBase::FlagStart) == &flag || &road->get_flag(RoadBase::FlagEnd) == &flag) {
 				return road;
 			}
 		}
@@ -305,11 +336,46 @@
 	return nullptr;
 }
 
+Road* Flag::get_road(uint8_t const dir) const {
+	if (roads_[dir - 1] && Road::is_road_descr(&roads_[dir - 1]->descr())) {
+	    return dynamic_cast<Road*>(roads_[dir - 1]);
+	}
+	return nullptr;
+}
+Waterway* Flag::get_waterway(uint8_t const dir) const {
+	if (roads_[dir - 1] && Waterway::is_waterway_descr(&roads_[dir - 1]->descr())) {
+	    return dynamic_cast<Waterway*>(roads_[dir - 1]);
+	}
+	return nullptr;
+}
+
+/// \return the number of RoadBases connected to the flag
+uint8_t Flag::nr_of_roadbases() const {
+	uint8_t counter = 0;
+	for (uint8_t road_id = 6; road_id; --road_id) {
+		if (get_roadbase(road_id) != nullptr) {
+			++counter;
+		}
+	}
+	return counter;
+}
+
 /// \return the number of roads connected to the flag.
 uint8_t Flag::nr_of_roads() const {
 	uint8_t counter = 0;
 	for (uint8_t road_id = 6; road_id; --road_id) {
-		if (get_road(road_id) != nullptr) {
+		if (get_roadbase(road_id) != nullptr) {
+			++counter;
+		}
+	}
+	return counter;
+}
+
+/// \return the number of waterways connected to the flag.
+uint8_t Flag::nr_of_waterways() const {
+	uint8_t counter = 0;
+	for (uint8_t road_id = 6; road_id; --road_id) {
+		if (get_waterway(road_id) != nullptr) {
 			++counter;
 		}
 	}
@@ -322,9 +388,9 @@
 	}
 	Flag const* first_other_flag = nullptr;
 	for (uint8_t road_id = 6; road_id; --road_id) {
-		if (Road* const road = get_road(road_id)) {
-			Flag& start = road->get_flag(Road::FlagStart);
-			Flag& other = this == &start ? road->get_flag(Road::FlagEnd) : start;
+		if (RoadBase* const road = get_roadbase(road_id)) {
+			Flag& start = road->get_flag(RoadBase::FlagStart);
+			Flag& other = this == &start ? road->get_flag(RoadBase::FlagEnd) : start;
 			if (first_other_flag) {
 				if (&other != first_other_flag)
 					return false;
@@ -557,7 +623,7 @@
 	// Calculate the sum of the involved wallets' adjusted value
 	int32_t sum = 0;
 	for (int8_t i = 0; i < WalkingDir::LAST_DIRECTION; ++i) {
-		Road* const road = roads_[i];
+		Road* const road = get_road(i);
 		if (road && road != promoted_road) {
 			sum += kRoadMaxWallet + road->wallet() * road->wallet();
 		}
@@ -565,7 +631,7 @@
 
 	// Distribute propagation coins in a smart way
 	for (int8_t i = 0; i < WalkingDir::LAST_DIRECTION; ++i) {
-		Road* const road = roads_[i];
+		Road* const road = get_road(i);
 		if (road && road->get_roadtype() != RoadType::kBusy) {
 			road->add_to_wallet(0.5 * (kRoadMaxWallet - road->wallet()) *
 			                    (kRoadMaxWallet + road->wallet() * road->wallet()) / sum);
@@ -684,20 +750,20 @@
 	const Flag& nextflag = dynamic_cast<const Flag&>(*nextstep);
 
 	for (int32_t dir = 1; dir <= 6; ++dir) {
-		Road* const road = get_road(dir);
+		RoadBase* const road = get_roadbase(dir);
 		Flag* other;
-		Road::FlagId flagid;
+		RoadBase::FlagId flagid;
 
 		if (!road) {
 			continue;
 		}
 
-		if (&road->get_flag(Road::FlagStart) == this) {
-			flagid = Road::FlagStart;
-			other = &road->get_flag(Road::FlagEnd);
+		if (&road->get_flag(RoadBase::FlagStart) == this) {
+			flagid = RoadBase::FlagStart;
+			other = &road->get_flag(RoadBase::FlagEnd);
 		} else {
-			flagid = Road::FlagEnd;
-			other = &road->get_flag(Road::FlagStart);
+			flagid = RoadBase::FlagEnd;
+			other = &road->get_flag(RoadBase::FlagStart);
 		}
 
 		if (other != &nextflag) {
@@ -775,7 +841,10 @@
 		}
 	}
 
-	if (Economy* e = get_economy()) {
+	if (Economy* e = get_economy(wwWARE)) {
+		e->remove_flag(*this);
+	}
+	if (Economy* e = get_economy(wwWORKER)) {
 		e->remove_flag(*this);
 	}
 

=== modified file 'src/economy/flag.h'
--- src/economy/flag.h	2019-04-24 06:01:37 +0000
+++ src/economy/flag.h	2019-09-08 17:15:28 +0000
@@ -33,7 +33,9 @@
 namespace Widelands {
 class Building;
 class Request;
+struct RoadBase;
 struct Road;
+struct Waterway;
 class WareInstance;
 
 class FlagDescr : public MapObjectDescr {
@@ -51,9 +53,10 @@
 /**
  * Flag represents a flag as you see it on the map.
  *
- * A flag itself doesn't do much. However, it can have up to 6 roads attached
- * to it. Instead of the WALK_NW road, it can also have a building attached to
- * it. Flags also have a store of up to 8 wares.
+ * A flag itself doesn't do much. However, it can have up to 6 roads/waterways
+ * attached to it. Instead of the WALK_NW road, it can also have a building
+ * attached to it. It cannot have more than one waterway.
+ * Flags also have a store of up to 8 wares.
  *
  * You can also assign an arbitrary number of "jobs" for a flag.
  * A job consists of a request for a worker, and the name of a program that the
@@ -80,7 +83,8 @@
 
 	/// Create a new flag. Only specify an economy during saveloading.
 	/// Otherwise, a new economy will be created automatically if needed.
-	Flag(EditorGameBase&, Player* owner, const Coords&, Economy* economy = nullptr);
+	Flag(EditorGameBase&, Player* owner, const Coords&,
+			Economy* ware_economy = nullptr, Economy* worker_economy = nullptr);
 	~Flag() override;
 
 	void load_finish(EditorGameBase&) override;
@@ -100,7 +104,7 @@
 		return ware_filled_;
 	}
 
-	void set_economy(Economy*) override;
+	void set_economy(Economy*, WareWorker) override;
 
 	Building* get_building() const {
 		return building_;
@@ -108,16 +112,27 @@
 	void attach_building(EditorGameBase&, Building&);
 	void detach_building(EditorGameBase&);
 
+	bool has_roadbase() const {
+		return roads_[0] || roads_[1] || roads_[2] || roads_[3] || roads_[4] || roads_[5];
+	}
+	bool has_waterway() const {
+		return nr_of_waterways() > 0;
+	}
 	bool has_road() const {
-		return roads_[0] || roads_[1] || roads_[2] || roads_[3] || roads_[4] || roads_[5];
+		return nr_of_roads() > 0;
 	}
-	Road* get_road(uint8_t const dir) const {
+	RoadBase* get_roadbase(uint8_t dir) const {
 		return roads_[dir - 1];
 	}
+	Road* get_road(uint8_t dir) const;
+	Waterway* get_waterway(uint8_t dir) const;
+	uint8_t nr_of_roadbases() const;
 	uint8_t nr_of_roads() const;
-	void attach_road(int32_t dir, Road*);
+	uint8_t nr_of_waterways() const;
+	void attach_road(int32_t dir, RoadBase*);
 	void detach_road(int32_t dir);
 
+	RoadBase* get_roadbase(Flag&);
 	Road* get_road(Flag&);
 
 	bool is_dead_end() const;
@@ -184,7 +199,7 @@
 	int32_t animstart_;
 
 	Building* building_;  ///< attached building (replaces road WALK_NW)
-	Road* roads_[WalkingDir::LAST_DIRECTION];
+	RoadBase* roads_[WalkingDir::LAST_DIRECTION];
 
 	int32_t ware_capacity_;  ///< size of wares_ array
 	int32_t ware_filled_;    ///< number of wares currently on the flag

=== modified file 'src/economy/idleworkersupply.cc'
--- src/economy/idleworkersupply.cc	2019-02-23 11:00:49 +0000
+++ src/economy/idleworkersupply.cc	2019-09-08 17:15:28 +0000
@@ -36,7 +36,7 @@
  * Automatically register with the worker's economy.
  */
 IdleWorkerSupply::IdleWorkerSupply(Worker& w) : worker_(w), economy_(nullptr) {
-	set_economy(w.get_economy());
+	set_economy(w.get_economy(wwWORKER));
 }
 
 /**

=== modified file 'src/economy/input_queue.cc'
--- src/economy/input_queue.cc	2019-06-13 17:32:28 +0000
+++ src/economy/input_queue.cc	2019-09-08 17:15:28 +0000
@@ -179,8 +179,9 @@
 			throw UnhandledVersionError("InputQueue", packet_version, kCurrentPacketVersion);
 		}
 		//  Now Economy stuff. We have to add our filled items to the economy.
-		if (owner_.get_economy())
-			add_to_economy(*owner_.get_economy());
+		if (owner_.get_economy(type_)) {
+			add_to_economy(*owner_.get_economy(type_));
+		}
 	} catch (const GameDataError& e) {
 		throw GameDataError("inputqueue: %s", e.what());
 	}
@@ -190,12 +191,15 @@
 	fw.unsigned_16(kCurrentPacketVersion);
 
 	//  Owner and callback is not saved, but this should be obvious on load.
-	if (type_ == wwWARE) {
-		fw.unsigned_8(0);
-		fw.c_string(owner().tribe().get_ware_descr(index_)->name().c_str());
-	} else {
-		fw.unsigned_8(1);
-		fw.c_string(owner().tribe().get_worker_descr(index_)->name().c_str());
+	switch (type_) {
+		case wwWARE:
+			fw.unsigned_8(0);
+			fw.c_string(owner().tribe().get_ware_descr(index_)->name().c_str());
+			break;
+		case wwWORKER:
+			fw.unsigned_8(1);
+			fw.c_string(owner().tribe().get_worker_descr(index_)->name().c_str());
+			break;
 	}
 	fw.signed_32(max_size_);
 	fw.signed_32(max_fill_);

=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc	2019-07-01 14:58:07 +0000
+++ src/economy/portdock.cc	2019-09-08 17:15:28 +0000
@@ -26,7 +26,7 @@
 #include "base/log.h"
 #include "base/macros.h"
 #include "economy/expedition_bootstrap.h"
-#include "economy/fleet.h"
+#include "economy/ship_fleet.h"
 #include "economy/ware_instance.h"
 #include "economy/wares_queue.h"
 #include "io/filewrite.h"
@@ -83,11 +83,11 @@
 }
 
 /**
- * Update which @ref Fleet we belong to.
+ * Update which @ref ShipFleet we belong to.
  *
- * @warning This should only be called via @ref Fleet itself.
+ * @warning This should only be called via @ref ShipFleet itself.
  */
-void PortDock::set_fleet(Fleet* fleet) {
+void PortDock::set_fleet(ShipFleet* fleet) {
 	fleet_ = fleet;
 }
 
@@ -125,24 +125,27 @@
  * Signal to the dock that it now belongs to the given economy.
  *
  * Called by @ref Warehouse::set_economy, and responsible for forwarding the
- * change to @ref Fleet.
+ * change to @ref ShipFleet.
  */
-void PortDock::set_economy(Economy* e) {
-	if (e == get_economy())
+void PortDock::set_economy(Economy* e, WareWorker type) {
+	if (e == get_economy(type)) {
 		return;
+	}
 
-	PlayerImmovable::set_economy(e);
-	if (fleet_)
-		fleet_->set_economy(e);
+	PlayerImmovable::set_economy(e, type);
+	if (fleet_) {
+		fleet_->set_economy(e, type);
+	}
 
 	if (upcast(Game, game, &get_owner()->egbase())) {
 		for (ShippingItem& shipping_item : waiting_) {
-			shipping_item.set_economy(*game, e);
+			shipping_item.set_economy(*game, e, type);
 		}
 	}
 
-	if (expedition_bootstrap_)
-		expedition_bootstrap_->set_economy(e);
+	if (expedition_bootstrap_) {
+		expedition_bootstrap_->set_economy(e, type);
+	}
 }
 
 bool PortDock::init(EditorGameBase& egbase) {
@@ -157,11 +160,11 @@
 }
 
 /**
- * Create our initial singleton @ref Fleet. The fleet code ensures
+ * Create our initial singleton @ref ShipFleet. The fleet code ensures
  * that we merge with a larger fleet when possible.
  */
 void PortDock::init_fleet(EditorGameBase& egbase) {
-	Fleet* fleet = new Fleet(get_owner());
+	ShipFleet* fleet = new ShipFleet(get_owner());
 	fleet->add_port(egbase, this);
 	fleet->init(egbase);
 	// Note: the Fleet calls our set_fleet automatically
@@ -287,7 +290,7 @@
 	assert(dst != this);
 
 	// Destination might have vanished or be in another economy altogether.
-	if (dst && dst->get_economy() == get_economy()) {
+	if (dst && dst->get_economy(wwWARE) == get_economy(wwWARE) && dst->get_economy(wwWORKER) == get_economy(wwWORKER)) {
 		if (ships_coming_ <= 0) {
 			set_need_ship(game, true);
 		}
@@ -435,12 +438,17 @@
 		Worker* worker;
 		shipping_item.get(owner().egbase(), &ware, &worker);
 
-		if (waretype == wwWORKER) {
-			if (worker && worker->descr().worker_index() == wareindex)
-				count++;
-		} else {
-			if (ware && ware->descr_index() == wareindex)
-				count++;
+		switch (waretype) {
+			case wwWORKER:
+				if (worker && worker->descr().worker_index() == wareindex) {
+					count++;
+				}
+				break;
+			case wwWARE:
+				if (ware && ware->descr_index() == wareindex) {
+					count++;
+				}
+				break;
 		}
 	}
 

=== modified file 'src/economy/portdock.h'
--- src/economy/portdock.h	2019-07-05 11:16:24 +0000
+++ src/economy/portdock.h	2019-09-08 17:15:28 +0000
@@ -30,7 +30,7 @@
 
 namespace Widelands {
 
-struct Fleet;
+struct ShipFleet;
 struct RoutingNodeNeighbour;
 struct Ship;
 class Warehouse;
@@ -68,7 +68,7 @@
  * port that is on a land bridge and therefore close to two
  * disconnected bodies of water. Such a port would have to have
  * two PortDock that belong to the same @ref Warehouse, but have
- * separate @ref Fleet instances.
+ * separate @ref ShipFleet instances.
  * However, we expect this to be such a rare case that it is not
  * implemented at the moment.
  */
@@ -82,13 +82,13 @@
 	void add_position(Widelands::Coords where);
 	Warehouse* get_warehouse() const;
 
-	Fleet* get_fleet() const {
+	ShipFleet* get_fleet() const {
 		return fleet_;
 	}
 	PortDock* get_dock(Flag& flag) const;
 	uint32_t get_need_ship() const;
 
-	void set_economy(Economy*) override;
+	void set_economy(Economy*, WareWorker) override;
 
 	int32_t get_size() const override;
 	bool get_passable() const override;
@@ -132,18 +132,18 @@
 	void expedition_bootstrap_complete(Game& game);
 
 private:
-	friend struct Fleet;
+	friend struct ShipFleet;
 
 	// Does nothing - we do not show them on the map
 	void draw(uint32_t, TextToDraw, const Vector2f&, const Coords&, float, RenderTarget*) override {
 	}
 
 	void init_fleet(EditorGameBase& egbase);
-	void set_fleet(Fleet* fleet);
+	void set_fleet(ShipFleet* fleet);
 	void update_shippingitem(Game&, std::list<ShippingItem>::iterator);
 	void set_need_ship(Game&, bool need);
 
-	Fleet* fleet_;
+	ShipFleet* fleet_;
 	Warehouse* warehouse_;
 	PositionList dockpoints_;
 	std::list<ShippingItem> waiting_;

=== modified file 'src/economy/request.cc'
--- src/economy/request.cc	2019-06-19 07:34:19 +0000
+++ src/economy/request.cc	2019-09-08 17:15:28 +0000
@@ -57,7 +57,7 @@
      target_productionsite_(dynamic_cast<ProductionSite*>(&init_target)),
      target_warehouse_(dynamic_cast<Warehouse*>(&init_target)),
      target_constructionsite_(dynamic_cast<ConstructionSite*>(&init_target)),
-     economy_(init_target.get_economy()),
+     economy_(init_target.get_economy(w)),
      index_(index),
      count_(1),
      exact_match_(false),
@@ -179,12 +179,15 @@
 	//  Target and economy should be set. Same is true for callback stuff.
 
 	assert(type_ == wwWARE || type_ == wwWORKER);
-	if (type_ == wwWARE) {
-		assert(game.tribes().ware_exists(index_));
-		fw.c_string(game.tribes().get_ware_descr(index_)->name());
-	} else if (type_ == wwWORKER) {
-		assert(game.tribes().worker_exists(index_));
-		fw.c_string(game.tribes().get_worker_descr(index_)->name());
+	switch (type_) {
+		case wwWARE:
+			assert(game.tribes().ware_exists(index_));
+			fw.c_string(game.tribes().get_ware_descr(index_)->name());
+			break;
+		case wwWORKER:
+			assert(game.tribes().worker_exists(index_));
+			fw.c_string(game.tribes().get_worker_descr(index_)->name());
+			break;
 	}
 
 	fw.unsigned_32(count_);
@@ -389,20 +392,25 @@
 	ss.unsigned_32(supp.get_position(game)->serial());
 
 	Transfer* t;
-	if (get_type() == wwWORKER) {
-		//  Begin the transfer of a soldier or worker.
-		//  launch_worker() creates or starts the worker
-		Worker& s = supp.launch_worker(game, *this);
-		ss.unsigned_32(s.serial());
-		t = new Transfer(game, *this, s);
-	} else {
-		//  Begin the transfer of an ware. The ware itself is passive.
-		//  launch_ware() ensures the WareInstance is transported out of the
-		//  warehouse. Once it's on the flag, the flag code will decide what to
-		//  do with it.
-		WareInstance& ware = supp.launch_ware(game, *this);
-		ss.unsigned_32(ware.serial());
-		t = new Transfer(game, *this, ware);
+	switch (get_type()) {
+		case wwWORKER: {
+			//  Begin the transfer of a soldier or worker.
+			//  launch_worker() creates or starts the worker
+			Worker& s = supp.launch_worker(game, *this);
+			ss.unsigned_32(s.serial());
+			t = new Transfer(game, *this, s);
+			break;
+		}
+		case wwWARE: {
+			//  Begin the transfer of n ware. The ware itself is passive.
+			//  launch_ware() ensures the WareInstance is transported out of the
+			//  warehouse. Once it's on the flag, the flag code will decide what to
+			//  do with it.
+			WareInstance& ware = supp.launch_ware(game, *this);
+			ss.unsigned_32(ware.serial());
+			t = new Transfer(game, *this, ware);
+			break;
+		}
 	}
 
 	transfers_.push_back(t);

=== modified file 'src/economy/road.cc'
--- src/economy/road.cc	2019-07-01 14:58:07 +0000
+++ src/economy/road.cc	2019-09-08 17:15:28 +0000
@@ -37,32 +37,23 @@
 const RoadDescr g_road_descr("road", "Road");
 }
 
-const RoadDescr& Road::descr() const {
-	return g_road_descr;
-}
-
 bool Road::is_road_descr(MapObjectDescr const* const descr) {
 	return descr == &g_road_descr;
 }
 
+Road::CarrierSlot::CarrierSlot() : carrier(nullptr), carrier_request(nullptr), second_carrier(false) {
+}
+
 /**
  * Most of the actual work is done in init.
  */
 Road::Road()
-   : PlayerImmovable(g_road_descr), wallet_(0), last_wallet_charge_(0), type_(0), idle_index_(0) {
-	flags_[0] = flags_[1] = nullptr;
-	flagidx_[0] = flagidx_[1] = -1;
-
-	// Initialize the worker slots for the road
-	// TODO(unknown): make this configurable
+   : RoadBase(g_road_descr, RoadType::kNone), wallet_(0), last_wallet_charge_(0) {
 	CarrierSlot slot;
-	carrier_slots_.push_back(slot);
-	carrier_slots_.push_back(slot);
-	carrier_slots_[0].carrier_type = 1;
-	carrier_slots_[1].carrier_type = 2;
-}
-
-Road::CarrierSlot::CarrierSlot() : carrier(nullptr), carrier_request(nullptr), carrier_type(0) {
+    carrier_slots_.push_back(slot);
+    carrier_slots_.push_back(slot);
+	carrier_slots_[0].second_carrier = false;
+	carrier_slots_[1].second_carrier = true;
 }
 
 /**
@@ -95,185 +86,9 @@
 	return road;
 }
 
-int32_t Road::get_size() const {
-	return SMALL;
-}
-
-bool Road::get_passable() const {
-	return true;
-}
-
-BaseImmovable::PositionList Road::get_positions(const EditorGameBase& egbase) const {
-	const Map& map = egbase.map();
-	Coords curf = map.get_fcoords(path_.get_start());
-
-	PositionList rv;
-	const Path::StepVector::size_type nr_steps = path_.get_nsteps();
-	for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps) {
-		if (steps > 0 && steps < path_.get_nsteps())
-			rv.push_back(curf);
-
-		if (steps < path_.get_nsteps())
-			map.get_neighbour(curf, path_[steps], &curf);
-	}
-	return rv;
-}
-
-Flag& Road::base_flag() {
-	return *flags_[FlagStart];
-}
-
-/**
- * Return the cost of getting from fromflag to the other flag.
- */
-int32_t Road::get_cost(FlagId fromflag) {
-	return cost_[fromflag];
-}
-
-/**
- * Set the new path, calculate costs.
- * You have to set start and end flags before calling this function.
- */
-void Road::set_path(EditorGameBase& egbase, const Path& path) {
-	assert(path.get_nsteps() >= 2);
-	assert(path.get_start() == flags_[FlagStart]->get_position());
-	assert(path.get_end() == flags_[FlagEnd]->get_position());
-
-	path_ = path;
-	egbase.map().calc_cost(path, &cost_[FlagStart], &cost_[FlagEnd]);
-
-	// Figure out where carriers should idle
-	idle_index_ = path.get_nsteps() / 2;
-}
-
-/**
- * Add road markings to the map
- */
-void Road::mark_map(EditorGameBase& egbase) {
-	const Map& map = egbase.map();
-	FCoords curf = map.get_fcoords(path_.get_start());
-
-	const Path::StepVector::size_type nr_steps = path_.get_nsteps();
-	for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps) {
-		if (steps > 0 && steps < path_.get_nsteps())
-			set_position(egbase, curf);
-
-		// mark the road that leads up to this field
-		if (steps > 0) {
-			const Direction dir = get_reverse_dir(path_[steps - 1]);
-			Direction const rdir = 2 * (dir - WALK_E);
-
-			if (rdir <= 4)
-				egbase.set_road(curf, rdir, type_);
-		}
-
-		// mark the road that leads away from this field
-		if (steps < path_.get_nsteps()) {
-			const Direction dir = path_[steps];
-			Direction const rdir = 2 * (dir - WALK_E);
-
-			if (rdir <= 4)
-				egbase.set_road(curf, rdir, type_);
-
-			map.get_neighbour(curf, dir, &curf);
-		}
-	}
-}
-
-/**
- * Remove road markings from the map
- */
-void Road::unmark_map(EditorGameBase& egbase) {
-	const Map& map = egbase.map();
-	FCoords curf(path_.get_start(), &map[path_.get_start()]);
-
-	const Path::StepVector::size_type nr_steps = path_.get_nsteps();
-	for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps) {
-		if (steps > 0 && steps < path_.get_nsteps())
-			unset_position(egbase, curf);
-
-		// mark the road that leads up to this field
-		if (steps > 0) {
-			const Direction dir = get_reverse_dir(path_[steps - 1]);
-			Direction const rdir = 2 * (dir - WALK_E);
-
-			if (rdir <= 4)
-				egbase.set_road(curf, rdir, RoadType::kNone);
-		}
-
-		// mark the road that leads away from this field
-		if (steps < path_.get_nsteps()) {
-			const Direction dir = path_[steps];
-			Direction const rdir = 2 * (dir - WALK_E);
-
-			if (rdir <= 4)
-				egbase.set_road(curf, rdir, RoadType::kNone);
-
-			map.get_neighbour(curf, dir, &curf);
-		}
-	}
-}
-
-/**
- * Initialize the road.
- */
-bool Road::init(EditorGameBase& egbase) {
-	PlayerImmovable::init(egbase);
-
-	if (2 <= path_.get_nsteps())
-		link_into_flags(egbase);
-	return true;
-}
-
-/**
- * This links into the flags, calls a carrier
- * and so on. This was formerly done in init (and
- * still is for normal games). But for save game loading
- * we needed to have this road already registered
- * as Map Object, thats why this is moved
- */
-void Road::link_into_flags(EditorGameBase& egbase) {
-	assert(path_.get_nsteps() >= 2);
-
-	// Link into the flags (this will also set our economy)
-	{
-		const Direction dir = path_[0];
-		flags_[FlagStart]->attach_road(dir, this);
-		flagidx_[FlagStart] = dir;
-	}
-
-	const Direction dir = get_reverse_dir(path_[path_.get_nsteps() - 1]);
-	flags_[FlagEnd]->attach_road(dir, this);
-	flagidx_[FlagEnd] = dir;
-
-	Economy::check_merge(*flags_[FlagStart], *flags_[FlagEnd]);
-
-	// Mark Fields
-	mark_map(egbase);
-
-	/*
-	 * Iterate over all Carrierslots
-	 * If a carrier is set assign it to this road, else
-	 * request a new carrier
-	 */
-	if (upcast(Game, game, &egbase)) {
-		for (CarrierSlot& slot : carrier_slots_) {
-			if (Carrier* const carrier = slot.carrier.get(*game)) {
-				//  This happens after a road split. Tell the carrier what's going on.
-				carrier->set_location(this);
-				carrier->update_task_road(*game);
-			} else if (!slot.carrier_request && (slot.carrier_type == 1 || type_ == RoadType::kBusy)) {
-				request_carrier(slot);
-			}
-		}
-	}
-}
-
-/**
- * Cleanup the road
- */
 void Road::cleanup(EditorGameBase& egbase) {
-
+	Economy::check_split(*flags_[FlagStart], *flags_[FlagEnd], wwWARE);
+	Economy::check_split(*flags_[FlagStart], *flags_[FlagEnd], wwWORKER);
 	for (CarrierSlot& slot : carrier_slots_) {
 		delete slot.carrier_request;
 		slot.carrier_request = nullptr;
@@ -281,34 +96,34 @@
 		// carrier will be released via PlayerImmovable::cleanup
 		slot.carrier = nullptr;
 	}
-
-	// Unmark Fields
-	unmark_map(egbase);
-
-	// Unlink from flags (also clears the economy)
-	flags_[FlagStart]->detach_road(flagidx_[FlagStart]);
-	flags_[FlagEnd]->detach_road(flagidx_[FlagEnd]);
-
-	Economy::check_split(*flags_[FlagStart], *flags_[FlagEnd]);
-
+	RoadBase::cleanup(egbase);
+}
+
+void Road::link_into_flags(EditorGameBase& egbase, bool) {
+	RoadBase::link_into_flags(egbase);
+	Economy::check_merge(*flags_[FlagStart], *flags_[FlagEnd], wwWARE);
+	Economy::check_merge(*flags_[FlagStart], *flags_[FlagEnd], wwWORKER);
 	if (upcast(Game, game, &egbase)) {
-		flags_[FlagStart]->update_wares(*game, flags_[FlagEnd]);
-		flags_[FlagEnd]->update_wares(*game, flags_[FlagStart]);
+		for (CarrierSlot& slot : carrier_slots_) {
+			if (Carrier* const carrier = slot.carrier.get(*game)) {
+				// This happens after a road split. Tell the carrier what's going on.
+				carrier->set_location(this);
+				carrier->update_task_road(*game);
+			} else if (!slot.carrier_request && (!slot.second_carrier || get_roadtype() == RoadType::kBusy)) {
+				// Normal carriers are requested at once, second carriers only for busy roads
+				request_carrier(slot);
+			}
+		}
 	}
-
-	PlayerImmovable::cleanup(egbase);
 }
 
-/**
- * Workers' economies are fixed by PlayerImmovable, but we need to handle
- * any requests ourselves.
- */
-void Road::set_economy(Economy* const e) {
-	PlayerImmovable::set_economy(e);
-
-	for (CarrierSlot& slot : carrier_slots_) {
-		if (slot.carrier_request) {
-			slot.carrier_request->set_economy(e);
+void Road::set_economy(Economy* const e, WareWorker type) {
+	RoadBase::set_economy(e, type);
+	if (type == wwWORKER) {
+		for (CarrierSlot& slot : carrier_slots_) {
+			if (slot.carrier_request) {
+				slot.carrier_request->set_economy(e);
+			}
 		}
 	}
 }
@@ -320,12 +135,8 @@
  * been issued.
  */
 void Road::request_carrier(CarrierSlot& slot) {
-	if (slot.carrier_type == 1)
-		slot.carrier_request =
-		   new Request(*this, owner().tribe().carrier(), Road::request_carrier_callback, wwWORKER);
-	else
-		slot.carrier_request =
-		   new Request(*this, owner().tribe().carrier2(), Road::request_carrier_callback, wwWORKER);
+	slot.carrier_request = new Request(*this, slot.second_carrier ? owner().tribe().carrier2() :
+			owner().tribe().carrier(), request_carrier_callback, wwWORKER);
 }
 
 /**
@@ -400,15 +211,6 @@
 }
 
 /**
- * A flag has been placed that splits this road. This function is called before
- * the new flag initializes. We remove markings to avoid interference with the
- * flag.
- */
-void Road::presplit(Game& game, Coords) {
-	unmark_map(game);
-}