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

[Notabilis]

Implements a worker queue which allows production buildings to consume
workers as input.

Adds:
- Adds worker queue for production buildings.
- The "inputs" in the lua files for the buildings can now contains worker names and amounts.
- Production programs can consume workers from the queues.

Changes:
- The barracks-building (new in trunk) now requests and stores carriers required for recruiting.
- Soldiers can no longer be created in warehouses.
- Renamed the c-for-lua function {set,get,valid}_wares() of production buildings to {set,get,valid}_inputs() since they now be used to set the to-be-consumed workers.
- Modified the lua function prefilled_buildings() to required the argument "inputs" instead of "wares" for production sites.
- Affected scripts should be updated (but only some are tested).

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1556. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/172322064.
Appveyor build 1396. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_notabilis27_widelands_casern-1396.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1565. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/172775329.
Appveyor build 1404. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1404.

[GunChleoc (gunchleoc)]

I gave it a quick test - seems to be working :)

I am not sure about the user interface though - I have posted on the forum for user feedback:

https://wl.widelands.org/forum/topic/974/?page=3#post-18504

Also, because we renamed a function in the Lua interface, the test suite is broken. Documentation on how to run the test suite:

https://wl.widelands.org/wiki/RegressionTests/

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1567. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/172859367.
Appveyor build 1406. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1406.

[Notabilis (notabilis27)]

Thanks Travis but I already knew that the test were broken. They should be fixed now.

However, I have a problem with the scripting documentation. What is the "HasWares" interface which is described in lua_map.cc? Is this something which really exists in the code or documentation-only to avoid writing the same stuff over and over again?

Either case, it does no longer really match the *_input methods of production sites. I was thinking about splitting it up into a HasWares interface for flags and warehouses and create a nearly identical interface HasInputs which is for production and training sites and also accepts workers as inputs.

[SirVer (sirver)]

> Is this something which really exists in the code or documentation-only to avoid writing the same stuff over and over again?

The latter. I think it used to exist, but now it is just an interface without any code associated with it.

Splitting up sounds fine to me. I do not think we can give stability guarantees for the Lua interface at this point in time, so no need to try hard to keep it backwards compatible.

[GunChleoc (gunchleoc)]

I think we should delete the documentation then - no need to have dead code documented, it is confusing.

[SirVer (sirver)]

The documentation is not dead. Various classes implement this interface and refer to this as documentation.

We can delete this, but then we have to add the same documentation to all classes that implement the semantics. As long as they do not diverge, I think having them only documented once is preferable.

Or in other terms: the class exists for users, just not in the implementation- and that is an implementation detail.

> Am 08.11.2016 um 09:48 schrieb GunChleoc <email address hidden>:
>
> I think we should delete the documentation then - no need to have dead code documented, it is confusing.
> --
> https://code.launchpad.net/~widelands-dev/widelands/casern_workersqueue/+merge/309763
> You are subscribed to branch lp:widelands.

[Notabilis (notabilis27)]

I split up the documentation and updated some references. Now I am only wondering: Is there a script which extracts this documentation somewhere? I only found some generic documentation but no list of provided Lua classes or something like that.

What else is to do in this branch? Will the UI be reworked before a merge to trunk or merge first and do the update later?

[GunChleoc (gunchleoc)]

First round of code review is done - see my last commit.

I will have to look into your economy questions - I'm not really familiar with the economy code myself yet.

Great contribution overall! I have mostly some minors nits and refactoring ideas - feel free to drop any of those if you don't agree or turn them into TODO comments if you think the changes would be too big for this branch.

[GunChleoc (gunchleoc)]

Sorry, overlooked your comment - think now that the UI change should go in before the merge, because the code changes for that will be rather big, and we should get a superclass for wares and workers queues.

For the documentation, see

https://bazaar.launchpad.net/~widelands-dev/widelands/trunk/view/head:/doc/sphinx/README

Best generate as HTML, so you won't need the website project to view.

[Notabilis (notabilis27)]

Nooo, not the beer! I liked the beer! :(

But thanks for the review. The small stuff (renaming, etc.) is done, what is left are the bigger changes. Open problems in no particular order:

1) Making WorkersQueue more similar to WaresQueue and replacing the user interface should be no problem. I will try to share as much code as possible between the queues respectively the interfaces.

2) The problem with higher-ranking workers seems to be a bug (or inconsistency) in the code. While warehouses check for an exact match to fulfill the request, the IdleWorkerSupply uses can_act_as(). This explains the strange behavior I encountered. For normal (worker-)workers I would prefer the can_act_as() approach while barracks should match exactly. What do you think about a flag in the request which describes whether the worker has to match exactly? Or maybe expand the "Requirements" for requests (new RequireExactWorker class or so)?

3) In production_program.cc:220 you requested a for-each loop. I first thought this would be a problem with the if() inside the loop which checks the iterator. But now I am wondering: Can this if() ever be fulfilled? When I am not missing anything the loop should always end earlier. So remove the if()-part and use a for-each loop?

4) What does "NOCOM" mean? I just can't figure it out. And what is the difference to "TODO"?

5) You increased the packet version for the serialization functions and they are now checking for a range. What is the idea behind it? Increase the number on every modification of the file but accept older versions until the method itself changes?

So much for now.
Thanks for the link to the documentation. I tried the parameter singlehtml before, seems that this does not include the code documentation. A full html worked fine.

[GunChleoc (gunchleoc)]

Yep, I liked the beer too - it's a balancing thing tough.

2) A flag sounds good. The reason for the inconsistency is that until now, this was used to fill working positions, where allowing higher ranking workers is important.

3) It can be resolved like this:

    bool found = false;
    for (const WareAmount& input : inputs) {
        if (input.first == ware_index) {
            count_max += input.second;
            found = true;
            break;
        }
    }
    if (!found) {
        throw GameDataError("%s is not declared as an input (\"%s=<count>\" was not "
                            "found in the [inputs] section)",
                            ware, ware);
    }

We generally try to get away from using iterators unless they are necessary, because it makes the code easier to read. We could also get rid of having the loop twice:

    WareWorker type = wwWARE;
    DescriptionIndex input_index = tribes.ware_index(ware);
    if (!tribes.ware_exists(input_index)) {
        input_index = tribes.worker_index(ware);
        if (!tribes.worker_exists(input_index)) {
            throw GameDataError("Unknown ware or worker type \"%s\"", ware);
        } else {
            // It is a worker
            type = wwWORKER;
        }
    }
    // Now loop

4) NOCOM is short for "no commit" - all NOCOMs have to be removed before merging into trunk, either by fixing the issue or turning them into TODO comments. TODO comments have a uniform format ti make it easier to search for them:

    // TODO(<nick>): Juicy comment

5) We are now saving things to the savegame that weren't there before. This will crash Widelands if we try to load the savegame with an older version. So, we use exceptions here to show a message to the user and abort loading the savegame. We got rid of compatibility code during the last release cycle, so old savegames won't load any more. We're providing compatibility again from now on though, so we check the range.

[Notabilis (notabilis27)]

GunChleoc, can you take a look at you "versioning" changes in map_buildingdata_packet.cc, please? The current version does not pass the regression tests.

The problem is the line:

  if (packet_version > 5) {

Since kCurrentPacketVersionProductionsite is still set to 5, the code differs on read and write. I would guess that kCurrentPacketVersionProductionsite should have been increased to 6 but I am not sure enough about it to dare to fix it myself. Can you fix it or tell me to do it?

[GunChleoc (gunchleoc)]

Oops - definitely needs increasing to 6.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1597. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/175308095.
Appveyor build 1435. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1435.

[Notabilis (notabilis27)]

Thanks for the answers earlier. Wares- and WorkerQueues now have a common interface so they can be used interchangeable. Note that the code is not really tested yet.
Both are using the same gui class for display, list on the first tab. Support for priorities on the graphical worker queues is disabled currently, I have to look into it if that makes sense (and re-enable it when it does).

Since the classes are more or less the same now, it should be possible to replace the current Building::waresqueue(index) and Building::workersqueue(index) with a single Building::inputqueue(index, type) respectively a single ProductionSite::inputqueues() which returns both types of queues. This would clean up some code duplications where the same code is run on both queues. If no-one protests I will probably do so.

Another, minor thing: I haven't looked into it, but when creating an expedition a builder is requested (at least, I assume he is). Now that we have worker queues: Should there be one for the builder in the tab of the port?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1603. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/175565469.
Appveyor build 1441. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1441.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1604. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/175631314.
Appveyor build 1442. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1442.

[GunChleoc (gunchleoc)]

I am always in favour of removing code duplication wherever possible, so please go ahead if you want. If it's older code, you can also do that in a follow-up branch to keep the current diff smaller.

Regarding the builder, we actually have an open bug for that, so yes, please :)

https://bugs.launchpad.net/widelands/+bug/1191295

Maybe also in a follow-up branch?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1608. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/175798398.
Appveyor build 1446. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1446.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1611. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/175973829.
Appveyor build 1449. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1449.

[Notabilis (notabilis27)]

Replacing calls to WaresQueue with calls to the new InputQueue is done in another branch:
https://code.launchpad.net/~widelands-dev/widelands/refactoring-input-queue
It can be merged either in this branch or into trunk after this branch is merged.

Adding a workersQueue for the builder on expeditions is not done yet. I plan to do so after the this branch and the refactoring branch are merged into trunk (don't like to create a branch for the bug in trunk which depends on other branches).

Review comments from the first review are done. Additionally, I created a regression test for the caserns, since it is the only building using the WorkersQueue currently.

In r7434 I fixed a bug which crashes scripts when they try to add a worker-worker to a building which already contains input-workers. Should have probably become an own branch, but the fix is small and I was lazy.

So as far as I am concerned: The branch(es) is(/are) ready for the next review.

[Notabilis (notabilis27)]

Oh, forgot a comment: Priorities for WorkerQueues are and will stay disabled. I am not completely sure what priorities are doing, but they only seem to influence how likely it is that a carrier picks up a ware on a flag. Obviously, this does not make sense for workers.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1645. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/178415914.
Appveyor build 1483. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1483.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1648. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/178540332.
Appveyor build 1487. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1487.

[GunChleoc (gunchleoc)]

As far as I understand the log output of the failed tests and the Python script, widelands itself exits with a return code != 0 - maybe a new assert in the code itself somewhere is causing this, rather than the test code?

[SirVer (sirver)]

Gun pinged me to take a look at this.

First impression: Looking over the travis output there is clearly a bug in the code somewhere. It is flaky as it sometimes succeeds and sometimes fails. There is no correlation to the compiler (gcc/clang both are flaky) or the type of build (debug/release).

It is always the new casern test that is failing - but always at the very end. The test runs to completion: "All Tests passed.", but then the game seems to crash. I'll bet it is a segfault, since there is no further output. If I should guess, I would say there is invalid memory or double free in the shutdown code somewhere, but I did not investigate the code yet.

[Notabilis (notabilis27)]

Thank you both for looking at this. When looking sooner in the travis log I found these lines:

test/maps/plain.wmf/scripting/test_casern.lua ...
  Running Widelands ... *** Error in `build/src/widelands': double free or corruption (!prev): 0x000000000670d1e0 ***
FAIL

So you are right SirVer: A double free in any case. But I would guess some memory corruption, too, since it does not appear every time.
Through running the test a lot of times I was able to get the following backtrace. Seems like the CmdQueue has problems when cleaning up on program exit.

[...]
MO(7,barbarians_barracks): Recruit leaving
MO(2,barbarians_lumberjacks_hut): Lumberjack leaving

Thread 1 "widelands" received signal SIGSEGV, Segmentation fault.
0x00007ffff518b8c0 in _int_free (av=0x7ffff54acb00 <main_arena>, p=0x55555d89b6e0,
    have_lock=0) at malloc.c:4049
4049 malloc.c: No such file or directory.
A debugging session is active.

 Inferior 1 [process 6294] will be killed.

Quit anyway? (y or n) n
Not confirmed.
(gdb) bt
#0 0x00007ffff518b8c0 in _int_free (av=0x7ffff54acb00 <main_arena>, p=0x55555d89b6e0, have_lock=0) at malloc.c:4049
#1 0x0000555555ff2ec4 in __gnu_cxx::new_allocator<Widelands::CmdQueue::CmdItem>::deallocate (this=0x555558b2aae0, __p=0x55555d89b6f0) at /usr/include/c++/6/ext/new_allocator.h:110
#2 0x0000555555ff2828 in std::allocator_traits<std::allocator<Widelands::CmdQueue::CmdItem> >::deallocate (__a=..., __p=0x55555d89b6f0, __n=8) at /usr/include/c++/6/bits/alloc_traits.h:442
#3 0x0000555555ff1efe in std::_Vector_base<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >::_M_deallocate (this=0x555558b2aae0, __p=0x55555d89b6f0, __n=8)
    at /usr/include/c++/6/bits/stl_vector.h:178
#4 0x0000555555ff19bd in std::_Vector_base<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >::~_Vector_base (this=0x555558b2aae0, __in_chrg=<optimized out>)
    at /usr/include/c++/6/bits/stl_vector.h:160
#5 0x0000555555ff16b9 in std::vector<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >::~vector (this=0x555558b2aae0, __in_chrg=<optimized out>)
    at /usr/include/c++/6/bits/stl_vector.h:427
#6 0x0000555555ff1658 in std::priority_queue<Widelands::CmdQueue::CmdItem, std::vector<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >, std::less<Widelands::CmdQueue::CmdItem> >::~priority_queue (this=0x555558b2aae0, __in_chrg=<optimized out>) at /usr/include/c++/6/bits/stl_queue.h:397
#7 0x0000555555ff30d1 in std::_Destroy<std::priority_queue<Widelands::CmdQueue::CmdItem, std::vector<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >, std::less<Widelands::CmdQueue::CmdItem> > > (__pointer=0x555558b2aae0) at /usr/include/c++/6/bits/stl_construct.h:93
#8 0x0000555555ff2c34 in std::_Destroy_aux<false>::__destroy<std::priority_queue<Widelands::CmdQueue::CmdItem, std::vector<Widelands::CmdQueue::CmdItem, std::allocator<Widelands::CmdQueue::CmdItem> >, std::less<Widelands::CmdQueue::CmdItem> >*> (__first=0x555558b2aae0, __last=0x555558c84ae0) at /usr/include/c++/6/bits/stl_construct.h:103
#9 0x0000555555ff21d7 in std::_Destroy<std::priority_q...

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1660. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/179421689.
Appveyor build 1500. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1500.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1697. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/180993235.
Appveyor build 1537. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1537.

[Notabilis (notabilis27)]

Seems like the cleanup-bug is fixed. The problem was that the WorkersQueue was free-ing the stored workers on cleanup while the building was also free-ing them. The fix is to simply drop the pointers to the workers when removing the queue and let the building handle them.

However, I don't really like the fix. For one thing, I could not really figure out which methods are called at which time during cleanup. The code I looked at does not matches my observations while debugging. Most likely this is a misunderstanding by me and no bug in the code, though.

The more serious problem is the sporadic nature of the bug. Neither my understanding of the bug nor the fix are accounting for the fact that the bug only occurs sometimes. It could happen when some code (which one?) sets the to-be-freed pointers to some value (which and why?) that happens to be NULL most of the time. Not that this makes any sense for me. Another possibility could be a random order of cleanup on exit.

So while the bug seems to be fixed I don't understand it and there might be a memory leak present now.

[GunChleoc (gunchleoc)]

This is WaresQueue does in the cleanup:

 if (filled_ && owner_.get_economy())
  owner_.get_economy()->remove_wares(index_, filled_);

 filled_ = 0;

etc...

I guess we should to the same for the workers queue now, since it's now more like the waresqueue and not like the soldercontrol?

[Notabilis (notabilis27)]

Good question! In the case of workers, this is not required. Now that you are mentioning it I remembered (and testing confirmed) that this is dealt with somewhere else. When destroying a building (and its queues) wares are lost, so we have to remove them from the economy. On the other hand, workers become fugitives.

When destroying an unconnected (i.e. no streets) barracks the inventory statistics no longer show the workers of the barracks. When the fugitives find a connected street they are added again. I haven't looked in the code but I would guess they take care of that themselves.

While testing I noticed that the inventory statistics are listing no-cost workers while the warehouse statistics are not. Is this a bug or intentional behavior?

[GunChleoc (gunchleoc)]

The reason that the warehouse statistics don't list them is that people might try to set a policy on them. Players might still be interested in the inventory though.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1711. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/181293004.
Appveyor build 1551. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1551.

[GunChleoc (gunchleoc)]

I have added a bunch of NOCOM comments to the code with some ideas.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1718. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/181577339.
Appveyor build 1558. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1558.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

[Errno 104] Connection reset by peer

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1718. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/181577339.
Appveyor build 1558. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1558.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

HTTP Error 500: Internal Server Error

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1718. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/181577339.
Appveyor build 1558. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1558.

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

('The read operation timed out',)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1718. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/181577339.
Appveyor build 1558. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1558.

[Notabilis (notabilis27)]

Next round of code review fixes are done. Some bigger refactoring has been done in another branch:

https://code.launchpad.net/~widelands-dev/widelands/refactoring-input-queue

Basically: "Using InputQueue instead of Wares-/WorkersQueue where it makes sense."

Also fixed/added some help texts and set the soldier quantity. What is left to do? I intend to add a builder-queue to expeditions in a further branch after this one has been merged.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1803. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/189464030.
Appveyor build 1641. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_casern_workersqueue-1641.

[Tino (tino79)]

I did some play testing yesterday and everything seems to be working as intended.
Just noticed at some point, that the stopped Training Camp is constantly requesting soldiers, so because i had 2 slots opened, there was a constant walking of 2 soldiers between my headquarter and the camp.

Save Game: https://drive.google.com/open?id=0B50V-GKOTFBKaUhlUFJ3UVJ2Y0k

[Notabilis (notabilis27)]

Hello Tino,

thanks for testing!
I can confirm the strange behavior in your save game as well as in an own test game. However, I could also create the effect in trunk so it is no bug of this branch. I opened a bug report for it, maybe you are able to add something about it:

https://bugs.launchpad.net/widelands/+bug/1656669

[GunChleoc (gunchleoc)]

Thanks for implementing this - all ready to go :)

@bunnybot merge

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

[GunChleoc (gunchleoc)]

@bunnybot merge

[Notabilis (notabilis27)]

Thanks for merging this, time to start propose merging the follow-up branches. ;)

However, your last merge with trunk (r7457) is broken. You removed the set_warehouse_policies() Lua functions, so now the regression tests in the this branch and in trunk are failing. :/

I am not quite sure how to fix this. Revert r7457 in this branch and merge with trunk again? Maybe even revert the merge of the casern branch into trunk before that?
Either way, I don't really know bzr so if there is someone who feels more qualified to fix this, go ahead (read as: bzr revert and operations on trunk intimidate me).

review: Needs Fixing

[Notabilis (notabilis27)]

Okay, more or less my mistake, everything will be fine. The bug already was in trunk and not in this branch, see

https://bugs.launchpad.net/widelands/+bug/1658317

review: Approve

[GunChleoc (gunchleoc)]

Creating a new branch like we did when it has already landed in trunk is the way to go :)

The bug was created by me when I merged trunk into this branch and resolved a conflict.

=== modified file 'data/campaigns/bar01.wmf/scripting/secret_village.lua'
--- data/campaigns/bar01.wmf/scripting/secret_village.lua	2016-12-29 10:31:07 +0000
+++ data/campaigns/bar01.wmf/scripting/secret_village.lua	2017-01-21 14:37:18 +0000
@@ -101,13 +101,13 @@
       {"barbarians_gamekeepers_hut", 56, 12},
       {"barbarians_farm", 56, 16},
       {"barbarians_well", 54, 18},
-      {"barbarians_bakery", 55, 20, wares = {wheat = 6, water = 6}},
+      {"barbarians_bakery", 55, 20, inputs = {wheat = 6, water = 6}},
       {"barbarians_lumberjacks_hut", 56, 21},
       {"barbarians_lumberjacks_hut", 55, 22},
       {"barbarians_lumberjacks_hut", 54, 24},
       {"barbarians_rangers_hut", 57, 24},
       {"barbarians_rangers_hut", 55, 25},
-      {"barbarians_wood_hardener", 54, 26, wares = {log = 8}},
+      {"barbarians_wood_hardener", 54, 26, inputs = {log = 8}},
       -- to make it more realistic
       {"barbarians_warehouse", 53, 28,
          wares = {
@@ -116,11 +116,11 @@
             meat = 30
          }
       },
-      {"barbarians_inn", 55, 28, wares = {barbarians_bread = 4, meat = 4}},
-      {"barbarians_tavern", 57, 28, wares = {barbarians_bread = 4, meat = 4}},
+      {"barbarians_inn", 55, 28, inputs = {barbarians_bread = 4, meat = 4}},
+      {"barbarians_tavern", 57, 28, inputs = {barbarians_bread = 4, meat = 4}},
       {"barbarians_well", 52, 30},
       {"barbarians_farm", 54, 33},
-      {"barbarians_bakery", 51, 35, wares = {wheat = 6, water = 6}},
+      {"barbarians_bakery", 51, 35, inputs = {wheat = 6, water = 6}},
       {"barbarians_well", 52, 37}
    )
 

=== modified file 'data/campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua'
--- data/campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua	2016-01-28 05:24:34 +0000
+++ data/campaigns/tutorial03_seafaring.wmf/scripting/helper_functions.lua	2017-01-21 14:37:18 +0000
@@ -23,5 +23,7 @@
       -- Fill with wares
       if bdescr.wares then b:set_wares(bdescr.wares)
       elseif b.valid_wares then b:set_wares(b.valid_wares) end
+      if bdescr.inputs then b:set_inputs(bdescr.inputs)
+      elseif b.valid_inputs then b:set_inputs(b.valid_inputs) end
    end
 end

=== modified file 'data/campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua'
--- data/campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua	2015-10-31 12:11:44 +0000
+++ data/campaigns/tutorial03_seafaring.wmf/scripting/starting_conditions.lua	2017-01-21 14:37:18 +0000
@@ -102,8 +102,8 @@
    {"atlanteans_horsefarm", 40, 55},
    {"atlanteans_spiderfarm", 37, 45},
    {"atlanteans_weaving_mill", 45, 45},
-   {"atlanteans_smelting_works", 35, 56, wares = {coal = 8, iron_ore = 8}}, -- no gold
-   {"atlanteans_smelting_works", 35, 59, wares = {coal = 8, iron_ore = 8}},
+   {"atlanteans_smelting_works", 35, 56, inputs = {coal = 8, iron_ore = 8}}, -- no gold
+   {"atlanteans_smelting_works", 35, 59, inputs = {coal = 8, iron_ore = 8}},
    {"atlanteans_toolsmithy", 41, 52},
    {"atlanteans_weaponsmithy", 37, 54},
    {"atlanteans_tower_small", 34, 63},

=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/helper_functions.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/helper_functions.lua	2016-01-28 05:24:34 +0000
+++ data/campaigns/tutorial04_economy.wmf/scripting/helper_functions.lua	2017-01-21 14:37:18 +0000
@@ -24,5 +24,7 @@
       -- Fill with wares
       if bdescr.wares then b:set_wares(bdescr.wares)
       elseif b.valid_wares then b:set_wares(b.valid_wares) end
+      if bdescr.inputs then b:set_inputs(bdescr.inputs)
+      elseif b.valid_inputs then b:set_inputs(b.valid_inputs) end
    end
 end

=== modified file 'data/campaigns/tutorial04_economy.wmf/scripting/starting_conditions.lua'
--- data/campaigns/tutorial04_economy.wmf/scripting/starting_conditions.lua	2015-10-31 12:11:44 +0000
+++ data/campaigns/tutorial04_economy.wmf/scripting/starting_conditions.lua	2017-01-21 14:37:18 +0000
@@ -94,16 +94,16 @@
       {"empire_bakery",116,28},
       {"empire_bakery",115,32},
       {"empire_tavern",tavern_field.x,tavern_field.y}, -- (105,44), will be destroyed
-      {"empire_coalmine",118,45, wares = {beer = 6}},
-      {"empire_coalmine",119,39, wares = {beer = 6}},
-      {"empire_ironmine",107,59, wares = {beer = 6}},
-      {"empire_marblemine",98,38, wares = {wine = 6}},
-      {"empire_marblemine",102,38, wares = {wine = 6}},
-      {"empire_smelting_works",110,38, wares = {}},
-      {"empire_smelting_works",111,43, wares = {}},
-      {"empire_toolsmithy",104,64, wares = {log = 8}},
-      {"empire_weaponsmithy",113,40, wares = {planks = 8}},
-      {"empire_armorsmithy",112,37, wares = {cloth = 8}},
+      {"empire_coalmine",118,45, inputs = {beer = 6}},
+      {"empire_coalmine",119,39, inputs = {beer = 6}},
+      {"empire_ironmine",107,59, inputs = {beer = 6}},
+      {"empire_marblemine",98,38, inputs = {wine = 6}},
+      {"empire_marblemine",102,38, inputs = {wine = 6}},
+      {"empire_smelting_works",110,38, inputs = {}},
+      {"empire_smelting_works",111,43, inputs = {}},
+      {"empire_toolsmithy",104,64, inputs = {log = 8}},
+      {"empire_weaponsmithy",113,40, inputs = {planks = 8}},
+      {"empire_armorsmithy",112,37, inputs = {cloth = 8}},
       {"empire_farm",105,70},
       {"empire_farm",101,71},
       {"empire_farm",99,77},

=== modified file 'data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua'
--- data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua	2016-03-21 19:29:24 +0000
+++ data/maps/Trident_of_Fire.wmf/scripting/initial_conditions.lua	2017-01-21 14:37:18 +0000
@@ -149,7 +149,7 @@
             soldiers = { [{0,0,0,0}] = 45 },
          },
          { "barbarians_port", f_port.x, f_port.y},
-         { "barbarians_shipyard", f_shipyard.x, f_shipyard.y, wares = {
+         { "barbarians_shipyard", f_shipyard.x, f_shipyard.y, inputs = {
               blackwood = 10,
               cloth = 4,
               log = 2,
@@ -219,7 +219,7 @@
          },
          { "empire_port", f_port.x, f_port.y},
          { "empire_shipyard", f_shipyard.x, f_shipyard.y,
-            wares = {
+            inputs = {
              cloth = 4,
              log = 2,
              planks = 10,
@@ -289,7 +289,7 @@
          soldiers = { [{0,0,0,0}] = 45 },
          },
          { "atlanteans_port", f_port.x, f_port.y},
-         { "atlanteans_shipyard", f_shipyard.x, f_shipyard.y, wares = {
+         { "atlanteans_shipyard", f_shipyard.x, f_shipyard.y, inputs = {
            planks = 10,
            spidercloth = 4,
            log = 2,

=== modified file 'data/scripting/infrastructure.lua'
--- data/scripting/infrastructure.lua	2016-03-01 09:31:36 +0000
+++ data/scripting/infrastructure.lua	2017-01-21 14:37:18 +0000
@@ -65,7 +65,7 @@
 --       prefilled_buildings(wl.Game().players[1],
 --          {"sentry", 57, 9}, -- Sentry completely full with soldiers
 --          {"sentry", 57, 9, soldier={[{0,0,0,0}]=1}}, -- Sentry with one soldier
---          {"bakery", 55, 20, wares = {wheat=6, water=6}}, -- bakery with wares and workers
+--          {"bakery", 55, 20, inputs = {wheat=6, water=6}}, -- bakery with wares and workers
 --          {"well", 52, 30}, -- a well with workers
 --       )
 --
@@ -77,9 +77,13 @@
 --
 --       wares
 --          A table of (name,count) as expected by
---          :meth:`wl.map.ProductionSite.set_wares`. This is valid for
---          :class:`wl.map.ProductionSite` and :class:`wl.map.Warehouse` and
---          ignored otherwise.
+--          :meth:`wl.map.Warehouse.set_wares`. This is valid for
+--          :class:`wl.map.Warehouse` and must not be used otherwise.
+--       inputs
+--          A table of (name,count) as expected by
+--          :meth:`wl.map.ProductionSite.set_inputs`. Inputs are wares or workers
+--          which are consumed by the building. This is valid for
+--          :class:`wl.map.ProductionSite` and must not be used otherwise.
 --       soldiers
 --          A table of (soldier_descr,count) as expected by
 --          :meth:`wl.map.HasSoldiers.set_soldiers`.  If this is nil, the site
@@ -107,6 +111,7 @@
       end
       -- Fill with wares if this is requested
       if bdescr.wares then b:set_wares(bdescr.wares) end
+      if bdescr.inputs then b:set_inputs(bdescr.inputs) end
    end
 end
 

=== modified file 'data/tribes/atlanteans.lua'
--- data/tribes/atlanteans.lua	2016-11-02 05:48:00 +0000
+++ data/tribes/atlanteans.lua	2017-01-21 14:37:18 +0000
@@ -185,6 +185,7 @@
       },
       {
          -- Military
+         "atlanteans_recruit",
          "atlanteans_soldier",
          "atlanteans_trainer",
          "atlanteans_weaponsmith",

=== modified file 'data/tribes/barbarians.lua'
--- data/tribes/barbarians.lua	2016-02-06 10:31:42 +0000
+++ data/tribes/barbarians.lua	2017-01-21 14:37:18 +0000
@@ -135,6 +135,7 @@
       },
       {
          -- Military
+         "barbarians_recruit",
          "barbarians_soldier",
          "barbarians_trainer",
          "barbarians_helmsmith",

=== modified file 'data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/atlanteans/barracks/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -13,7 +13,7 @@
 
 function building_helptext_purpose()
    -- #TRANSLATORS: Purpose helptext for a building
-   return no_purpose_text_yet()
+   return pgettext("atlanteans_building", "Equips recruits and trains them as soldiers.")
 end
 
 function building_helptext_note()

=== modified file 'data/tribes/buildings/productionsites/atlanteans/barracks/init.lua'
--- data/tribes/buildings/productionsites/atlanteans/barracks/init.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/atlanteans/barracks/init.lua	2017-01-21 14:37:18 +0000
@@ -34,6 +34,9 @@
    },
 
    aihints = {
+      forced_after = 1000,
+      very_weak_ai_limit = 1,
+      weak_ai_limit = 3
    },
 
    working_positions = {
@@ -42,7 +45,8 @@
 
    inputs = {
       { name = "tabard", amount = 8 },
-      { name = "trident_light", amount = 8 }
+      { name = "trident_light", amount = 8 },
+      { name = "atlanteans_recruit", amount = 8 }
    },
    outputs = {
       "atlanteans_soldier",
@@ -51,12 +55,11 @@
    programs = {
       work = {
          -- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
-         -- TODO(GunChleoc): this should cost us a carrier as well, or maybe a recruit.
          descname = _"recruiting soldier",
          actions = {
             "sleep=15000",
             "return=skipped unless economy needs atlanteans_soldier",
-            "consume=tabard trident_light",
+            "consume=tabard trident_light atlanteans_recruit",
             "animate=working 15000",
             "recruit=atlanteans_soldier"
          }

=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -13,7 +13,7 @@
 
 function building_helptext_purpose()
    -- #TRANSLATORS: Purpose helptext for a building
-   return no_purpose_text_yet()
+   return pgettext("barbarians_building", "Equips recruits and trains them as soldiers.")
 end
 
 function building_helptext_note()

=== modified file 'data/tribes/buildings/productionsites/barbarians/barracks/init.lua'
--- data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/barbarians/barracks/init.lua	2017-01-21 14:37:18 +0000
@@ -33,6 +33,9 @@
    },
 
    aihints = {
+      forced_after = 1000,
+      very_weak_ai_limit = 1,
+      weak_ai_limit = 3
    },
 
    working_positions = {
@@ -40,7 +43,8 @@
    },
 
    inputs = {
-      { name = "ax", amount = 8 }
+      { name = "ax", amount = 8 },
+      { name = "barbarians_recruit", amount = 8 }
    },
    outputs = {
       "barbarians_soldier",
@@ -50,11 +54,10 @@
       work = {
          -- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
          descname = _"recruiting soldier",
-         -- TODO(GunChleoc): this should cost us a carrier as well, or maybe a recruit.
          actions = {
             "sleep=15000",
             "return=skipped unless economy needs barbarians_soldier",
-            "consume=ax",
+            "consume=ax barbarians_recruit",
             "animate=working 15000",
             "recruit=barbarians_soldier"
          }

=== modified file 'data/tribes/buildings/productionsites/empire/barracks/helptexts.lua'
--- data/tribes/buildings/productionsites/empire/barracks/helptexts.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/empire/barracks/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -13,7 +13,7 @@
 
 function building_helptext_purpose()
    -- #TRANSLATORS: Purpose helptext for a building
-   return no_purpose_text_yet()
+   return pgettext("empire_building", "Equips recruits and trains them as soldiers.")
 end
 
 function building_helptext_note()

=== modified file 'data/tribes/buildings/productionsites/empire/barracks/init.lua'
--- data/tribes/buildings/productionsites/empire/barracks/init.lua	2016-11-03 16:08:09 +0000
+++ data/tribes/buildings/productionsites/empire/barracks/init.lua	2017-01-21 14:37:18 +0000
@@ -35,6 +35,9 @@
    },
 
    aihints = {
+      forced_after = 1000,
+      very_weak_ai_limit = 1,
+      weak_ai_limit = 3
    },
 
    working_positions = {
@@ -43,7 +46,8 @@
 
    inputs = {
       { name = "armor_helmet", amount = 8 },
-      { name = "spear_wooden", amount = 8 }
+      { name = "spear_wooden", amount = 8 },
+      { name = "empire_recruit", amount = 8 }
    },
    outputs = {
       "empire_soldier",
@@ -52,12 +56,11 @@
    programs = {
       work = {
          -- TRANSLATORS: Completed/Skipped/Did not start recruiting soldier because ...
-         -- TODO(GunChleoc): this should cost us a carrier as well, or maybe a recruit.
          descname = _"recruiting soldier",
          actions = {
             "sleep=15000",
             "return=skipped unless economy needs empire_soldier",
-            "consume=armor_helmet spear_wooden",
+            "consume=armor_helmet spear_wooden empire_recruit",
             "animate=working 15000",
             "recruit=empire_soldier"
          }

=== modified file 'data/tribes/empire.lua'
--- data/tribes/empire.lua	2016-02-06 10:31:42 +0000
+++ data/tribes/empire.lua	2017-01-21 14:37:18 +0000
@@ -141,6 +141,7 @@
       },
       {
          -- Military
+         "empire_recruit",
          "empire_soldier",
          "empire_trainer",
          "empire_weaponsmith",

=== modified file 'data/tribes/init.lua'
--- data/tribes/init.lua	2016-10-18 09:48:36 +0000
+++ data/tribes/init.lua	2017-01-21 14:37:18 +0000
@@ -220,6 +220,7 @@
 include "tribes/workers/atlanteans/hunter/init.lua"
 include "tribes/workers/atlanteans/miller/init.lua"
 include "tribes/workers/atlanteans/miner/init.lua"
+include "tribes/workers/atlanteans/recruit/init.lua"
 include "tribes/workers/atlanteans/sawyer/init.lua"
 include "tribes/workers/atlanteans/scout/init.lua"
 include "tribes/workers/atlanteans/shipwright/init.lua"
@@ -258,6 +259,7 @@
 include "tribes/workers/barbarians/miner/init.lua"
 include "tribes/workers/barbarians/ox/init.lua"
 include "tribes/workers/barbarians/ranger/init.lua"
+include "tribes/workers/barbarians/recruit/init.lua"
 include "tribes/workers/barbarians/scout/init.lua"
 include "tribes/workers/barbarians/shipwright/init.lua"
 include "tribes/workers/barbarians/smelter/init.lua"
@@ -286,6 +288,7 @@
 include "tribes/workers/empire/miner_master/init.lua"
 include "tribes/workers/empire/miner/init.lua"
 include "tribes/workers/empire/pigbreeder/init.lua"
+include "tribes/workers/empire/recruit/init.lua"
 include "tribes/workers/empire/scout/init.lua"
 include "tribes/workers/empire/shepherd/init.lua"
 include "tribes/workers/empire/shipwright/init.lua"

=== modified file 'data/tribes/scripting/help/format_help.lua'
--- data/tribes/scripting/help/format_help.lua	2016-09-21 08:41:51 +0000
+++ data/tribes/scripting/help/format_help.lua	2017-01-21 14:37:18 +0000
@@ -111,34 +111,44 @@
 
 
 -- RST
--- .. function:: help_consumed_wares(building, program_name)
---
---    Returns information for which wares in which amounts are consumed by a produciton program.
---
---    :arg tribe: The :class:`LuaBuildingDescription` for the building that runs the program
+-- .. function:: help_consumed_wares_workers(building, program_name)
+--
+--    Returns information for which wares and workers in which amounts are consumed by a production program.
+--
+--    :arg tribe: The :class:`LuaTribeDescription` for the tribe that consumes the ware
+--    :arg building: The :class:`LuaBuildingDescription` for the building that runs the program
 --    :arg program_name: The name of the production program that the info is collected for
 --
 --    :returns: A "Ware(s) consumed:" section with image_lines
 --
-function help_consumed_wares(building, program_name)
+function help_consumed_wares_workers(tribe, building, program_name)
    local result = ""
-   local consumed_wares_string = ""
-   local consumed_wares_counter = 0
-   local consumed_wares = building:consumed_wares(program_name)
-   for countlist, warelist in pairs(consumed_wares) do
-      local consumed_warenames = {}
+   local consumed_items_string = ""
+   local consumed_items_counter = 0
+   local consumed_wares_workers = building:consumed_wares_workers(program_name)
+   local consumes_wares = false
+   local consumes_workers = false
+   for countlist, itemlist in pairs(consumed_wares_workers) do
+      local consumed_itemnames = {}
       local consumed_images = {}
       local consumed_amount = {}
       local count = 1
-      for consumed_ware, amount in pairs(warelist) do
-         local ware_description = wl.Game():get_ware_description(consumed_ware)
-         consumed_warenames[count] = _"%1$dx %2$s":bformat(amount, ware_description.descname)
-         consumed_images[count] = ware_description.icon_name
+      for consumed_item, amount in pairs(itemlist) do
+         local description
+         if tribe:has_ware(consumed_item) then
+            description = wl.Game():get_ware_description(consumed_item)
+            consumes_wares = true
+         else
+            description = wl.Game():get_worker_description(consumed_item)
+            consumes_workers = true
+         end
+         consumed_itemnames[count] = _"%1$dx %2$s":bformat(amount, description.descname)
+         consumed_images[count] = description.icon_name
          consumed_amount[count] = amount
          count = count + 1
-         consumed_wares_counter = consumed_wares_counter + amount
+         consumed_items_counter = consumed_items_counter + amount
       end
-      local text = localize_list(consumed_warenames, "or", "tribes_encyclopedia")
+      local text = localize_list(consumed_itemnames, "or", "tribes_encyclopedia")
       if (countlist > 1) then
          text = _"%s and":bformat(text)
       end
@@ -155,12 +165,23 @@
             image_counter = image_counter + 1
          end
       end
-      consumed_wares_string = image_line(images, 1, p(text)) .. consumed_wares_string
+      consumed_items_string = image_line(images, 1, p(text)) .. consumed_items_string
    end
-   if (consumed_wares_counter > 0) then
-      -- TRANSLATORS: Tribal Encyclopedia: Heading for wares consumed by a productionsite
-      result = result .. rt(h3(ngettext("Ware consumed:", "Wares consumed:", consumed_wares_counter)))
-      result = result .. consumed_wares_string
+   if (consumed_items_counter > 0) then
+      local consumed_header = ""
+      if (consumes_workers) then
+         if (consumes_wares) then
+            -- TRANSLATORS: Tribal Encyclopedia: Heading for wares and workers consumed by a productionsite
+            consumed_header = _("Wares and workers consumed:")
+         else
+            -- TRANSLATORS: Tribal Encyclopedia: Heading for workers consumed by a productionsite
+            consumed_header = _("Workers consumed:")
+         end
+      else
+         -- TRANSLATORS: Tribal Encyclopedia: Heading for wares consumed by a productionsite
+         consumed_header = _("Wares consumed:")
+      end
+      result = result .. rt(h3(consumed_header)) .. consumed_items_string
    end
    return result
 end

=== modified file 'data/tribes/scripting/help/ware_help.lua'
--- data/tribes/scripting/help/ware_help.lua	2016-09-21 08:41:51 +0000
+++ data/tribes/scripting/help/ware_help.lua	2017-01-21 14:37:18 +0000
@@ -90,7 +90,7 @@
 
          -- Now collect the consumed wares for each filtered program and print the program info
          for j, program_name in ipairs(producing_programs) do
-            result = result .. help_consumed_wares(building, program_name)
+            result = result .. help_consumed_wares_workers(tribe, building, program_name)
             if (produced_wares_counters[program_name] > 0) then
                result = result
                   -- TRANSLATORS: Ware Encyclopedia: Wares produced by a productionsite

=== modified file 'data/tribes/scripting/help/worker_help.lua'
--- data/tribes/scripting/help/worker_help.lua	2016-09-01 15:43:01 +0000
+++ data/tribes/scripting/help/worker_help.lua	2017-01-21 14:37:18 +0000
@@ -72,7 +72,7 @@
 
             -- Now collect the consumed wares for each filtered program and print the program info
             for j, program_name in ipairs(producing_programs) do
-               result = result .. help_consumed_wares(building, program_name)
+               result = result .. help_consumed_wares_workers(tribe, building, program_name)
                if (recruited_workers_counters[program_name] > 0) then
                   result = result
                      -- TRANSLATORS: Worker Encyclopedia: Workers recruited by a productionsite

=== modified file 'data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua	2016-09-20 17:01:35 +0000
+++ data/tribes/scripting/starting_conditions/atlanteans/fortified_village.lua	2017-01-21 14:37:18 +0000
@@ -75,7 +75,7 @@
       })
 
       place_building_in_region(plr, "atlanteans_labyrinth", sf:region(11), {
-         wares = {
+         inputs = {
             atlanteans_bread = 4,
             smoked_fish = 3,
             smoked_meat = 3,
@@ -83,21 +83,21 @@
       })
 
       place_building_in_region(plr, "atlanteans_dungeon", sf:region(11), {
-         wares = {atlanteans_bread = 4, smoked_fish = 3, smoked_meat = 3}
+         inputs = {atlanteans_bread = 4, smoked_fish = 3, smoked_meat = 3}
       })
 
       place_building_in_region(plr, "atlanteans_armorsmithy", sf:region(11), {
-         wares = { coal=4, gold =4 }
+         inputs = { coal=4, gold =4 }
       })
       place_building_in_region(plr, "atlanteans_toolsmithy", sf:region(11), {
-         wares = { log = 6 }
+         inputs = { log = 6 }
       })
       place_building_in_region(plr, "atlanteans_weaponsmithy", sf:region(11), {
-         wares = { coal = 8, iron = 8 }
+         inputs = { coal = 8, iron = 8 }
       })
 
       place_building_in_region(plr, "atlanteans_sawmill", sf:region(11), {
-         wares = { log = 1 }
+         inputs = { log = 1 }
       })
    end
 }

=== modified file 'data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua	2016-10-23 09:51:50 +0000
+++ data/tribes/scripting/starting_conditions/atlanteans/trading_outpost.lua	2017-01-21 14:37:18 +0000
@@ -84,7 +84,7 @@
       })
 
       place_building_in_region(player, "atlanteans_toolsmithy", sf:region(11), {
-         wares = {
+         inputs = {
             iron = 6,
             log = 6,
             spidercloth = 4
@@ -92,13 +92,13 @@
       })
 
       place_building_in_region(player, "atlanteans_sawmill", sf:region(11), {
-         wares = {
+         inputs = {
             log = 8
          }
       })
 
       place_building_in_region(player, "atlanteans_hunters_house", sf:region(11), {
-         wares = {}
+         inputs = {}
       })
 
       place_building_in_region(player, "atlanteans_tower", sf:region(13), {

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2016-09-20 17:01:35 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/fortified_village.lua	2017-01-21 14:37:18 +0000
@@ -68,7 +68,7 @@
       })
 
       place_building_in_region(plr, "barbarians_battlearena", sf:region(12), {
-         wares = {
+         inputs = {
             barbarians_bread = 8,
             fish = 6,
             meat = 6,
@@ -78,19 +78,19 @@
       place_building_in_region(plr, "barbarians_trainingcamp", sf:region(12))
 
       place_building_in_region(plr, "barbarians_helmsmithy", sf:region(12), {
-         wares = { iron = 4, gold = 4 }
+         inputs = { iron = 4, gold = 4 }
       })
       place_building_in_region(plr, "barbarians_metal_workshop", sf:region(12), {
-         wares = { iron = 8 },
+         inputs = { iron = 8 },
       })
       place_building_in_region(plr, "barbarians_ax_workshop", sf:region(12), {
-         wares = { coal = 8 },
+         inputs = { coal = 8 },
       })
       place_building_in_region(plr, "barbarians_wood_hardener", sf:region(12), {
-         wares = { log = 1 },
+         inputs = { log = 1 },
       })
       place_building_in_region(plr, "barbarians_lime_kiln", sf:region(12), {
-         wares = { granite = 6, coal = 3 },
+         inputs = { granite = 6, coal = 3 },
       })
    end
 }

=== modified file 'data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2016-10-23 09:51:50 +0000
+++ data/tribes/scripting/starting_conditions/barbarians/trading_outpost.lua	2017-01-21 14:37:18 +0000
@@ -76,20 +76,20 @@
       })
 
       place_building_in_region(player, "barbarians_metal_workshop", sf:region(11), {
-         wares = {
+         inputs = {
             iron = 8,
             log = 8
          }
       })
 
       place_building_in_region(player, "barbarians_wood_hardener", sf:region(11), {
-         wares = {
+         inputs = {
             log = 8
          }
       })
 
       place_building_in_region(player, "barbarians_hunters_hut", sf:region(11), {
-         wares = {}
+         inputs = {}
       })
 
       place_building_in_region(player, "barbarians_tower", sf:region(13), {

=== modified file 'data/tribes/scripting/starting_conditions/empire/fortified_village.lua'
--- data/tribes/scripting/starting_conditions/empire/fortified_village.lua	2016-09-20 17:01:35 +0000
+++ data/tribes/scripting/starting_conditions/empire/fortified_village.lua	2017-01-21 14:37:18 +0000
@@ -74,7 +74,7 @@
       })
 
       place_building_in_region(plr, "empire_colosseum", sf:region(11), {
-         wares = {
+         inputs = {
             empire_bread = 8,
             fish = 4,
             meat = 4,
@@ -82,7 +82,7 @@
       })
 
       place_building_in_region(plr, "empire_trainingcamp", sf:region(11), {
-         wares = {
+         inputs = {
             fish = 2,
             meat = 2,
             armor_helmet = 2,
@@ -90,7 +90,7 @@
       })
 
       place_building_in_region(plr, "empire_armorsmithy", sf:region(11), {
-         wares = {
+         inputs = {
                gold = 4,
                coal = 8,
                cloth = 5,
@@ -98,20 +98,20 @@
       })
 
       place_building_in_region(plr, "empire_toolsmithy", sf:region(11), {
-         wares = {
+         inputs = {
             iron = 8,
          }
       })
 
       place_building_in_region(plr, "empire_weaponsmithy", sf:region(11), {
-         wares = {
+         inputs = {
             coal = 4,
             planks = 8,
          }
       })
 
       place_building_in_region(plr, "empire_sawmill", sf:region(11), {
-         wares = {
+         inputs = {
             log = 1,
          }
       })

=== modified file 'data/tribes/scripting/starting_conditions/empire/trading_outpost.lua'
--- data/tribes/scripting/starting_conditions/empire/trading_outpost.lua	2016-10-23 09:51:50 +0000
+++ data/tribes/scripting/starting_conditions/empire/trading_outpost.lua	2017-01-21 14:37:18 +0000
@@ -82,20 +82,20 @@
       })
 
       place_building_in_region(player, "empire_toolsmithy", sf:region(11), {
-         wares = {
+         inputs = {
             iron = 8,
             log = 8
          }
       })
 
       place_building_in_region(player, "empire_sawmill", sf:region(11), {
-         wares = {
+         inputs = {
             log = 8
          }
       })
 
       place_building_in_region(player, "empire_hunters_house", sf:region(11), {
-         wares = {}
+         inputs = {}
       })
 
       place_building_in_region(player, "empire_tower", sf:region(13), {

=== added directory 'data/tribes/workers/atlanteans/recruit'
=== added file 'data/tribes/workers/atlanteans/recruit/helptexts.lua'
--- data/tribes/workers/atlanteans/recruit/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/atlanteans/recruit/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Recruit
+   return pgettext("atlanteans_worker", "Eager to become a soldier and defend your tribe!")
+end

=== added file 'data/tribes/workers/atlanteans/recruit/idle_00.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_01.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_02.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_03.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_04.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_05.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_06.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_07.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_08.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_09.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_10.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_10.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_10.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_10_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_10_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_10_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_11.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_11.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_11.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_11_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_11_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_11_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_12.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_12.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_12.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_12_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_12_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_12_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_13.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_13.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_13.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_13_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_13_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_13_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_14.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_14.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_14.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_14_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_14_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_14_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_15.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_15.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_15.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_15_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_15_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_15_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_16.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_16.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_16.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_16_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_16_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_16_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_17.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_17.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_17.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_17_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_17_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_17_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_18.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_18.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_18.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_18_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_18_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_18_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_19.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_19.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_19.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_19_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_19_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_19_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_20.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_20.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_20.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_20_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_20_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_20_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_21.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_21.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_21.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_21_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_21_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_21_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_22.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_22.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_22.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_22_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_22_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_22_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_23.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_23.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_23.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_23_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_23_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_23_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_24.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_24.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_24.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_24_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_24_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_24_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_25.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_25.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_25.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_25_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_25_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_25_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_26.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_26.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_26.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_26_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_26_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_26_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_27.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_27.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_27.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_27_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_27_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_27_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_28.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_28.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_28.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_28_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_28_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_28_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_29.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_29.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_29.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_29_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_29_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_29_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_30.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_30.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_30.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_30_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_30_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_30_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_31.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_31.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_31.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_31_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_31_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_31_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_32.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_32.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_32.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_32_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_32_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_32_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_33.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_33.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_33.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_33_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_33_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_33_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_34.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_34.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_34.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_34_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_34_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_34_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_35.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_35.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_35.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_35_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_35_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_35_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_36.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_36.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_36.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_36_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_36_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_36_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_37.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_37.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_37.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_37_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_37_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_37_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_38.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_38.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_38.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_38_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_38_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_38_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_39.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_39.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_39.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/idle_39_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/idle_39_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/idle_39_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/init.lua'
--- data/tribes/workers/atlanteans/recruit/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/atlanteans/recruit/init.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,24 @@
+dirname = path.dirname(__file__)
+
+animations = {
+   idle = {
+      pictures = path.list_files(dirname .. "idle_??.png"),
+      hotspot = { 10, 36 },
+      fps = 5
+   },
+}
+add_worker_animations(animations, "walk", dirname, "walk", {20, 34}, 10)
+
+tribes:new_worker_type {
+   msgctxt = "atlanteans_worker",
+   name = "atlanteans_recruit",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext("atlanteans_worker", "Recruit"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   buildcost = {}, -- This will give the worker the property "buildable"
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/atlanteans/recruit/menu.png'
Binary files data/tribes/workers/atlanteans/recruit/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/menu.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_e_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_e_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_e_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_ne_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_ne_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_ne_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_nw_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_nw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_nw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_se_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_se_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_se_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_sw_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_sw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_sw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_00.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_00_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_01.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_01_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_02.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_02_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_03.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_03_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_04.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_04_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_05.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_05_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_06.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_06_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_07.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_07_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_08.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_08_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_09.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/atlanteans/recruit/walk_w_09_pc.png'
Binary files data/tribes/workers/atlanteans/recruit/walk_w_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/atlanteans/recruit/walk_w_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== modified file 'data/tribes/workers/atlanteans/soldier/init.lua'
--- data/tribes/workers/atlanteans/soldier/init.lua	2016-09-27 06:30:47 +0000
+++ data/tribes/workers/atlanteans/soldier/init.lua	2017-01-21 14:37:18 +0000
@@ -69,14 +69,10 @@
    icon = dirname .. "menu.png",
    vision_range = 2,
 
-   buildcost = {
-      atlanteans_carrier = 1,
-      tabard = 1,
-      trident_light = 1
-   },
-
    animations = animations,
 
+   default_target_quantity = 10,
+
    -- Battle attributes - initial values and per level increase
    health = {
       max_level = 1,

=== added directory 'data/tribes/workers/barbarians/recruit'
=== added file 'data/tribes/workers/barbarians/recruit/helptexts.lua'
--- data/tribes/workers/barbarians/recruit/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/barbarians/recruit/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Recruit
+   return pgettext("barbarians_worker", "Eager to become a soldier and defend your tribe!")
+end

=== added file 'data/tribes/workers/barbarians/recruit/idle_00.png'
Binary files data/tribes/workers/barbarians/recruit/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_01.png'
Binary files data/tribes/workers/barbarians/recruit/idle_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_02.png'
Binary files data/tribes/workers/barbarians/recruit/idle_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_03.png'
Binary files data/tribes/workers/barbarians/recruit/idle_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_04.png'
Binary files data/tribes/workers/barbarians/recruit/idle_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_05.png'
Binary files data/tribes/workers/barbarians/recruit/idle_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_06.png'
Binary files data/tribes/workers/barbarians/recruit/idle_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_07.png'
Binary files data/tribes/workers/barbarians/recruit/idle_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_08.png'
Binary files data/tribes/workers/barbarians/recruit/idle_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_09.png'
Binary files data/tribes/workers/barbarians/recruit/idle_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_10.png'
Binary files data/tribes/workers/barbarians/recruit/idle_10.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_10.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_10_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_10_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_10_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_11.png'
Binary files data/tribes/workers/barbarians/recruit/idle_11.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_11.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_11_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_11_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_11_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_12.png'
Binary files data/tribes/workers/barbarians/recruit/idle_12.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_12.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_12_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_12_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_12_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_13.png'
Binary files data/tribes/workers/barbarians/recruit/idle_13.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_13.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_13_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_13_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_13_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_14.png'
Binary files data/tribes/workers/barbarians/recruit/idle_14.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_14.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_14_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_14_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_14_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_15.png'
Binary files data/tribes/workers/barbarians/recruit/idle_15.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_15.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_15_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_15_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_15_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_16.png'
Binary files data/tribes/workers/barbarians/recruit/idle_16.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_16.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_16_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_16_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_16_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_17.png'
Binary files data/tribes/workers/barbarians/recruit/idle_17.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_17.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_17_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_17_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_17_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_18.png'
Binary files data/tribes/workers/barbarians/recruit/idle_18.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_18.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_18_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_18_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_18_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_19.png'
Binary files data/tribes/workers/barbarians/recruit/idle_19.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_19.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/idle_19_pc.png'
Binary files data/tribes/workers/barbarians/recruit/idle_19_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/idle_19_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/init.lua'
--- data/tribes/workers/barbarians/recruit/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/barbarians/recruit/init.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,25 @@
+dirname = path.dirname(__file__)
+
+animations = {
+   idle = {
+      pictures = path.list_files(dirname .. "idle_??.png"),
+      hotspot = { 16, 31 },
+      fps = 5
+   }
+}
+add_worker_animations(animations, "walk", dirname, "walk", {16, 31}, 10)
+
+
+tribes:new_worker_type {
+   msgctxt = "barbarians_worker",
+   name = "barbarians_recruit",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext("barbarians_worker", "Recruit"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   buildcost = {}, -- This will give the worker the property "buildable"
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/barbarians/recruit/menu.png'
Binary files data/tribes/workers/barbarians/recruit/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/menu.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_e_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_e_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_e_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_ne_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_ne_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_ne_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_nw_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_nw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_nw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_se_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_se_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_se_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_sw_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_sw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_sw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_00.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_00_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_01.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_01_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_02.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_02_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_03.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_03_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_04.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_04_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_05.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_05_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_06.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_06_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_07.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_07_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_08.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_08_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_09.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/barbarians/recruit/walk_w_09_pc.png'
Binary files data/tribes/workers/barbarians/recruit/walk_w_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/barbarians/recruit/walk_w_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== modified file 'data/tribes/workers/barbarians/soldier/init.lua'
--- data/tribes/workers/barbarians/soldier/init.lua	2016-09-27 06:30:47 +0000
+++ data/tribes/workers/barbarians/soldier/init.lua	2017-01-21 14:37:18 +0000
@@ -69,13 +69,10 @@
    icon = dirname .. "menu.png",
    vision_range = 2,
 
-   buildcost = {
-      barbarians_carrier = 1,
-      ax = 1
-   },
-
    animations = animations,
 
+   default_target_quantity = 10,
+
    -- Battle attributes - initial values and per level increase
    health = {
       max_level = 3,

=== added directory 'data/tribes/workers/empire/recruit'
=== added file 'data/tribes/workers/empire/recruit/helptexts.lua'
--- data/tribes/workers/empire/recruit/helptexts.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/empire/recruit/helptexts.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,4 @@
+function worker_helptext()
+   -- TRANSLATORS: Helptext for a worker: Recruit
+   return pgettext("empire_worker", "Eager to become a soldier and defend your tribe!")
+end

=== added file 'data/tribes/workers/empire/recruit/idle_00.png'
Binary files data/tribes/workers/empire/recruit/idle_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_00_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_01.png'
Binary files data/tribes/workers/empire/recruit/idle_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_01_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_02.png'
Binary files data/tribes/workers/empire/recruit/idle_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_02_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_03.png'
Binary files data/tribes/workers/empire/recruit/idle_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_03_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_04.png'
Binary files data/tribes/workers/empire/recruit/idle_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_04_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_05.png'
Binary files data/tribes/workers/empire/recruit/idle_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_05_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_06.png'
Binary files data/tribes/workers/empire/recruit/idle_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_06_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_07.png'
Binary files data/tribes/workers/empire/recruit/idle_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_07_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_08.png'
Binary files data/tribes/workers/empire/recruit/idle_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_08_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_09.png'
Binary files data/tribes/workers/empire/recruit/idle_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_09_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_10.png'
Binary files data/tribes/workers/empire/recruit/idle_10.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_10.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_10_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_10_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_10_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_11.png'
Binary files data/tribes/workers/empire/recruit/idle_11.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_11.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_11_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_11_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_11_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_12.png'
Binary files data/tribes/workers/empire/recruit/idle_12.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_12.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_12_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_12_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_12_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_13.png'
Binary files data/tribes/workers/empire/recruit/idle_13.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_13.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_13_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_13_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_13_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_14.png'
Binary files data/tribes/workers/empire/recruit/idle_14.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_14.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_14_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_14_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_14_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_15.png'
Binary files data/tribes/workers/empire/recruit/idle_15.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_15.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_15_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_15_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_15_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_16.png'
Binary files data/tribes/workers/empire/recruit/idle_16.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_16.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_16_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_16_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_16_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_17.png'
Binary files data/tribes/workers/empire/recruit/idle_17.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_17.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_17_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_17_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_17_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_18.png'
Binary files data/tribes/workers/empire/recruit/idle_18.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_18.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_18_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_18_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_18_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_19.png'
Binary files data/tribes/workers/empire/recruit/idle_19.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_19.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_19_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_19_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_19_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_20.png'
Binary files data/tribes/workers/empire/recruit/idle_20.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_20.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_20_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_20_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_20_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_21.png'
Binary files data/tribes/workers/empire/recruit/idle_21.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_21.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_21_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_21_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_21_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_22.png'
Binary files data/tribes/workers/empire/recruit/idle_22.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_22.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_22_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_22_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_22_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_23.png'
Binary files data/tribes/workers/empire/recruit/idle_23.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_23.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_23_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_23_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_23_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_24.png'
Binary files data/tribes/workers/empire/recruit/idle_24.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_24.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_24_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_24_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_24_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_25.png'
Binary files data/tribes/workers/empire/recruit/idle_25.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_25.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_25_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_25_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_25_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_26.png'
Binary files data/tribes/workers/empire/recruit/idle_26.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_26.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_26_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_26_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_26_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_27.png'
Binary files data/tribes/workers/empire/recruit/idle_27.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_27.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_27_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_27_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_27_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_28.png'
Binary files data/tribes/workers/empire/recruit/idle_28.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_28.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_28_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_28_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_28_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_29.png'
Binary files data/tribes/workers/empire/recruit/idle_29.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_29.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_29_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_29_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_29_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_30.png'
Binary files data/tribes/workers/empire/recruit/idle_30.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_30.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_30_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_30_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_30_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_31.png'
Binary files data/tribes/workers/empire/recruit/idle_31.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_31.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_31_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_31_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_31_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_32.png'
Binary files data/tribes/workers/empire/recruit/idle_32.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_32.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_32_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_32_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_32_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_33.png'
Binary files data/tribes/workers/empire/recruit/idle_33.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_33.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_33_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_33_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_33_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_34.png'
Binary files data/tribes/workers/empire/recruit/idle_34.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_34.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_34_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_34_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_34_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_35.png'
Binary files data/tribes/workers/empire/recruit/idle_35.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_35.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_35_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_35_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_35_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_36.png'
Binary files data/tribes/workers/empire/recruit/idle_36.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_36.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_36_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_36_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_36_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_37.png'
Binary files data/tribes/workers/empire/recruit/idle_37.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_37.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_37_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_37_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_37_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_38.png'
Binary files data/tribes/workers/empire/recruit/idle_38.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_38.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_38_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_38_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_38_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_39.png'
Binary files data/tribes/workers/empire/recruit/idle_39.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_39.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/idle_39_pc.png'
Binary files data/tribes/workers/empire/recruit/idle_39_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/idle_39_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/init.lua'
--- data/tribes/workers/empire/recruit/init.lua	1970-01-01 00:00:00 +0000
+++ data/tribes/workers/empire/recruit/init.lua	2017-01-21 14:37:18 +0000
@@ -0,0 +1,25 @@
+dirname = path.dirname(__file__)
+
+animations = {
+   idle = {
+      pictures = path.list_files(dirname .. "idle_??.png"),
+      hotspot = { 10, 36 },
+      fps = 5
+   },
+}
+add_worker_animations(animations, "walk", dirname, "walk", {10, 36}, 10)
+
+
+tribes:new_worker_type {
+   msgctxt = "empire_worker",
+   name = "empire_recruit",
+   -- TRANSLATORS: This is a worker name used in lists of workers
+   descname = pgettext("empire_worker", "Recruit"),
+   helptext_script = dirname .. "helptexts.lua",
+   icon = dirname .. "menu.png",
+   vision_range = 2,
+
+   buildcost = {}, -- This will give the worker the property "buildable"
+
+   animations = animations,
+}

=== added file 'data/tribes/workers/empire/recruit/menu.png'
Binary files data/tribes/workers/empire/recruit/menu.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/menu.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_00.png'
Binary files data/tribes/workers/empire/recruit/walk_e_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_01.png'
Binary files data/tribes/workers/empire/recruit/walk_e_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_02.png'
Binary files data/tribes/workers/empire/recruit/walk_e_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_03.png'
Binary files data/tribes/workers/empire/recruit/walk_e_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_04.png'
Binary files data/tribes/workers/empire/recruit/walk_e_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_05.png'
Binary files data/tribes/workers/empire/recruit/walk_e_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_06.png'
Binary files data/tribes/workers/empire/recruit/walk_e_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_07.png'
Binary files data/tribes/workers/empire/recruit/walk_e_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_08.png'
Binary files data/tribes/workers/empire/recruit/walk_e_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_09.png'
Binary files data/tribes/workers/empire/recruit/walk_e_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_e_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_e_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_e_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_00.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_01.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_02.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_03.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_04.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_05.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_06.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_07.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_08.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_09.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_ne_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_ne_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_ne_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_00.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_01.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_02.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_03.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_04.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_05.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_06.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_07.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_08.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_09.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_nw_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_nw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_nw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_00.png'
Binary files data/tribes/workers/empire/recruit/walk_se_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_01.png'
Binary files data/tribes/workers/empire/recruit/walk_se_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_02.png'
Binary files data/tribes/workers/empire/recruit/walk_se_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_03.png'
Binary files data/tribes/workers/empire/recruit/walk_se_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_04.png'
Binary files data/tribes/workers/empire/recruit/walk_se_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_05.png'
Binary files data/tribes/workers/empire/recruit/walk_se_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_06.png'
Binary files data/tribes/workers/empire/recruit/walk_se_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_07.png'
Binary files data/tribes/workers/empire/recruit/walk_se_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_08.png'
Binary files data/tribes/workers/empire/recruit/walk_se_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_09.png'
Binary files data/tribes/workers/empire/recruit/walk_se_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_se_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_se_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_se_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_00.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_01.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_02.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_03.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_04.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_05.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_06.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_07.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_08.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_09.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_sw_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_sw_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_sw_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_00.png'
Binary files data/tribes/workers/empire/recruit/walk_w_00.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_00.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_00_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_00_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_00_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_01.png'
Binary files data/tribes/workers/empire/recruit/walk_w_01.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_01.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_01_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_01_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_01_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_02.png'
Binary files data/tribes/workers/empire/recruit/walk_w_02.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_02.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_02_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_02_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_02_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_03.png'
Binary files data/tribes/workers/empire/recruit/walk_w_03.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_03.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_03_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_03_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_03_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_04.png'
Binary files data/tribes/workers/empire/recruit/walk_w_04.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_04.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_04_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_04_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_04_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_05.png'
Binary files data/tribes/workers/empire/recruit/walk_w_05.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_05.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_05_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_05_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_05_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_06.png'
Binary files data/tribes/workers/empire/recruit/walk_w_06.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_06.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_06_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_06_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_06_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_07.png'
Binary files data/tribes/workers/empire/recruit/walk_w_07.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_07.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_07_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_07_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_07_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_08.png'
Binary files data/tribes/workers/empire/recruit/walk_w_08.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_08.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_08_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_08_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_08_pc.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_09.png'
Binary files data/tribes/workers/empire/recruit/walk_w_09.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_09.png	2017-01-21 14:37:18 +0000 differ
=== added file 'data/tribes/workers/empire/recruit/walk_w_09_pc.png'
Binary files data/tribes/workers/empire/recruit/walk_w_09_pc.png	1970-01-01 00:00:00 +0000 and data/tribes/workers/empire/recruit/walk_w_09_pc.png	2017-01-21 14:37:18 +0000 differ
=== modified file 'data/tribes/workers/empire/soldier/init.lua'
--- data/tribes/workers/empire/soldier/init.lua	2016-09-27 06:30:47 +0000
+++ data/tribes/workers/empire/soldier/init.lua	2017-01-21 14:37:18 +0000
@@ -69,14 +69,10 @@
    icon = dirname .. "menu.png",
    vision_range = 2,
 
-   buildcost = {
-      empire_carrier = 1,
-      armor_helmet = 1,
-      spear_wooden = 1
-   },
-
    animations = animations,
 
+   default_target_quantity = 10,
+
    -- Battle attributes - initial values and per level increase
    health = {
       max_level = 4,

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2016-12-08 17:27:00 +0000
+++ src/ai/defaultai.cc	2017-01-21 14:37:18 +0000
@@ -556,7 +556,7 @@
 			const ProductionSiteDescr& prod = dynamic_cast<const ProductionSiteDescr&>(bld);
 			bo.type = bld.get_ismine() ? BuildingObserver::Type::kMine :
 			                             BuildingObserver::Type::kProductionsite;
-			for (const auto& temp_input : prod.inputs()) {
+			for (const auto& temp_input : prod.input_wares()) {
 				bo.inputs.push_back(temp_input.first);
 			}
 			for (const DescriptionIndex& temp_output : prod.output_ware_types()) {
@@ -667,7 +667,7 @@
 		if (bld.type() == MapObjectType::TRAININGSITE) {
 			bo.type = BuildingObserver::Type::kTrainingsite;
 			const TrainingSiteDescr& train = dynamic_cast<const TrainingSiteDescr&>(bld);
-			for (const auto& temp_input : train.inputs()) {
+			for (const auto& temp_input : train.input_wares()) {
 				bo.inputs.push_back(temp_input.first);
 
 				// collecting subsitutes
@@ -3120,8 +3120,8 @@
 		for (auto& queue : site.site->warequeues()) {
 			if (queue->get_max_fill() == 0) {
 				resetting_wares = true;
-				game().send_player_set_ware_max_fill(
-				   *site.site, queue->get_ware(), queue->get_max_size());
+				game().send_player_set_input_max_fill(
+				   *site.site, queue->get_index(), wwWARE, queue->get_max_size());
 			}
 		}
 		if (resetting_wares) {
@@ -3222,7 +3222,7 @@
 
 			// reducing input queues
 			for (auto& queue : site.site->warequeues()) {
-				game().send_player_set_ware_max_fill(*site.site, queue->get_ware(), 0);
+				game().send_player_set_input_max_fill(*site.site, queue->get_index(), wwWARE, 0);
 			}
 			site.bo->construction_decision_time = gametime;
 			en_bo.construction_decision_time = gametime;

=== modified file 'src/ai/defaultai_warfare.cc'
--- src/ai/defaultai_warfare.cc	2016-12-08 08:49:14 +0000
+++ src/ai/defaultai_warfare.cc	2017-01-21 14:37:18 +0000
@@ -490,10 +490,10 @@
 		// now modifying max_fill of armors and weapons
 		for (std::string pattern : armors_and_weapons) {
 
-			if (tribe_->get_ware_descr(warequeues1[i]->get_ware())->name().find(pattern) !=
+			if (tribe_->get_ware_descr(warequeues1[i]->get_index())->name().find(pattern) !=
 			    std::string::npos) {
 				if (warequeues1[i]->get_max_fill() > 1) {
-					game().send_player_set_ware_max_fill(*ts, warequeues1[i]->get_ware(), 1);
+					game().send_player_set_input_max_fill(*ts, warequeues1[i]->get_index(), wwWARE, 1);
 					continue;
 				}
 			}
@@ -521,7 +521,7 @@
 		std::vector<WaresQueue*> const warequeues2 = tso.site->warequeues();
 		nr_warequeues = warequeues2.size();
 		for (size_t i = 0; i < nr_warequeues; ++i) {
-			if (tso.bo->substitute_inputs.count(warequeues2[i]->get_ware()) > 0) {
+			if (tso.bo->substitute_inputs.count(warequeues2[i]->get_index()) > 0) {
 				filled += warequeues2[i]->get_filled();
 			}
 		}
@@ -531,7 +531,7 @@
 
 		// checking non subsitutes
 		for (size_t i = 0; i < nr_warequeues; ++i) {
-			if (tso.bo->substitute_inputs.count(warequeues2[i]->get_ware()) == 0) {
+			if (tso.bo->substitute_inputs.count(warequeues2[i]->get_index()) == 0) {
 				const uint32_t required_amount =
 				   (warequeues2[i]->get_max_fill() < 5) ? warequeues2[i]->get_max_fill() : 5;
 				if (warequeues2[i]->get_filled() < required_amount) {

=== modified file 'src/economy/CMakeLists.txt'
--- src/economy/CMakeLists.txt	2015-11-28 22:29:26 +0000
+++ src/economy/CMakeLists.txt	2017-01-21 14:37:18 +0000
@@ -40,8 +40,12 @@
     ware_instance.cc
     ware_instance.h
     warehousesupply.h
+    input_queue.cc
+    input_queue.h
     wares_queue.cc
     wares_queue.h
+    workers_queue.cc
+    workers_queue.h
   DEPENDS
     base_exceptions
     base_log

=== modified file 'src/economy/expedition_bootstrap.cc'
--- src/economy/expedition_bootstrap.cc	2016-08-04 15:49:05 +0000
+++ src/economy/expedition_bootstrap.cc	2017-01-21 14:37:18 +0000
@@ -70,10 +70,8 @@
 }
 
 // static
-void ExpeditionBootstrap::ware_callback(Game& game,
-                                        WaresQueue*,
-                                        DescriptionIndex,
-                                        void* const data) {
+void ExpeditionBootstrap::ware_callback(
+   Game& game, InputQueue*, DescriptionIndex, Worker*, void* const data) {
 	ExpeditionBootstrap* eb = static_cast<ExpeditionBootstrap*>(data);
 	eb->is_ready(game);
 }
@@ -147,7 +145,7 @@
 	// Put all wares from the WaresQueues back into the warehouse
 	Warehouse* const warehouse = portdock_->get_warehouse();
 	for (std::unique_ptr<WaresQueue>& wq : wares_) {
-		warehouse->insert_wares(wq->get_ware(), wq->get_filled());
+		warehouse->insert_wares(wq->get_index(), wq->get_filled());
 		wq->cleanup();
 	}
 	wares_.clear();
@@ -180,7 +178,7 @@
 
 WaresQueue& ExpeditionBootstrap::waresqueue(DescriptionIndex index) const {
 	for (const std::unique_ptr<WaresQueue>& wq : wares_) {
-		if (wq->get_ware() == index) {
+		if (wq->get_index() == index) {
 			return *wq.get();
 		}
 	}
@@ -224,7 +222,7 @@
                                                         std::vector<Worker*>* return_workers,
                                                         std::vector<WareInstance*>* return_wares) {
 	for (std::unique_ptr<WaresQueue>& wq : wares_) {
-		const DescriptionIndex ware_index = wq->get_ware();
+		const DescriptionIndex ware_index = wq->get_index();
 		for (uint32_t j = 0; j < wq->get_filled(); ++j) {
 			WareInstance* temp = new WareInstance(ware_index, tribe.get_ware_descr(ware_index));
 			temp->init(game);
@@ -291,7 +289,7 @@
 		wq->read(fr, game, mol);
 		wq->set_callback(ware_callback, this);
 
-		if (wq->get_ware() == INVALID_INDEX) {
+		if (wq->get_index() == INVALID_INDEX) {
 			delete wq;
 		} else {
 			wares_.emplace_back(wq);

=== modified file 'src/economy/expedition_bootstrap.h'
--- src/economy/expedition_bootstrap.h	2016-08-04 15:49:05 +0000
+++ src/economy/expedition_bootstrap.h	2017-01-21 14:37:18 +0000
@@ -84,7 +84,7 @@
 
 	// Handles arriving workers and wares.
 	static void worker_callback(Game&, Request& r, DescriptionIndex, Worker*, PlayerImmovable&);
-	static void ware_callback(Game& game, WaresQueue*, DescriptionIndex, void* const data);
+	static void ware_callback(Game& game, InputQueue*, DescriptionIndex, Worker*, void* const data);
 	void handle_worker_callback(Game&, Request&, Worker*);
 
 	// Tests if all wares for the expedition have arrived. If so, informs the portdock.

=== modified file 'src/economy/idleworkersupply.cc'
--- src/economy/idleworkersupply.cc	2016-08-04 15:49:05 +0000
+++ src/economy/idleworkersupply.cc	2017-01-21 14:37:18 +0000
@@ -87,7 +87,9 @@
 
 uint32_t IdleWorkerSupply::nr_supplies(const Game&, const Request& req) const {
 	assert(req.get_type() != wwWORKER || worker_.owner().tribe().has_worker(req.get_index()));
-	if (req.get_type() == wwWORKER && worker_.descr().can_act_as(req.get_index()) &&
+	if (req.get_type() == wwWORKER &&
+	    (req.get_index() == worker_.descr().worker_index() ||
+	     (!req.get_exact_match() && worker_.descr().can_act_as(req.get_index()))) &&
 	    req.get_requirements().check(worker_))
 		return 1;
 

=== added file 'src/economy/input_queue.cc'
--- src/economy/input_queue.cc	1970-01-01 00:00:00 +0000
+++ src/economy/input_queue.cc	2017-01-21 14:37:18 +0000
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2004-2016 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/input_queue.h"
+
+#include "base/wexception.h"
+#include "economy/economy.h"
+#include "economy/request.h"
+#include "io/fileread.h"
+#include "io/filewrite.h"
+#include "logic/editor_game_base.h"
+#include "logic/game.h"
+#include "logic/map_objects/tribes/tribe_descr.h"
+#include "logic/player.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
+
+namespace Widelands {
+
+InputQueue::InputQueue(PlayerImmovable& init_owner,
+                       DescriptionIndex const init_index,
+                       uint8_t const init_max_size,
+                       WareWorker const init_type)
+   : owner_(init_owner),
+     index_(init_index),
+     max_size_(init_max_size),
+     max_fill_(init_max_size),
+     type_(init_type),
+     consume_interval_(0),
+     request_(nullptr),
+     callback_fn_(nullptr),
+     callback_data_(nullptr) {
+}
+
+void InputQueue::update() {
+
+	assert(get_filled() <= max_size_);
+	assert(max_fill_ <= max_size_);
+	assert(index_ != INVALID_INDEX);
+
+	if (get_filled() < max_fill_) {
+		if (!request_) {
+			request_.reset(new Request(owner_, index_, InputQueue::request_callback, type_));
+			request_->set_exact_match(true);  // Required for worker queues, ignored for wares anyway
+		}
+
+		request_->set_count(max_fill_ - get_filled());
+		request_->set_required_interval(consume_interval_);
+	} else {
+		request_.reset();
+	}
+}
+
+void InputQueue::request_callback(Game& game,
+                                  Request&,
+                                  DescriptionIndex const index,
+                                  Worker* const worker,
+                                  PlayerImmovable& target) {
+
+	WareWorker type = wwWARE;
+	if (worker != nullptr) {
+		assert(index == worker->descr().worker_index());
+		type = wwWORKER;
+	}
+
+	InputQueue& iq = dynamic_cast<Building&>(target).inputqueue(index, type);
+
+	iq.entered(index, worker);
+
+	if (iq.callback_fn_)
+		(*iq.callback_fn_)(game, &iq, index, worker, iq.callback_data_);
+}
+
+void InputQueue::set_callback(CallbackFn* const fn, void* const data) {
+	callback_fn_ = fn;
+	callback_data_ = data;
+}
+
+void InputQueue::set_max_size(const Quantity size) {
+	Quantity old_size = max_size_;
+	max_size_ = size;
+
+	// make sure that max fill is reduced as well if the max size is decreased
+	// because this is very likely what the user wanted to only consume so
+	// and so many wares in the first place. If it is increased, keep the
+	// max fill fill as it was
+	set_max_fill(std::min(max_fill_, max_fill_ - (old_size - max_size_)));
+
+	// No update() since set_max_fill calls it anyway
+}
+
+void InputQueue::set_max_fill(Quantity size) {
+	if (size > max_size_)
+		size = max_size_;
+
+	max_fill_ = size;
+
+	update();
+}
+
+void InputQueue::set_consume_interval(const uint32_t time) {
+	consume_interval_ = time;
+
+	update();
+}
+
+constexpr uint16_t kCurrentPacketVersion = 1;
+
+void InputQueue::read(FileRead& fr, Game& game, MapObjectLoader& mol) {
+
+	uint16_t const packet_version = fr.unsigned_16();
+	try {
+		if (packet_version == kCurrentPacketVersion) {
+			if (fr.unsigned_8() == 0) {
+				assert(type_ == wwWARE);
+				index_ = owner().tribe().ware_index(fr.c_string());
+			} else {
+				assert(type_ == wwWORKER);
+				index_ = owner().tribe().worker_index(fr.c_string());
+			}
+			max_size_ = fr.unsigned_32();
+			max_fill_ = fr.signed_32();
+			consume_interval_ = fr.unsigned_32();
+			if (fr.unsigned_8()) {
+				request_.reset(new Request(owner_, 0, InputQueue::request_callback, type_));
+				request_->read(fr, game, mol);
+			} else {
+				request_.reset();
+			}
+
+			read_child(fr, game, mol);
+
+			//  Now Economy stuff. We have to add our filled items to the economy.
+			if (owner_.get_economy())
+				add_to_economy(*owner_.get_economy());
+		} else {
+			throw UnhandledVersionError("InputQueue", packet_version, kCurrentPacketVersion);
+		}
+	} catch (const GameDataError& e) {
+		throw GameDataError("inputqueue: %s", e.what());
+	}
+}
+
+void InputQueue::write(FileWrite& fw, Game& game, MapObjectSaver& mos) {
+	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());
+	}
+	fw.signed_32(max_size_);
+	fw.signed_32(max_fill_);
+	fw.signed_32(consume_interval_);
+	if (request_) {
+		fw.unsigned_8(1);
+		request_->write(fw, game, mos);
+	} else {
+		fw.unsigned_8(0);
+	}
+
+	write_child(fw, game, mos);
+}
+}

=== added file 'src/economy/input_queue.h'
--- src/economy/input_queue.h	1970-01-01 00:00:00 +0000
+++ src/economy/input_queue.h	2017-01-21 14:37:18 +0000
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2004-2016 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_INPUT_QUEUE_H
+#define WL_ECONOMY_INPUT_QUEUE_H
+
+#include <memory>
+
+#include "logic/map_objects/immovable.h"
+#include "logic/map_objects/tribes/wareworker.h"
+#include "logic/widelands.h"
+
+namespace Widelands {
+
+class Economy;
+class Game;
+class MapObjectLoader;
+struct MapObjectSaver;
+class Player;
+class Request;
+
+/**
+ * Base class for input queues of wares and workers.
+ * Mentioning "wares" in the following nearly always means "wares or workers".
+ */
+class InputQueue {
+public:
+	/**
+	 * Destructor.
+	 * Does nothing currently.
+	 */
+	virtual ~InputQueue() {
+	}
+
+	/**
+	 * The declaration of a callback function which can be registered to get notified
+	 * when wares or workers arrive at the building and should be added to the queue.
+	 * @param game The game the queue is part of.
+	 * @param q The \c InputQueue the ware or worker should be added to.
+	 * @param ware The index of the ware which arrived, if the queue is a WaresQueue.
+	 * @param worker The worker which arrived, if the queue is a WorkersQueue.
+	 * @param data Unspecified data which has been given when calling set_callback().
+	 */
+	using CallbackFn =
+	   void(Game& g, InputQueue* q, DescriptionIndex ware, Worker* worker, void* data);
+
+	/**
+	 * Returns the index of the ware or worker which is handled by the queue.
+	 * @return The DescriptionIndex of whatever is stored here.
+	 */
+	DescriptionIndex get_index() const {
+		return index_;
+	}
+
+	/**
+	  * Get the maximum amount of wares or workers which should be stored here.
+	  * This is a value which can be influenced by the player with the provided buttons.
+	  * @return The maximum number of wares or workers which should be here.
+	 */
+	Quantity get_max_fill() const {
+		return max_fill_;
+	}
+
+	/**
+	 * Whether wares or workers are stored in this queue.
+	 * @return Whether wares or workers are stored in this queue.
+	 */
+	WareWorker get_type() const {
+		return type_;
+	}
+
+	/**
+	 * The maximum size of the queue as defined by the building.
+	 * @return The maximum size.
+	 */
+	Quantity get_max_size() const {
+		return max_size_;
+	}
+
+	/**
+	 * The amount of wares or workers which are stored here currently.
+	 * This might temporarily be larger than get_max_fill() but will
+	 * be smaller than get_max_size().
+	 * @return The amount at this moment.
+	 */
+	virtual Quantity get_filled() const = 0;
+
+	/**
+	 * Clear the queue appropriately.
+	 * Implementing classes should call update() at the end to remove the request.
+	 */
+	virtual void cleanup() = 0;
+
+	/**
+	 * Set the callback function that is called when an item has arrived.
+	 * @param fn The function to call.
+	 * @param data Unspecified data which will be passed on calls of \c fn.
+	 */
+	void set_callback(CallbackFn* fn, void* data);
+
+	/**
+	 * Remove the wares in this queue from the given economy (used in accounting).
+	 * Implementing classes have to set the economy of the potential request.
+	 * @param e The economy to remove the wares or workers from.
+	 */
+	virtual void remove_from_economy(Economy& e) = 0;
+
+	/**
+	 * Add the wares in this queue to the given economy (used in accounting).
+	 * Implementing classes have to set the economy of the potential request.
+	 * @param The economy to add the wares or workers to.
+	 */
+	virtual void add_to_economy(Economy& e) = 0;
+
+	/**
+	 * Change size of the queue.
+	 * This influences how many wares can be in here at maximum.
+	 * @param q The new maximum size.
+	 */
+	void set_max_size(Quantity q);
+
+	/**
+	 * Change the number of wares that should be available in this queue.
+	 *
+	 * This is similar as setting the maximum size,
+	 * but if there are more wares than that in the queue, they will not get
+	 * lost (the building should drop them). This is the method called when the player
+	 * pressed the buttons in the gui.
+	 * @param q The maximum number of wares which should be stored here.
+	 */
+	virtual void set_max_fill(Quantity q);
+
+	/**
+	 * Change fill status of the queue. This creates or removes wares as required.
+	 * Note that the wares are created out of thin air and respectively are removed without
+	 * dropping them on the street.
+	 * @param q The number of wares which are stored here.
+	 */
+	virtual void set_filled(Quantity q) = 0;
+
+	/**
+	 * Set the time between consumption of items when the owning building
+	 * is consuming at full speed.
+	 *
+	 * This interval is merely a hint for the Supply/Request balancing code.
+	 * @param i The interval in ms.
+	*/
+	void set_consume_interval(uint32_t i);
+
+	/**
+	 * Returns the player owning the building containing this queue.
+	 * @return A reference to the owning player.
+	 */
+	Player& owner() const {
+		return owner_.owner();
+	}
+
+	/**
+	 * Overwrites the state of this class with the read data.
+	 * @param fr A stream to read the data from.
+	 * @param game The game this queue will be part of.
+	 * @param mol The game/map loader that handles the lading. Required to pass to Request::read().
+	 */
+	void read(FileRead& f, Game& g, MapObjectLoader& mol);
+
+	/**
+	 * Writes the state of this class.
+	 * @param fw A stream to write the data to.
+	 * @param game The game this queue is part of.
+	 * @param mos The game/map saver that handles the saving. Required to pass to Request::write().
+	 */
+	void write(FileWrite& w, Game& g, MapObjectSaver& s);
+
+protected:
+	/**
+	 * Pre-initialize a InputQueue.
+	 * @param owner The building the queue is part of.
+	 * @param index The index of the ware or worker that will be stored.
+	 * @param max_size The maximum amount that can be stored.
+	 * @param type Whether wares or workers are stored in this queue.
+	*/
+	InputQueue(PlayerImmovable& owner, DescriptionIndex index, uint8_t max_size, WareWorker type);
+
+	/**
+	 * Called when an item arrives at the owning building.
+	 * Most likely only one of \c i or \c w will be valid.
+	 * @param g The game the queue is part of.
+	 * @param r The request for the ware or worker.
+	 * @param i The index of the arrived ware or worker.
+	 * @param w The arrived worker or \c nullptr.
+	 * @param b The building where the ware or worker arrived at.
+	 */
+	static void
+	request_callback(Game& g, Request& r, DescriptionIndex i, Worker* w, PlayerImmovable& b);
+
+	/**
+	 * Updates the request.
+	 * You must call this after every call to set_*().
+	*/
+	void update();
+
+	/**
+	 * Called when an item arrives at the owning building.
+	 * Most likely only one of \c i or \c w will be valid.
+	 * @param index The index of the arrived ware in case of ware queues.
+	 *          Not sure about its value in worker queues.
+	 * @param worker The arrived worker or \c nullptr.
+	 */
+	virtual void entered(DescriptionIndex index, Worker* worker) = 0;
+
+	/**
+	 * Overwrites the state of the subclass with the read data.
+	 * @param fr A stream to read the data from.
+	 * @param game The game this queue will be part of.
+	 * @param mol The game/map loader that handles the loading.
+	 */
+	virtual void read_child(FileRead& f, Game& g, MapObjectLoader& mol) = 0;
+
+	/**
+	 * Writes the state of the subclass.
+	 * @param fw A stream to write the data to.
+	 * @param game The game this queue is part of.
+	 * @param mos The game/map saver that handles the saving.
+	 */
+	virtual void write_child(FileWrite& w, Game& g, MapObjectSaver& s) = 0;
+
+	/// The building this queue is part of.
+	PlayerImmovable& owner_;
+	/// ID of stored ware/worker.
+	DescriptionIndex index_;
+	/// The amount that will fit into the queue maximum.
+	Quantity max_size_;
+	/// The amount that should be ideally in this queue.
+	Quantity max_fill_;
+
+	/// Whether wares or workers are stored in the queue.
+	const WareWorker type_;
+
+	/// Time in ms between consumption at full speed.
+	uint32_t consume_interval_;
+
+	/// The currently pending request.
+	std::unique_ptr<Request> request_;
+
+	/// The function to call on fulfilled request.
+	CallbackFn* callback_fn_;
+	/// Unspecified data to pass to function.
+	void* callback_data_;
+};
+}
+
+#endif  // end of include guard: WL_ECONOMY_INPUT_QUEUE_H

=== modified file 'src/economy/request.cc'
--- src/economy/request.cc	2016-08-04 15:49:05 +0000
+++ src/economy/request.cc	2017-01-21 14:37:18 +0000
@@ -60,6 +60,7 @@
      economy_(init_target.get_economy()),
      index_(index),
      count_(1),
+     exact_match_(false),
      callbackfn_(cbfn),
      required_time_(init_target.owner().egbase().get_gametime()),
      required_interval_(0),
@@ -349,6 +350,13 @@
 }
 
 /**
+ * Sets whether a worker supply has to match exactly or if a can_act_as() comparison is good enough.
+ */
+void Request::set_exact_match(bool match) {
+	exact_match_ = match;
+}
+
+/**
  * Change the time at which the first ware to be delivered is needed.
  * Default is the gametime of the Request creation.
 */

=== modified file 'src/economy/request.h'
--- src/economy/request.h	2016-08-04 15:49:05 +0000
+++ src/economy/request.h	2017-01-21 14:37:18 +0000
@@ -83,6 +83,9 @@
 	uint32_t get_open_count() const {
 		return count_ - transfers_.size();
 	}
+	bool get_exact_match() const {
+		return exact_match_;
+	}
 	bool is_open() const {
 		return transfers_.size() < count_;
 	}
@@ -103,6 +106,7 @@
 
 	void set_economy(Economy*);
 	void set_count(Quantity);
+	void set_exact_match(bool match);
 	void set_required_time(int32_t time);
 	void set_required_interval(int32_t interval);
 
@@ -153,6 +157,8 @@
 	Economy* economy_;
 	DescriptionIndex index_;  //  the index of the ware descr
 	Quantity count_;          //  how many do we need in total
+	bool exact_match_;        // Whether a worker supply has to match exactly
+	                          // or if a can_act_as() comparison is good enough
 
 	CallbackFn callbackfn_;  //  called on request success
 

=== modified file 'src/economy/wares_queue.cc'
--- src/economy/wares_queue.cc	2016-08-04 15:49:05 +0000
+++ src/economy/wares_queue.cc	2017-01-21 14:37:18 +0000
@@ -33,33 +33,19 @@
 
 namespace Widelands {
 
-/**
- * Pre-initialize a WaresQueue
-*/
 WaresQueue::WaresQueue(PlayerImmovable& init_owner,
                        DescriptionIndex const init_ware,
                        uint8_t const init_max_size)
-   : owner_(init_owner),
-     ware_(init_ware),
-     max_size_(init_max_size),
-     max_fill_(init_max_size),
-     filled_(0),
-     consume_interval_(0),
-     request_(nullptr),
-     callback_fn_(nullptr),
-     callback_data_(nullptr) {
-	if (ware_ != INVALID_INDEX)
+   : InputQueue(init_owner, init_ware, init_max_size, wwWARE), filled_(0) {
+	if (index_ != INVALID_INDEX)
 		update();
 }
 
-/**
- * Clear the queue appropriately.
-*/
 void WaresQueue::cleanup() {
-	assert(ware_ != INVALID_INDEX);
+	assert(index_ != INVALID_INDEX);
 
 	if (filled_ && owner_.get_economy())
-		owner_.get_economy()->remove_wares(ware_, filled_);
+		owner_.get_economy()->remove_wares(index_, filled_);
 
 	filled_ = 0;
 	max_size_ = 0;
@@ -67,130 +53,51 @@
 
 	update();
 
-	ware_ = INVALID_INDEX;
-}
-
-/**
- * Fix filled <= size and requests.
- * You must call this after every call to set_*()
-*/
-void WaresQueue::update() {
-	assert(ware_ != INVALID_INDEX);
-
-	if (filled_ > max_size_) {
-		if (owner_.get_economy())
-			owner_.get_economy()->remove_wares(ware_, filled_ - max_size_);
-		filled_ = max_size_;
-	}
-
-	if (filled_ < max_fill_) {
-		if (!request_)
-			request_ = new Request(owner_, ware_, WaresQueue::request_callback, wwWARE);
-
-		request_->set_count(max_fill_ - filled_);
-		request_->set_required_interval(consume_interval_);
-	} else {
-		delete request_;
-		request_ = nullptr;
-	}
-}
-
-/**
- * Set the callback function that is called when an item has arrived.
-*/
-void WaresQueue::set_callback(CallbackFn* const fn, void* const data) {
-	callback_fn_ = fn;
-	callback_data_ = data;
-}
-
-/**
- * Called when an item arrives at the owning building.
-*/
-void WaresQueue::request_callback(Game& game,
-                                  Request&,
-                                  DescriptionIndex const ware,
+	index_ = INVALID_INDEX;
+}
+
+void WaresQueue::entered(DescriptionIndex index,
 #ifndef NDEBUG
-                                  Worker* const w,
+                         Worker* worker
 #else
-                                  Worker*,
+                         Worker*
 #endif
-                                  PlayerImmovable& target) {
-	WaresQueue& wq = dynamic_cast<Building&>(target).waresqueue(ware);
+) {
 
-	assert(!w);  // WaresQueue can't hold workers
-	assert(wq.filled_ < wq.max_size_);
-	assert(wq.ware_ == ware);
+	assert(worker == nullptr);  // WaresQueue can't hold workers
+	assert(filled_ < max_size_);
+	assert(index_ == index);
 
 	// Update
-	wq.set_filled(wq.filled_ + 1);
-
-	if (wq.callback_fn_)
-		(*wq.callback_fn_)(game, &wq, ware, wq.callback_data_);
+	set_filled(filled_ + 1);
 }
 
-/**
- * Remove the wares in this queue from the given economy (used in accounting).
-*/
 void WaresQueue::remove_from_economy(Economy& e) {
-	if (ware_ != INVALID_INDEX) {
-		e.remove_wares(ware_, filled_);
+	if (index_ != INVALID_INDEX) {
+		e.remove_wares(index_, filled_);
 		if (request_)
 			request_->set_economy(nullptr);
 	}
 }
 
-/**
- * Add the wares in this queue to the given economy (used in accounting)
-*/
 void WaresQueue::add_to_economy(Economy& e) {
-	if (ware_ != INVALID_INDEX) {
-		e.add_wares(ware_, filled_);
+	if (index_ != INVALID_INDEX) {
+		e.add_wares(index_, filled_);
 		if (request_)
 			request_->set_economy(&e);
 	}
 }
 
-/**
- * Change size of the queue.
- */
-void WaresQueue::set_max_size(const Quantity size) {
-	Quantity old_size = max_size_;
-	max_size_ = size;
-
-	// make sure that max fill is reduced as well if the max size is decreased
-	// because this is very likely what the user wanted to only consume so
-	// and so many wares in the first place. If it is increased, keep the
-	// max fill fill as it was
-	set_max_fill(std::min(max_fill_, max_fill_ - (old_size - max_size_)));
-
-	update();
-}
-
-/**
- * Change the number of wares that should be available in this queue
- *
- * This is basically the same as setting the maximum size,
- * but if there are more wares than that in the queue, they will not get
- * lost (the building should drop them).
- */
-void WaresQueue::set_max_fill(Quantity size) {
-	if (size > max_size_)
-		size = max_size_;
-
-	max_fill_ = size;
-
-	update();
-}
-
-/**
- * Change fill status of the queue.
- */
-void WaresQueue::set_filled(const Quantity filled) {
+void WaresQueue::set_filled(Quantity filled) {
+
+	if (filled > max_size_)
+		filled = max_size_;
+
 	if (owner_.get_economy()) {
 		if (filled > filled_)
-			owner_.get_economy()->add_wares(ware_, filled - filled_);
+			owner_.get_economy()->add_wares(index_, filled - filled_);
 		else if (filled < filled_)
-			owner_.get_economy()->remove_wares(ware_, filled_ - filled);
+			owner_.get_economy()->remove_wares(index_, filled_ - filled);
 	}
 
 	filled_ = filled;
@@ -199,60 +106,22 @@
 }
 
 /**
- * Set the time between consumption of items when the owning building
- * is consuming at full speed.
- *
- * This interval is merely a hint for the Supply/Request balancing code.
-*/
-void WaresQueue::set_consume_interval(const uint32_t time) {
-	consume_interval_ = time;
-
-	update();
-}
-
-/**
  * Read and write
  */
 
-constexpr uint16_t kCurrentPacketVersion = 2;
+constexpr uint16_t kCurrentPacketVersion = 3;
 
-void WaresQueue::write(FileWrite& fw, Game& game, MapObjectSaver& mos) {
+void WaresQueue::write_child(FileWrite& fw, Game&, MapObjectSaver&) {
 	fw.unsigned_16(kCurrentPacketVersion);
 
-	//  Owner and callback is not saved, but this should be obvious on load.
-	fw.c_string(owner().tribe().get_ware_descr(ware_)->name().c_str());
-	fw.signed_32(max_size_);
-	fw.signed_32(max_fill_);
 	fw.signed_32(filled_);
-	fw.signed_32(consume_interval_);
-	if (request_) {
-		fw.unsigned_8(1);
-		request_->write(fw, game, mos);
-	} else
-		fw.unsigned_8(0);
 }
 
-void WaresQueue::read(FileRead& fr, Game& game, MapObjectLoader& mol) {
+void WaresQueue::read_child(FileRead& fr, Game&, MapObjectLoader&) {
 	uint16_t const packet_version = fr.unsigned_16();
 	try {
 		if (packet_version == kCurrentPacketVersion) {
-			delete request_;
-			ware_ = owner().tribe().ware_index(fr.c_string());
-			max_size_ = fr.unsigned_32();
-			max_fill_ = fr.signed_32();
 			filled_ = fr.unsigned_32();
-			consume_interval_ = fr.unsigned_32();
-			if (fr.unsigned_8()) {
-				request_ =      //  TODO(unknown): Change Request::read
-				   new Request  //  to a constructor.
-				   (owner_, 0, WaresQueue::request_callback, wwWORKER);
-				request_->read(fr, game, mol);
-			} else
-				request_ = nullptr;
-
-			//  Now Economy stuff. We have to add our filled items to the economy.
-			if (owner_.get_economy())
-				add_to_economy(*owner_.get_economy());
 		} else {
 			throw UnhandledVersionError("WaresQueue", packet_version, kCurrentPacketVersion);
 		}

=== modified file 'src/economy/wares_queue.h'
--- src/economy/wares_queue.h	2016-08-04 15:49:05 +0000
+++ src/economy/wares_queue.h	2017-01-21 14:37:18 +0000
@@ -20,6 +20,7 @@
 #ifndef WL_ECONOMY_WARES_QUEUE_H
 #define WL_ECONOMY_WARES_QUEUE_H
 
+#include "economy/input_queue.h"
 #include "logic/map_objects/immovable.h"
 #include "logic/widelands.h"
 
@@ -37,67 +38,35 @@
 /**
  * This micro storage room can hold any number of items of a fixed ware.
  */
-class WaresQueue {
+class WaresQueue : public InputQueue {
 public:
-	using CallbackFn = void(Game&, WaresQueue*, DescriptionIndex ware, void* data);
-
 	WaresQueue(PlayerImmovable&, DescriptionIndex, uint8_t size);
 
 #ifndef NDEBUG
-	~WaresQueue() {
-		assert(ware_ == INVALID_INDEX);
+	~WaresQueue() override {
+		assert(index_ == INVALID_INDEX);
 	}
 #endif
 
-	DescriptionIndex get_ware() const {
-		return ware_;
-	}
-	Quantity get_max_fill() const {
-		return max_fill_;
-	}
-	Quantity get_max_size() const {
-		return max_size_;
-	}
-	Quantity get_filled() const {
+	Quantity get_filled() const override {
 		return filled_;
 	}
 
-	void cleanup();
-
-	void set_callback(CallbackFn*, void* data);
-
-	void remove_from_economy(Economy&);
-	void add_to_economy(Economy&);
-
-	void set_max_size(Quantity);
-	void set_max_fill(Quantity);
-	void set_filled(Quantity);
-	void set_consume_interval(uint32_t);
-
-	Player& owner() const {
-		return owner_.owner();
-	}
-
-	void read(FileRead&, Game&, MapObjectLoader&);
-	void write(FileWrite&, Game&, MapObjectSaver&);
-
-private:
-	static void request_callback(Game&, Request&, DescriptionIndex, Worker*, PlayerImmovable&);
-	void update();
-
-	PlayerImmovable& owner_;
-	DescriptionIndex ware_;  ///< ware ID
-	Quantity max_size_;      ///< nr of items that fit into the queue maximum
-	Quantity max_fill_;      ///< nr of wares that should be ideally in this queue
-	Quantity filled_;        ///< nr of items that are currently in the queue
-
-	///< time in ms between consumption at full speed
-	uint32_t consume_interval_;
-
-	Request* request_;  ///< currently pending request
-
-	CallbackFn* callback_fn_;
-	void* callback_data_;
+	void cleanup() override;
+
+	void remove_from_economy(Economy&) override;
+	void add_to_economy(Economy&) override;
+
+	void set_filled(Quantity) override;
+
+protected:
+	void read_child(FileRead&, Game&, MapObjectLoader&) override;
+	void write_child(FileWrite&, Game&, MapObjectSaver&) override;
+
+	void entered(DescriptionIndex index, Worker* worker) override;
+
+	/// Number of items that are currently in the queue
+	Quantity filled_;
 };
 }
 

=== added file 'src/economy/workers_queue.cc'
--- src/economy/workers_queue.cc	1970-01-01 00:00:00 +0000
+++ src/economy/workers_queue.cc	2017-01-21 14:37:18 +0000
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2004-2016 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/workers_queue.h"
+
+#include "base/wexception.h"
+#include "economy/economy.h"
+#include "economy/request.h"
+#include "io/fileread.h"
+#include "io/filewrite.h"
+#include "logic/editor_game_base.h"
+#include "logic/game.h"
+#include "logic/map_objects/tribes/tribe_descr.h"
+#include "logic/player.h"
+#include "map_io/map_object_loader.h"
+#include "map_io/map_object_saver.h"
+
+namespace Widelands {
+
+/**
+ * Pre-initialize a WorkersQueue
+*/
+WorkersQueue::WorkersQueue(PlayerImmovable& init_owner,
+                           DescriptionIndex const init_ware,
+                           uint8_t const init_max_size)
+   : InputQueue(init_owner, init_ware, init_max_size, wwWORKER), workers_() {
+	if (index_ != INVALID_INDEX)
+		update();
+}
+
+/**
+ * Clear the queue appropriately.
+*/
+void WorkersQueue::cleanup() {
+	assert(index_ != INVALID_INDEX);
+
+	// Seems like workers don't need to be removed (done by building?)
+	workers_.clear();
+	max_size_ = 0;
+	max_fill_ = 0;
+
+	update();
+
+	index_ = INVALID_INDEX;
+}
+
+/**
+ * Called when a worker arrives at the owning building.
+*/
+void WorkersQueue::entered(DescriptionIndex index, Worker* worker) {
+
+	assert(worker != nullptr);
+	assert(get_filled() < max_size_);
+	assert(index_ == index);
+
+	EditorGameBase& egbase = owner().egbase();
+	if (worker->get_location(egbase) != &(owner_)) {
+		worker->set_location(&(owner_));
+	}
+	assert(worker->get_location(egbase) == &owner_);
+
+	// Bind the worker into this house, hide him on the map
+	if (upcast(Game, game, &egbase)) {
+		worker->start_task_idle(*game, 0, -1);
+	}
+
+	// Add worker to queue
+	workers_.push_back(worker);
+
+	// Make sure the request count is reduced or the request is deleted.
+	update();
+}
+
+void WorkersQueue::remove_from_economy(Economy&) {
+	if (index_ != INVALID_INDEX) {
+		if (request_) {
+			request_.reset();
+		}
+		// Removal of workers from the economy is not required, this is done by the building (or so)
+	}
+}
+
+void WorkersQueue::add_to_economy(Economy&) {
+	if (index_ != INVALID_INDEX) {
+		update();
+	}
+}
+
+/**
+ * Change fill status of the queue.
+ */
+void WorkersQueue::set_filled(Quantity filled) {
+	if (filled > max_size_) {
+		filled = max_size_;
+	}
+	if (filled == get_filled())
+		return;
+
+	// Now adjust them
+	const TribeDescr& tribe = owner().tribe();
+	const WorkerDescr* worker_descr = tribe.get_worker_descr(index_);
+	EditorGameBase& egbase = owner().egbase();
+	upcast(Game, game, &egbase);
+	assert(game != nullptr);
+
+	// Add workers
+	while (get_filled() < filled) {
+		// Create new worker
+		Worker& w =
+		   worker_descr->create(egbase, owner(), &owner_, owner_.get_positions(egbase).front());
+		assert(w.get_location(egbase) == &owner_);
+		w.start_task_idle(*game, 0, -1);
+		workers_.push_back(&w);
+	}
+	assert(get_filled() >= filled);
+
+	// Remove workers
+	// Note: This might be slow (removing from start) but we want to consume
+	// the first worker in the queue first
+	while (get_filled() > filled) {
+		// Remove worker
+		assert(!workers_.empty());
+		Worker* w = workers_.front();
+		assert(w->get_location(egbase) == &owner_);
+		// Remove from game
+		w->schedule_destroy(*game);
+		// Remove reference from list
+		workers_.erase(workers_.begin());
+	}
+	assert(get_filled() == filled);
+	update();
+}
+
+void WorkersQueue::set_max_fill(Quantity q) {
+	InputQueue::set_max_fill(q);
+
+	// If requested, kick out workers
+	upcast(Game, game, &owner().egbase());
+	while (workers_.size() > max_fill_) {
+		workers_.back()->reset_tasks(*game);
+		workers_.back()->start_task_leavebuilding(*game, true);
+		workers_.pop_back();
+	}
+}
+
+/**
+ * Read and write
+ */
+
+constexpr uint16_t kCurrentPacketVersion = 3;
+
+void WorkersQueue::write_child(FileWrite& fw, Game&, MapObjectSaver& mos) {
+	fw.unsigned_16(kCurrentPacketVersion);
+	// Store references to the workers
+	fw.unsigned_32(workers_.size());
+	for (Worker* w : workers_) {
+		assert(mos.is_object_known(*w));
+		fw.unsigned_32(mos.get_object_file_index(*w));
+	}
+}
+
+void WorkersQueue::read_child(FileRead& fr, Game&, MapObjectLoader& mol) {
+	uint16_t const packet_version = fr.unsigned_16();
+	try {
+		if (packet_version == kCurrentPacketVersion) {
+			size_t nr_workers = fr.unsigned_32();
+			assert(nr_workers <= max_size_);
+			assert(workers_.empty());
+			for (size_t i = 0; i < nr_workers; ++i) {
+				workers_.push_back(&mol.get<Worker>(fr.unsigned_32()));
+			}
+			assert(workers_.size() == nr_workers);
+		} else {
+			throw UnhandledVersionError("WorkersQueue", packet_version, kCurrentPacketVersion);
+		}
+	} catch (const GameDataError& e) {
+		throw GameDataError("workersqueue: %s", e.what());
+	}
+}
+}

=== added file 'src/economy/workers_queue.h'
--- src/economy/workers_queue.h	1970-01-01 00:00:00 +0000
+++ src/economy/workers_queue.h	2017-01-21 14:37:18 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2004-2016 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_WORKERS_QUEUE_H
+#define WL_ECONOMY_WORKERS_QUEUE_H
+
+#include "economy/input_queue.h"
+#include "logic/map_objects/immovable.h"
+#include "logic/widelands.h"
+
+namespace Widelands {
+
+class Economy;
+class EditorGameBase;
+class Game;
+class MapObjectLoader;
+struct MapObjectSaver;
+class Player;
+class Request;
+class Worker;
+
+/**
+ * This micro storage room can hold any number of items of a fixed worker.
+ */
+class WorkersQueue : public InputQueue {
+public:
+	WorkersQueue(PlayerImmovable&, DescriptionIndex, uint8_t size);
+
+#ifndef NDEBUG
+	~WorkersQueue() override {
+		assert(index_ == INVALID_INDEX);
+	}
+#endif
+
+	Quantity get_filled() const override {
+		return workers_.size();
+	}
+
+	void cleanup() override;
+
+	void remove_from_economy(Economy&) override;
+	void add_to_economy(Economy&) override;
+
+	void set_filled(Quantity) override;
+
+	void set_max_fill(Quantity q) override;
+
+protected:
+	void read_child(FileRead&, Game&, MapObjectLoader&) override;
+	void write_child(FileWrite&, Game&, MapObjectSaver&) override;
+
+	void entered(DescriptionIndex index, Worker* worker) override;
+
+	/// The workers currently in the queue
+	std::vector<Worker*> workers_;
+};
+}
+
+#endif  // WL_ECONOMY_WORKERS_QUEUE_H

=== modified file 'src/logic/cmd_luacoroutine.cc'
--- src/logic/cmd_luacoroutine.cc	2017-01-08 15:42:04 +0000
+++ src/logic/cmd_luacoroutine.cc	2017-01-21 14:37:18 +0000
@@ -49,7 +49,7 @@
 	} catch (LuaError& e) {
 		log("Error in Lua Coroutine\n");
 		log("%s\n", e.what());
-		log("Send message to all players and pause game");
+		log("Send message to all players and pause game\n");
 		for (int i = 1; i <= game.map().get_nrplayers(); i++) {
 			Widelands::Message& msg = *new Widelands::Message(
 			   Message::Type::kGameLogic, game.get_gametime(), "Coroutine",

=== modified file 'src/logic/game.cc'
--- src/logic/game.cc	2017-01-08 15:42:04 +0000
+++ src/logic/game.cc	2017-01-21 14:37:18 +0000
@@ -704,11 +704,12 @@
 	   *new CmdSetWarePriority(get_gametime(), imm.owner().player_number(), imm, type, index, prio));
 }
 
-void Game::send_player_set_ware_max_fill(PlayerImmovable& imm,
-                                         DescriptionIndex const index,
-                                         uint32_t const max_fill) {
-	send_player_command(
-	   *new CmdSetWareMaxFill(get_gametime(), imm.owner().player_number(), imm, index, max_fill));
+void Game::send_player_set_input_max_fill(PlayerImmovable& imm,
+                                          DescriptionIndex const index,
+                                          WareWorker type,
+                                          uint32_t const max_fill) {
+	send_player_command(*new CmdSetInputMaxFill(
+	   get_gametime(), imm.owner().player_number(), imm, index, type, max_fill));
 }
 
 void Game::send_player_change_training_options(TrainingSite& ts,

=== modified file 'src/logic/game.h'
--- src/logic/game.h	2016-08-04 15:49:05 +0000
+++ src/logic/game.h	2017-01-21 14:37:18 +0000
@@ -198,7 +198,10 @@
 	                                   int32_t type,
 	                                   DescriptionIndex index,
 	                                   int32_t prio);
-	void send_player_set_ware_max_fill(PlayerImmovable&, DescriptionIndex index, uint32_t);
+	void send_player_set_input_max_fill(PlayerImmovable&,
+	                                    DescriptionIndex index,
+	                                    WareWorker type,
+	                                    uint32_t);
 	void send_player_change_training_options(TrainingSite&, TrainingAttribute, int32_t);
 	void send_player_drop_soldier(Building&, int32_t);
 	void send_player_change_soldier_capacity(Building&, int32_t);

=== modified file 'src/logic/map_objects/immovable.h'
--- src/logic/map_objects/immovable.h	2016-12-18 17:02:44 +0000
+++ src/logic/map_objects/immovable.h	2017-01-21 14:37:18 +0000
@@ -357,7 +357,7 @@
 	/**
 	 * \return a list of workers that are currently located at this
 	 * immovable. This is not the same as the list of production
-	 * workers returned by \ref ProductionSite::get_production_workers
+	 * workers returned by \ref ProductionSite::working_positions
 	 */
 	const Workers& get_workers() const {
 		return workers_;

=== modified file 'src/logic/map_objects/tribes/building.cc'
--- src/logic/map_objects/tribes/building.cc	2016-12-15 20:39:17 +0000
+++ src/logic/map_objects/tribes/building.cc	2017-01-21 14:37:18 +0000
@@ -30,7 +30,10 @@
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/flag.h"
+#include "economy/input_queue.h"
 #include "economy/request.h"
+#include "economy/wares_queue.h"
+#include "economy/workers_queue.h"
 #include "graphic/graphic.h"
 #include "graphic/rendertarget.h"
 #include "io/filesystem/filesystem.h"
@@ -476,10 +479,22 @@
 	return result;
 }
 
+InputQueue& Building::inputqueue(DescriptionIndex const wi, WareWorker const t) {
+	if (t == wwWARE) {
+		return waresqueue(wi);
+	} else {
+		return workersqueue(wi);
+	}
+}
+
 WaresQueue& Building::waresqueue(DescriptionIndex const wi) {
 	throw wexception("%s (%u) has no WaresQueue for %u", descr().name().c_str(), serial(), wi);
 }
 
+WorkersQueue& Building::workersqueue(DescriptionIndex const wi) {
+	throw wexception("%s (%u) has no WorkersQueue for %u", descr().name().c_str(), serial(), wi);
+}
+
 /*
 ===============
 This function is called by workers in the buildingwork task.

=== modified file 'src/logic/map_objects/tribes/building.h'
--- src/logic/map_objects/tribes/building.h	2016-11-03 07:20:57 +0000
+++ src/logic/map_objects/tribes/building.h	2017-01-21 14:37:18 +0000
@@ -49,7 +49,9 @@
 struct Flag;
 struct Message;
 class TribeDescr;
+class InputQueue;
 class WaresQueue;
+class WorkersQueue;
 
 class Building;
 
@@ -235,9 +237,15 @@
 		return statistics_string_;
 	}
 
+	/// \returns the queue for the matching ware or worker type or \throws WException.
+	virtual InputQueue& inputqueue(DescriptionIndex, WareWorker);
+
 	/// \returns the queue for a ware type or \throws WException.
 	virtual WaresQueue& waresqueue(DescriptionIndex);
 
+	/// \returns the queue for a worker type or \throws WException.
+	virtual WorkersQueue& workersqueue(DescriptionIndex);
+
 	virtual bool burn_on_destroy();
 	void destroy(EditorGameBase&) override;
 

=== modified file 'src/logic/map_objects/tribes/constructionsite.cc'
--- src/logic/map_objects/tribes/constructionsite.cc	2016-12-01 17:35:34 +0000
+++ src/logic/map_objects/tribes/constructionsite.cc	2017-01-21 14:37:18 +0000
@@ -82,7 +82,7 @@
 */
 WaresQueue& ConstructionSite::waresqueue(DescriptionIndex const wi) {
 	for (WaresQueue* ware : wares_) {
-		if (ware->get_ware() == wi) {
+		if (ware->get_index() == wi) {
 			return *ware;
 		}
 	}
@@ -240,8 +240,8 @@
 		WaresQueue* queue = iqueue;
 		if (queue->get_filled() > queue->get_max_fill()) {
 			queue->set_filled(queue->get_filled() - 1);
-			const WareDescr& wd = *owner().tribe().get_ware_descr(queue->get_ware());
-			WareInstance& ware = *new WareInstance(queue->get_ware(), &wd);
+			const WareDescr& wd = *owner().tribe().get_ware_descr(queue->get_index());
+			WareInstance& ware = *new WareInstance(queue->get_index(), &wd);
 			ware.init(game);
 			worker.start_task_dropoff(game, ware);
 			return true;
@@ -260,7 +260,7 @@
 			wq.set_max_size(wq.get_max_size() - 1);
 
 			// Update consumption statistic
-			owner().ware_consumed(wq.get_ware(), 1);
+			owner().ware_consumed(wq.get_index(), 1);
 
 			working_ = true;
 			work_steptime_ = game.get_gametime() + CONSTRUCTIONSITE_STEP_TIME;
@@ -282,13 +282,11 @@
 
 /*
 ===============
-Called by WaresQueue code when an ware has arrived
+Called by InputQueue code when an ware has arrived
 ===============
 */
-void ConstructionSite::wares_queue_callback(Game& game,
-                                            WaresQueue*,
-                                            DescriptionIndex,
-                                            void* const data) {
+void ConstructionSite::wares_queue_callback(
+   Game& game, InputQueue*, DescriptionIndex, Worker*, void* const data) {
 	ConstructionSite& cs = *static_cast<ConstructionSite*>(data);
 
 	if (!cs.working_)

=== modified file 'src/logic/map_objects/tribes/constructionsite.h'
--- src/logic/map_objects/tribes/constructionsite.h	2016-11-03 07:20:57 +0000
+++ src/logic/map_objects/tribes/constructionsite.h	2017-01-21 14:37:18 +0000
@@ -112,7 +112,7 @@
 	}
 	void create_options_window(InteractiveGameBase&, UI::Window*& registry) override;
 
-	static void wares_queue_callback(Game&, WaresQueue*, DescriptionIndex, void* data);
+	static void wares_queue_callback(Game&, InputQueue*, DescriptionIndex, Worker*, void* data);
 
 	void draw(uint32_t gametime,
 	          TextToDraw draw_text,

=== modified file 'src/logic/map_objects/tribes/dismantlesite.cc'
--- src/logic/map_objects/tribes/dismantlesite.cc	2016-12-01 17:35:34 +0000
+++ src/logic/map_objects/tribes/dismantlesite.cc	2017-01-21 14:37:18 +0000
@@ -184,10 +184,10 @@
 			wq.set_max_size(wq.get_max_size() - 1);
 
 			// Update statistics
-			owner().ware_produced(wq.get_ware());
+			owner().ware_produced(wq.get_index());
 
-			const WareDescr& wd = *owner().tribe().get_ware_descr(wq.get_ware());
-			WareInstance& ware = *new WareInstance(wq.get_ware(), &wd);
+			const WareDescr& wd = *owner().tribe().get_ware_descr(wq.get_index());
+			WareInstance& ware = *new WareInstance(wq.get_index(), &wd);
 			ware.init(game);
 			worker.start_task_dropoff(game, ware);
 

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2016-12-03 13:32:28 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2017-01-21 14:37:18 +0000
@@ -32,6 +32,7 @@
 #include "economy/economy.h"
 #include "economy/flag.h"
 #include "economy/wares_queue.h"
+#include "economy/workers_queue.h"
 #include "graphic/graphic.h"
 #include "helper.h"
 #include "io/filesystem/layered_filesystem.h"
@@ -200,8 +201,9 @@
 void ProductionProgram::parse_ware_type_group(char*& parameters,
                                               WareTypeGroup& group,
                                               const Tribes& tribes,
-                                              const BillOfMaterials& inputs) {
-	std::set<DescriptionIndex>::iterator last_insert_pos = group.first.end();
+                                              const BillOfMaterials& input_wares,
+                                              const BillOfMaterials& input_workers) {
+	std::set<std::pair<DescriptionIndex, WareWorker>>::iterator last_insert_pos = group.first.end();
 	uint8_t count = 1;
 	uint8_t count_max = 0;
 	for (;;) {
@@ -211,25 +213,41 @@
 		char const terminator = *parameters;
 		*parameters = '\0';
 
-		DescriptionIndex const ware_index = tribes.safe_ware_index(ware);
+		// Try as ware
+		WareWorker type = wwWARE;
+		const BillOfMaterials* input_list = &input_wares;
+		DescriptionIndex ware_index = tribes.ware_index(ware);
+		if (!tribes.ware_exists(ware_index)) {
+			ware_index = tribes.worker_index(ware);
+			if (tribes.worker_exists(ware_index)) {
+				// It is a worker
+				type = wwWORKER;
+				input_list = &input_workers;
+			} else {
+				throw GameDataError("Unknown ware or worker type \"%s\"", ware);
+			}
+		}
 
-		for (BillOfMaterials::const_iterator input_it = inputs.begin(); input_it != inputs.end();
-		     ++input_it) {
-			if (input_it == inputs.end()) {
-				throw GameDataError("%s is not declared as an input (\"%s=<count>\" was not "
-				                    "found in the [inputs] section)",
-				                    ware, ware);
-			} else if (input_it->first == ware_index) {
-				count_max += input_it->second;
+		bool found = false;
+		for (const WareAmount& input : *input_list) {
+			if (input.first == ware_index) {
+				count_max += input.second;
+				found = true;
 				break;
 			}
 		}
+		if (!found) {
+			throw GameDataError("%s is not declared as an input (\"%s=<count>\" was not "
+			                    "found in the [inputs] section)",
+			                    ware, ware);
+		}
 
-		if (group.first.size() && ware_index <= *group.first.begin())
+		if (group.first.size() && ware_index <= group.first.begin()->first)
 			throw GameDataError("wrong order of ware types within group: ware type %s appears "
 			                    "after ware type %s (fix order!)",
-			                    ware, tribes.get_ware_descr(*group.first.begin())->name().c_str());
-		last_insert_pos = group.first.insert(last_insert_pos, ware_index);
+			                    ware,
+			                    tribes.get_ware_descr(group.first.begin()->first)->name().c_str());
+		last_insert_pos = group.first.insert(last_insert_pos, std::make_pair(ware_index, type));
 		*parameters = terminator;
 		switch (terminator) {
 		case ':': {
@@ -331,7 +349,7 @@
                                                const ProductionSiteDescr& descr,
                                                const Tribes& tribes) {
 	try {
-		parse_ware_type_group(parameters, group, tribes, descr.inputs());
+		parse_ware_type_group(parameters, group, tribes, descr.input_wares(), descr.input_workers());
 	} catch (const WException& e) {
 		throw GameDataError("has ware_type1[,ware_type2[,...]][:N]: %s", e.what());
 	}
@@ -339,11 +357,14 @@
 bool ProductionProgram::ActReturn::SiteHas::evaluate(const ProductionSite& ps) const {
 	uint8_t count = group.second;
 	for (WaresQueue* ip_queue : ps.warequeues()) {
-		if (group.first.count(ip_queue->get_ware())) {
-			uint8_t const filled = ip_queue->get_filled();
-			if (count <= filled)
-				return true;
-			count -= filled;
+		for (const auto& ware_type : group.first) {
+			if (ware_type.first == ip_queue->get_index() && ware_type.second == wwWARE) {
+				uint8_t const filled = ip_queue->get_filled();
+				if (count <= filled)
+					return true;
+				count -= filled;
+				break;
+			}
 		}
 	}
 	return false;
@@ -351,8 +372,12 @@
 
 std::string ProductionProgram::ActReturn::SiteHas::description(const Tribes& tribes) const {
 	std::vector<std::string> condition_list;
-	for (const DescriptionIndex& temp_ware : group.first) {
-		condition_list.push_back(tribes.get_ware_descr(temp_ware)->descname());
+	for (const auto& entry : group.first) {
+		if (entry.second == wwWARE) {
+			condition_list.push_back(tribes.get_ware_descr(entry.first)->descname());
+		} else {
+			condition_list.push_back(tribes.get_worker_descr(entry.first)->descname());
+		}
 	}
 	std::string condition = i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 	if (1 < group.second) {
@@ -373,8 +398,12 @@
 std::string
 ProductionProgram::ActReturn::SiteHas::description_negation(const Tribes& tribes) const {
 	std::vector<std::string> condition_list;
-	for (const DescriptionIndex& temp_ware : group.first) {
-		condition_list.push_back(tribes.get_ware_descr(temp_ware)->descname());
+	for (const auto& entry : group.first) {
+		if (entry.second == wwWARE) {
+			condition_list.push_back(tribes.get_ware_descr(entry.first)->descname());
+		} else {
+			condition_list.push_back(tribes.get_worker_descr(entry.first)->descname());
+		}
 	}
 	std::string condition = i18n::localize_list(condition_list, i18n::ConcatenateWith::AND);
 	if (1 < group.second) {
@@ -759,13 +788,14 @@
                                           const Tribes& tribes) {
 	try {
 		for (;;) {
-			consumed_wares_.resize(consumed_wares_.size() + 1);
-			parse_ware_type_group(parameters, *consumed_wares_.rbegin(), tribes, descr.inputs());
+			consumed_wares_workers_.resize(consumed_wares_workers_.size() + 1);
+			parse_ware_type_group(parameters, *consumed_wares_workers_.rbegin(), tribes, descr.input_wares(),
+			                      descr.input_workers());
 			if (!*parameters)
 				break;
 			force_skip(parameters);
 		}
-		if (consumed_wares_.empty()) {
+		if (consumed_wares_workers_.empty()) {
 			throw GameDataError("expected ware_type1[,ware_type2[,...]][:N] ...");
 		}
 	} catch (const WException& e) {
@@ -775,38 +805,76 @@
 
 void ProductionProgram::ActConsume::execute(Game& game, ProductionSite& ps) const {
 	std::vector<WaresQueue*> const warequeues = ps.warequeues();
-	size_t const nr_warequeues = warequeues.size();
-	std::vector<uint8_t> consumption_quantities(nr_warequeues, 0);
+	std::vector<WorkersQueue*> const workerqueues = ps.workerqueues();
+	std::vector<uint8_t> consumption_quantities_wares(warequeues.size(), 0);
+	std::vector<uint8_t> consumption_quantities_workers(workerqueues.size(), 0);
 
-	Groups l_groups = consumed_wares_;  //  make a copy for local modification
+	Groups l_groups = consumed_wares_workers_;  //  make a copy for local modification
 
 	//  Iterate over all input queues and see how much we should consume from
 	//  each of them.
-	for (size_t i = 0; i < nr_warequeues; ++i) {
-		DescriptionIndex const ware_type = warequeues[i]->get_ware();
+	bool found;
+	for (size_t i = 0; i < warequeues.size(); ++i) {
+		DescriptionIndex const ware_type = warequeues[i]->get_index();
 		uint8_t nr_available = warequeues[i]->get_filled();
-		consumption_quantities[i] = 0;
+		consumption_quantities_wares[i] = 0;
 
 		//  Iterate over all consume groups and see if they want us to consume
 		//  any thing from the currently considered input queue.
-		for (Groups::iterator it = l_groups.begin(); it != l_groups.end();)
-			if (it->first.count(ware_type)) {
-				if (it->second <= nr_available) {
-					//  There are enough wares of the currently considered type
-					//  to fulfill the requirements of the current group. We can
-					//  therefore erase the group.
-					consumption_quantities[i] += it->second;
-					nr_available -= it->second;
-					it = l_groups.erase(it);
-					//  No increment here, erase moved next element to the position
-					//  pointed to by it.
-				} else {
-					consumption_quantities[i] += nr_available;
-					it->second -= nr_available;
-					++it;  //  Now check if the next group includes this ware type.
-				}
-			} else
-				++it;
+		for (Groups::iterator it = l_groups.begin(); it != l_groups.end();) {
+			found = false;
+			for (auto ware_it = it->first.begin(); ware_it != it->first.end(); ware_it++) {
+				if (ware_it->first == ware_type && ware_it->second == wwWARE) {
+					found = true;
+					if (it->second <= nr_available) {
+						//  There are enough wares of the currently considered type
+						//  to fulfill the requirements of the current group. We can
+						//  therefore erase the group.
+						consumption_quantities_wares[i] += it->second;
+						nr_available -= it->second;
+						it = l_groups.erase(it);
+						//  No increment here, erase moved next element to the position
+						//  pointed to by it.
+					} else {
+						consumption_quantities_wares[i] += nr_available;
+						it->second -= nr_available;
+						++it;  //  Now check if the next group includes this ware type.
+					}
+					break;
+				}
+			}
+			// group does not request ware
+			if (!found)
+				++it;
+		}
+	}
+
+	// Same for workers
+	for (size_t i = 0; i < workerqueues.size(); ++i) {
+		DescriptionIndex const worker_type = workerqueues[i]->get_index();
+		uint8_t nr_available = workerqueues[i]->get_filled();
+		consumption_quantities_workers[i] = 0;
+
+		for (Groups::iterator it = l_groups.begin(); it != l_groups.end();) {
+			found = false;
+			for (auto worker_it = it->first.begin(); worker_it != it->first.end(); worker_it++) {
+				if (worker_it->first == worker_type && worker_it->second == wwWORKER) {
+					found = true;
+					if (it->second <= nr_available) {
+						consumption_quantities_workers[i] += it->second;
+						nr_available -= it->second;
+						it = l_groups.erase(it);
+					} else {
+						consumption_quantities_workers[i] += nr_available;
+						it->second -= nr_available;
+						++it;
+					}
+					break;
+				}
+			}
+			if (!found)
+				++it;
+		}
 	}
 
 	// "Did not start working because .... is/are missing"
@@ -818,8 +886,12 @@
 			assert(group.first.size());
 
 			std::vector<std::string> ware_list;
-			for (const DescriptionIndex& ware : group.first) {
-				ware_list.push_back(tribe.get_ware_descr(ware)->descname());
+			for (const auto& entry : group.first) {
+				if (entry.second == wwWARE) {
+					ware_list.push_back(tribe.get_ware_descr(entry.first)->descname());
+				} else {
+					ware_list.push_back(tribe.get_worker_descr(entry.first)->descname());
+				}
 			}
 			std::string ware_string = i18n::localize_list(ware_list, i18n::ConcatenateWith::OR);
 
@@ -862,14 +934,21 @@
 		ps.set_production_result(result_string);
 		return ps.program_end(game, Failed);
 	} else {  //  we fulfilled all consumption requirements
-		for (size_t i = 0; i < nr_warequeues; ++i)
-			if (uint8_t const q = consumption_quantities[i]) {
+		for (size_t i = 0; i < warequeues.size(); ++i) {
+			if (uint8_t const q = consumption_quantities_wares[i]) {
 				assert(q <= warequeues[i]->get_filled());
 				warequeues[i]->set_filled(warequeues[i]->get_filled() - q);
 
-				// Update consumption statistic
-				ps.owner().ware_consumed(warequeues[i]->get_ware(), q);
-			}
+				// Update consumption statistics
+				ps.owner().ware_consumed(warequeues[i]->get_index(), q);
+			}
+		}
+		for (size_t i = 0; i < workerqueues.size(); ++i) {
+			if (uint8_t const q = consumption_quantities_workers[i]) {
+				assert(q <= workerqueues[i]->get_filled());
+				workerqueues[i]->set_filled(workerqueues[i]->get_filled() - q);
+			}
+		}
 		return ps.program_step(game);
 	}
 }
@@ -1532,7 +1611,7 @@
 
 	// Second step: give ware to worker
 	WareInstance* ware =
-	   new WareInstance(wq->get_ware(), game.tribes().get_ware_descr(wq->get_ware()));
+	   new WareInstance(wq->get_index(), game.tribes().get_ware_descr(wq->get_index()));
 	ware->init(game);
 	worker.set_carried_ware(game, ware);
 	wq->set_filled(wq->get_filled() - 1);
@@ -1619,8 +1698,8 @@
 		}
 
 		const ProductionProgram::Action& action = *actions_.back().get();
-		for (const auto& group : action.consumed_wares()) {
-			consumed_wares_.push_back(group);
+		for (const auto& group : action.consumed_wares_workers()) {
+			consumed_wares_workers_.push_back(group);
 		}
 		// Add produced wares. If the ware already exists, increase the amount
 		for (const auto& ware : action.produced_wares()) {
@@ -1658,8 +1737,8 @@
 	return *actions_.at(idx).get();
 }
 
-const ProductionProgram::Groups& ProductionProgram::consumed_wares() const {
-	return consumed_wares_;
+const ProductionProgram::Groups& ProductionProgram::consumed_wares_workers() const {
+	return consumed_wares_workers_;
 }
 const Buildcost& ProductionProgram::produced_wares() const {
 	return produced_wares_;

=== modified file 'src/logic/map_objects/tribes/production_program.h'
--- src/logic/map_objects/tribes/production_program.h	2016-08-04 15:49:05 +0000
+++ src/logic/map_objects/tribes/production_program.h	2017-01-21 14:37:18 +0000
@@ -52,7 +52,7 @@
 struct ProductionProgram {
 
 	/// A group of ware types with a count.
-	using WareTypeGroup = std::pair<std::set<DescriptionIndex>, uint8_t>;
+	using WareTypeGroup = std::pair<std::set<std::pair<DescriptionIndex, WareWorker>>, uint8_t>;
 	using Groups = std::vector<WareTypeGroup>;
 
 	/// Can be executed on a ProductionSite.
@@ -76,8 +76,8 @@
 		 */
 		virtual void building_work_failed(Game&, ProductionSite&, Worker&) const;
 
-		const Groups& consumed_wares() const {
-			return consumed_wares_;
+		const Groups& consumed_wares_workers() const {
+			return consumed_wares_workers_;
 		}
 		const BillOfMaterials& produced_wares() const {
 			return produced_wares_;
@@ -87,7 +87,7 @@
 		}
 
 	protected:
-		Groups consumed_wares_;
+		Groups consumed_wares_workers_;
 		BillOfMaterials produced_wares_;
 		BillOfMaterials recruited_workers_;
 
@@ -100,7 +100,8 @@
 	static void parse_ware_type_group(char*& parameters,
 	                                  WareTypeGroup& group,
 	                                  const Tribes& tribes,
-	                                  const BillOfMaterials& inputs);
+	                                  const BillOfMaterials& input_wares,
+	                                  const BillOfMaterials& input_workers);
 
 	/// Returns from the program.
 	///
@@ -540,7 +541,7 @@
 	size_t size() const;
 	const ProductionProgram::Action& operator[](size_t const idx) const;
 
-	const ProductionProgram::Groups& consumed_wares() const;
+	const ProductionProgram::Groups& consumed_wares_workers() const;
 	const Buildcost& produced_wares() const;
 	const Buildcost& recruited_workers() const;
 
@@ -548,7 +549,7 @@
 	std::string name_;
 	std::string descname_;
 	std::vector<std::unique_ptr<Action>> actions_;
-	ProductionProgram::Groups consumed_wares_;
+	ProductionProgram::Groups consumed_wares_workers_;
 	Buildcost produced_wares_;
 	Buildcost recruited_workers_;
 };

=== modified file 'src/logic/map_objects/tribes/productionsite.cc'
--- src/logic/map_objects/tribes/productionsite.cc	2016-12-18 17:02:44 +0000
+++ src/logic/map_objects/tribes/productionsite.cc	2017-01-21 14:37:18 +0000
@@ -30,6 +30,7 @@
 #include "economy/request.h"
 #include "economy/ware_instance.h"
 #include "economy/wares_queue.h"
+#include "economy/workers_queue.h"
 #include "graphic/text_constants.h"
 #include "logic/editor_game_base.h"
 #include "logic/game.h"
@@ -117,16 +118,26 @@
 				if (amount < 1 || 255 < amount) {
 					throw wexception("amount is out of range 1 .. 255");
 				}
-				DescriptionIndex const idx = egbase.tribes().ware_index(ware_name);
+				DescriptionIndex idx = egbase.tribes().ware_index(ware_name);
 				if (egbase.tribes().ware_exists(idx)) {
-					for (const auto& temp_inputs : inputs()) {
+					for (const auto& temp_inputs : input_wares()) {
 						if (temp_inputs.first == idx) {
 							throw wexception("duplicated");
 						}
 					}
-					inputs_.push_back(WareAmount(idx, amount));
+					input_wares_.push_back(WareAmount(idx, amount));
 				} else {
-					throw wexception("tribes do not define a ware type with this name");
+					idx = egbase.tribes().worker_index(ware_name);
+					if (egbase.tribes().worker_exists(idx)) {
+						for (const auto& temp_inputs : input_workers()) {
+							if (temp_inputs.first == idx) {
+								throw wexception("duplicated");
+							}
+						}
+						input_workers_.push_back(WareAmount(idx, amount));
+					} else {
+						throw wexception("tribes do not define a ware or worker type with this name");
+					}
 				}
 			} catch (const WException& e) {
 				throw wexception("input \"%s=%d\": %s", ware_name.c_str(), amount, e.what());
@@ -316,14 +327,25 @@
 }
 
 WaresQueue& ProductionSite::waresqueue(DescriptionIndex const wi) {
-	for (WaresQueue* ip_queue : input_queues_) {
-		if (ip_queue->get_ware() == wi) {
+	for (WaresQueue* ip_queue : input_ware_queues_) {
+		if (ip_queue->get_index() == wi) {
 			return *ip_queue;
 		}
 	}
 	throw wexception("%s (%u) has no WaresQueue for %u", descr().name().c_str(), serial(), wi);
 }
 
+WorkersQueue& ProductionSite::workersqueue(DescriptionIndex const wi) {
+	// Check for perfect match
+	for (WorkersQueue* ip_queue : input_worker_queues_) {
+		if (ip_queue->get_index() == wi) {
+			return *ip_queue;
+		}
+	}
+	// Only check for perfect matches since they are requested by the queue
+	throw wexception("%s (%u) has no WorkersQueue for %u", descr().name().c_str(), serial(), wi);
+}
+
 /**
  * Calculate statistic.
  */
@@ -391,10 +413,17 @@
 void ProductionSite::init(EditorGameBase& egbase) {
 	Building::init(egbase);
 
-	const BillOfMaterials& inputs = descr().inputs();
-	input_queues_.resize(inputs.size());
-	for (WareRange i(inputs); i; ++i)
-		input_queues_[i.i] = new WaresQueue(*this, i.current->first, i.current->second);
+	const BillOfMaterials& input_wares = descr().input_wares();
+	input_ware_queues_.resize(input_wares.size());
+	for (WareRange i(input_wares); i; ++i) {
+		input_ware_queues_[i.i] = new WaresQueue(*this, i.current->first, i.current->second);
+	}
+
+	const BillOfMaterials& input_workers = descr().input_workers();
+	input_worker_queues_.resize(input_workers.size());
+	for (WareRange i(input_workers); i; ++i) {
+		input_worker_queues_[i.i] = new WorkersQueue(*this, i.current->first, i.current->second);
+	}
 
 	//  Request missing workers.
 	WorkingPosition* wp = working_positions_;
@@ -418,7 +447,10 @@
  */
 void ProductionSite::set_economy(Economy* const e) {
 	if (Economy* const old = get_economy()) {
-		for (WaresQueue* ip_queue : input_queues_) {
+		for (WaresQueue* ip_queue : input_ware_queues_) {
+			ip_queue->remove_from_economy(*old);
+		}
+		for (WorkersQueue* ip_queue : input_worker_queues_) {
 			ip_queue->remove_from_economy(*old);
 		}
 	}
@@ -429,7 +461,10 @@
 			r->set_economy(e);
 
 	if (e) {
-		for (WaresQueue* ip_queue : input_queues_) {
+		for (WaresQueue* ip_queue : input_ware_queues_) {
+			ip_queue->add_to_economy(*e);
+		}
+		for (WorkersQueue* ip_queue : input_worker_queues_) {
 			ip_queue->add_to_economy(*e);
 		}
 	}
@@ -454,11 +489,17 @@
 	}
 
 	// Cleanup the wares queues
-	for (uint32_t i = 0; i < input_queues_.size(); ++i) {
-		input_queues_[i]->cleanup();
-		delete input_queues_[i];
-	}
-	input_queues_.clear();
+	for (uint32_t i = 0; i < input_ware_queues_.size(); ++i) {
+		input_ware_queues_[i]->cleanup();
+		delete input_ware_queues_[i];
+	}
+	input_ware_queues_.clear();
+
+	for (uint32_t i = 0; i < input_worker_queues_.size(); ++i) {
+		input_worker_queues_[i]->cleanup();
+		delete input_worker_queues_[i];
+	}
+	input_worker_queues_.clear();
 
 	Building::cleanup(egbase);
 }
@@ -786,11 +827,11 @@
 	}
 
 	// Drop all the wares that are too much out to the flag.
-	for (WaresQueue* queue : input_queues_) {
+	for (WaresQueue* queue : input_ware_queues_) {
 		if (queue->get_filled() > queue->get_max_fill()) {
 			queue->set_filled(queue->get_filled() - 1);
-			const WareDescr& wd = *owner().tribe().get_ware_descr(queue->get_ware());
-			WareInstance& ware = *new WareInstance(queue->get_ware(), &wd);
+			const WareDescr& wd = *owner().tribe().get_ware_descr(queue->get_index());
+			WareInstance& ware = *new WareInstance(queue->get_index(), &wd);
 			ware.init(game);
 			worker.start_task_dropoff(game, ware);
 			return true;

=== modified file 'src/logic/map_objects/tribes/productionsite.h'
--- src/logic/map_objects/tribes/productionsite.h	2016-08-04 15:49:05 +0000
+++ src/logic/map_objects/tribes/productionsite.h	2017-01-21 14:37:18 +0000
@@ -85,8 +85,11 @@
 	bool is_output_worker_type(const DescriptionIndex& i) const {
 		return output_worker_types_.count(i);
 	}
-	const BillOfMaterials& inputs() const {
-		return inputs_;
+	const BillOfMaterials& input_wares() const {
+		return input_wares_;
+	}
+	const BillOfMaterials& input_workers() const {
+		return input_workers_;
 	}
 	using Output = std::set<DescriptionIndex>;
 	const Output& output_ware_types() const {
@@ -118,7 +121,8 @@
 
 private:
 	BillOfMaterials working_positions_;
-	BillOfMaterials inputs_;
+	BillOfMaterials input_wares_;
+	BillOfMaterials input_workers_;
 	Output output_ware_types_;
 	Output output_worker_types_;
 	Programs programs_;
@@ -192,6 +196,7 @@
 	}
 
 	WaresQueue& waresqueue(DescriptionIndex) override;
+	WorkersQueue& workersqueue(DescriptionIndex) override;
 
 	void init(EditorGameBase&) override;
 	void cleanup(EditorGameBase&) override;
@@ -207,8 +212,14 @@
 
 	using InputQueues = std::vector<WaresQueue*>;
 	const InputQueues& warequeues() const {
-		return input_queues_;
-	}
+		return input_ware_queues_;
+	}
+
+	using InputWorkerQueues = std::vector<WorkersQueue*>;
+	const InputWorkerQueues& workerqueues() const {
+		return input_worker_queues_;
+	}
+
 	const std::vector<Worker*>& workers() const;
 
 	bool can_start_working() const;
@@ -302,7 +313,8 @@
 
 	BillOfMaterials produced_wares_;
 	BillOfMaterials recruited_workers_;
-	InputQueues input_queues_;  ///< input queues for all inputs
+	InputQueues input_ware_queues_;          ///< input queues for all inputs
+	InputWorkerQueues input_worker_queues_;  ///< input queues for workers
 	std::vector<bool> statistics_;
 	uint8_t last_stat_percent_;
 	// integer 0-10000000, to be divided by 10000 to get a percent, to avoid float (target range:

=== modified file 'src/logic/map_objects/tribes/soldier.cc'
--- src/logic/map_objects/tribes/soldier.cc	2016-12-03 13:32:28 +0000
+++ src/logic/map_objects/tribes/soldier.cc	2017-01-21 14:37:18 +0000
@@ -841,7 +841,8 @@
 		}
 		if (upcast(Warehouse, wh, enemy)) {
 			Requirements noreq;
-			defenders = wh->count_workers(game, wh->owner().tribe().soldier(), noreq);
+			defenders =
+			   wh->count_workers(game, wh->owner().tribe().soldier(), noreq, Warehouse::Match::kExact);
 		}
 		//  Any enemy soldier at baseflag count as defender.
 		std::vector<Bob*> soldiers;

=== modified file 'src/logic/map_objects/tribes/tribes.cc'
--- src/logic/map_objects/tribes/tribes.cc	2017-01-01 19:20:04 +0000
+++ src/logic/map_objects/tribes/tribes.cc	2017-01-21 14:37:18 +0000
@@ -331,7 +331,7 @@
 
 		// Add consumers and producers to wares.
 		if (upcast(ProductionSiteDescr, de, &building_descr)) {
-			for (const auto& ware_amount : de->inputs()) {
+			for (const auto& ware_amount : de->input_wares()) {
 				wares_->get_mutable(ware_amount.first)->add_consumer(i);
 			}
 			for (const DescriptionIndex& wareindex : de->output_ware_types()) {

=== modified file 'src/logic/map_objects/tribes/warehouse.cc'
--- src/logic/map_objects/tribes/warehouse.cc	2016-12-05 19:45:49 +0000
+++ src/logic/map_objects/tribes/warehouse.cc	2017-01-21 14:37:18 +0000
@@ -192,8 +192,11 @@
 }
 
 uint32_t WarehouseSupply::nr_supplies(const Game& game, const Request& req) const {
-	if (req.get_type() == wwWORKER)
-		return warehouse_->count_workers(game, req.get_index(), req.get_requirements());
+	if (req.get_type() == wwWORKER) {
+		return warehouse_->count_workers(
+		   game, req.get_index(), req.get_requirements(),
+		   (req.get_exact_match() ? Warehouse::Match::kExact : Warehouse::Match::kCompatible));
+	}
 
 	//  Calculate how many wares can be sent out - it might be that we need them
 	// ourselves. E.g. for hiring new soldiers.
@@ -738,8 +741,10 @@
  * \return the number of workers that we can launch satisfying the given
  * requirements.
  */
-Quantity
-Warehouse::count_workers(const Game& /* game */, DescriptionIndex ware, const Requirements& req) {
+Quantity Warehouse::count_workers(const Game& /* game */,
+                                  DescriptionIndex ware,
+                                  const Requirements& req,
+                                  Match exact) {
 	Quantity sum = 0;
 
 	do {
@@ -755,8 +760,11 @@
 				}
 			}
 		}
-
-		ware = owner().tribe().get_worker_descr(ware)->becomes();
+		if (exact == Match::kCompatible) {
+			ware = owner().tribe().get_worker_descr(ware)->becomes();
+		} else {
+			ware = INVALID_INDEX;
+		}
 	} while (owner().tribe().has_ware(ware));
 
 	return sum;
@@ -1177,7 +1185,7 @@
 	DescriptionIndex const soldier_index = owner().tribe().soldier();
 	Requirements noreq;
 
-	if (!count_workers(game, soldier_index, noreq))
+	if (!count_workers(game, soldier_index, noreq, Match::kCompatible))
 		return;
 
 	Soldier& defender = dynamic_cast<Soldier&>(launch_worker(game, soldier_index, noreq));
@@ -1189,7 +1197,7 @@
 	DescriptionIndex const soldier_index = owner().tribe().soldier();
 	Requirements noreq;
 
-	if (count_workers(game, soldier_index, noreq)) {
+	if (count_workers(game, soldier_index, noreq, Match::kCompatible)) {
 		Soldier& defender = dynamic_cast<Soldier&>(launch_worker(game, soldier_index, noreq));
 		defender.start_task_defense(game, true);
 		enemy.send_signal(game, "sleep");

=== modified file 'src/logic/map_objects/tribes/warehouse.h'
--- src/logic/map_objects/tribes/warehouse.h	2016-12-02 07:53:21 +0000
+++ src/logic/map_objects/tribes/warehouse.h	2017-01-21 14:37:18 +0000
@@ -111,6 +111,22 @@
 		kRemove = 3,
 	};
 
+	/**
+	 * Whether worker indices in count_workers() have to match exactly.
+	 */
+	enum class Match {
+		/**
+	    * Return the number of workers with matching indices.
+	    */
+		kExact,
+
+		/**
+	    * Return the number of workers with matching indices or
+	    * which are more experienced workers of the given lower type.
+	    */
+		kCompatible
+	};
+
 	Warehouse(const WarehouseDescr&);
 	virtual ~Warehouse();
 
@@ -181,7 +197,7 @@
 
 	bool fetch_from_flag(Game&) override;
 
-	Quantity count_workers(const Game&, DescriptionIndex, const Requirements&);
+	Quantity count_workers(const Game&, DescriptionIndex, const Requirements&, Match);
 	Worker& launch_worker(Game&, DescriptionIndex worker, const Requirements&);
 
 	// Adds the worker to the inventory. Takes ownership and might delete

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2016-12-01 16:59:34 +0000
+++ src/logic/playercommand.cc	2017-01-21 14:37:18 +0000
@@ -23,7 +23,7 @@
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/economy.h"
-#include "economy/wares_queue.h"
+#include "economy/input_queue.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "io/streamwrite.h"
@@ -79,7 +79,7 @@
 	PLCMD_MESSAGESETSTATUSREAD = 18,
 	PLCMD_MESSAGESETSTATUSARCHIVED = 19,
 	PLCMD_SETSTOCKPOLICY = 20,
-	PLCMD_SETWAREMAXFILL = 21,
+	PLCMD_SETINPUTMAXFILL = 21,
 	PLCMD_DISMANTLEBUILDING = 22,
 	PLCMD_EVICTWORKER = 23,
 	PLCMD_MILITARYSITESETSOLDIERPREFERENCE = 24,
@@ -149,8 +149,8 @@
 		return new CmdMessageSetStatusArchived(des);
 	case PLCMD_SETSTOCKPOLICY:
 		return new CmdSetStockPolicy(des);
-	case PLCMD_SETWAREMAXFILL:
-		return new CmdSetWareMaxFill(des);
+	case PLCMD_SETINPUTMAXFILL:
+		return new CmdSetInputMaxFill(des);
 	case PLCMD_DISMANTLEBUILDING:
 		return new CmdDismantleBuilding(des);
 	case PLCMD_EVICTWORKER:
@@ -165,7 +165,7 @@
 /**
  * Write this player command to a file. Call this from base classes
  */
-constexpr uint16_t kCurrentPacketVersionPlayerCommand = 2;
+constexpr uint16_t kCurrentPacketVersionPlayerCommand = 3;
 
 void PlayerCommand::write(FileWrite& fw, EditorGameBase& egbase, MapObjectSaver& mos) {
 	// First, write version
@@ -180,7 +180,7 @@
 void PlayerCommand::read(FileRead& fr, EditorGameBase& egbase, MapObjectLoader& mol) {
 	try {
 		const uint16_t packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersionPlayerCommand) {
+		if (packet_version >= 2 && packet_version <= kCurrentPacketVersionPlayerCommand) {
 			GameLogicCommand::read(fr, egbase, mol);
 			sender_ = fr.unsigned_8();
 			if (!egbase.get_player(sender_))
@@ -1077,18 +1077,20 @@
 }
 
 /*** class Cmd_SetWareMaxFill ***/
-CmdSetWareMaxFill::CmdSetWareMaxFill(const uint32_t init_duetime,
-                                     const PlayerNumber init_sender,
-                                     PlayerImmovable& imm,
-                                     const DescriptionIndex index,
-                                     const uint32_t max_fill)
+CmdSetInputMaxFill::CmdSetInputMaxFill(const uint32_t init_duetime,
+                                       const PlayerNumber init_sender,
+                                       PlayerImmovable& imm,
+                                       const DescriptionIndex index,
+                                       const WareWorker type,
+                                       const uint32_t max_fill)
    : PlayerCommand(init_duetime, init_sender),
      serial_(imm.serial()),
      index_(index),
+     type_(type),
      max_fill_(max_fill) {
 }
 
-void CmdSetWareMaxFill::execute(Game& game) {
+void CmdSetInputMaxFill::execute(Game& game) {
 	upcast(Building, b, game.objects().get_object(serial_));
 
 	if (!b)
@@ -1096,50 +1098,71 @@
 	if (b->owner().player_number() != sender())
 		return;
 
-	b->waresqueue(index_).set_max_fill(max_fill_);
+	b->inputqueue(index_, type_).set_max_fill(max_fill_);
 }
 
-constexpr uint16_t kCurrentPacketVersionCmdSetWareMaxFill = 1;
+constexpr uint16_t kCurrentPacketVersionCmdSetInputMaxFill = 2;
 
-void CmdSetWareMaxFill::write(FileWrite& fw, EditorGameBase& egbase, MapObjectSaver& mos) {
-	fw.unsigned_16(kCurrentPacketVersionCmdSetWareMaxFill);
+void CmdSetInputMaxFill::write(FileWrite& fw, EditorGameBase& egbase, MapObjectSaver& mos) {
+	fw.unsigned_16(kCurrentPacketVersionCmdSetInputMaxFill);
 
 	PlayerCommand::write(fw, egbase, mos);
 
 	fw.unsigned_32(mos.get_object_file_index_or_zero(egbase.objects().get_object(serial_)));
 	fw.signed_32(index_);
+	if (type_ == wwWARE) {
+		fw.unsigned_8(0);
+	} else {
+		fw.unsigned_8(1);
+	}
 	fw.unsigned_32(max_fill_);
 }
 
-void CmdSetWareMaxFill::read(FileRead& fr, EditorGameBase& egbase, MapObjectLoader& mol) {
+void CmdSetInputMaxFill::read(FileRead& fr, EditorGameBase& egbase, MapObjectLoader& mol) {
 	try {
 		const uint16_t packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersionCmdSetWareMaxFill) {
+		if (packet_version >= 1 && packet_version <= kCurrentPacketVersionCmdSetInputMaxFill) {
 			PlayerCommand::read(fr, egbase, mol);
 			serial_ = get_object_serial_or_zero<Building>(fr.unsigned_32(), mol);
 			index_ = fr.signed_32();
+			if (packet_version > 1) {
+				if (fr.unsigned_8() == 0) {
+					type_ = wwWARE;
+				} else {
+					type_ = wwWORKER;
+				}
+			}
 			max_fill_ = fr.unsigned_32();
 		} else {
 			throw UnhandledVersionError(
-			   "CmdSetWareMaxFill", packet_version, kCurrentPacketVersionCmdSetWareMaxFill);
+			   "CmdSetInputMaxFill", packet_version, kCurrentPacketVersionCmdSetInputMaxFill);
 		}
 	} catch (const WException& e) {
 		throw GameDataError("set ware max fill: %s", e.what());
 	}
 }
 
-CmdSetWareMaxFill::CmdSetWareMaxFill(StreamRead& des)
-   : PlayerCommand(0, des.unsigned_8()),
-     serial_(des.unsigned_32()),
-     index_(des.signed_32()),
-     max_fill_(des.unsigned_32()) {
+CmdSetInputMaxFill::CmdSetInputMaxFill(StreamRead& des) : PlayerCommand(0, des.unsigned_8()) {
+	serial_ = des.unsigned_32();
+	index_ = des.signed_32();
+	if (des.unsigned_8() == 0) {
+		type_ = wwWARE;
+	} else {
+		type_ = wwWORKER;
+	}
+	max_fill_ = des.unsigned_32();
 }
 
-void CmdSetWareMaxFill::serialize(StreamWrite& ser) {
-	ser.unsigned_8(PLCMD_SETWAREMAXFILL);
+void CmdSetInputMaxFill::serialize(StreamWrite& ser) {
+	ser.unsigned_8(PLCMD_SETINPUTMAXFILL);
 	ser.unsigned_8(sender());
 	ser.unsigned_32(serial_);
 	ser.signed_32(index_);
+	if (type_ == wwWARE) {
+		ser.unsigned_8(0);
+	} else {
+		ser.unsigned_8(1);
+	}
 	ser.unsigned_32(max_fill_);
 }
 

=== modified file 'src/logic/playercommand.h'
--- src/logic/playercommand.h	2016-08-04 15:49:05 +0000
+++ src/logic/playercommand.h	2017-01-21 14:37:18 +0000
@@ -493,21 +493,25 @@
 	int32_t priority_;
 };
 
-struct CmdSetWareMaxFill : public PlayerCommand {
-	CmdSetWareMaxFill() : PlayerCommand(), serial_(0), index_(), max_fill_(0) {
+struct CmdSetInputMaxFill : public PlayerCommand {
+	CmdSetInputMaxFill() : PlayerCommand(), serial_(0), index_(), type_(wwWARE), max_fill_(0) {
 	}  // For savegame loading
-	CmdSetWareMaxFill(
-	   uint32_t duetime, PlayerNumber, PlayerImmovable&, DescriptionIndex, uint32_t maxfill);
+	CmdSetInputMaxFill(uint32_t duetime,
+	                   PlayerNumber,
+	                   PlayerImmovable&,
+	                   DescriptionIndex,
+	                   WareWorker,
+	                   uint32_t maxfill);
 
 	// Write these commands to a file (for savegames)
 	void write(FileWrite&, EditorGameBase&, MapObjectSaver&) override;
 	void read(FileRead&, EditorGameBase&, MapObjectLoader&) override;
 
 	QueueCommandTypes id() const override {
-		return QueueCommandTypes::kSetWareMaxFill;
+		return QueueCommandTypes::kSetInputMaxFill;
 	}
 
-	CmdSetWareMaxFill(StreamRead&);
+	CmdSetInputMaxFill(StreamRead&);
 
 	void execute(Game&) override;
 	void serialize(StreamWrite&) override;
@@ -515,6 +519,7 @@
 private:
 	Serial serial_;
 	DescriptionIndex index_;
+	WareWorker type_;
 	uint32_t max_fill_;
 };
 

=== modified file 'src/logic/queue_cmd_factory.cc'
--- src/logic/queue_cmd_factory.cc	2016-12-03 13:32:28 +0000
+++ src/logic/queue_cmd_factory.cc	2017-01-21 14:37:18 +0000
@@ -64,8 +64,8 @@
 		return *new CmdSetWorkerTargetQuantity();
 	case QueueCommandTypes::kResetWorkerTargetQuantity:
 		return *new CmdResetWorkerTargetQuantity();
-	case QueueCommandTypes::kSetWareMaxFill:
-		return *new CmdSetWareMaxFill();
+	case QueueCommandTypes::kSetInputMaxFill:
+		return *new CmdSetInputMaxFill();
 	case QueueCommandTypes::kMessageSetStatusRead:
 		return *new CmdMessageSetStatusRead();
 	case QueueCommandTypes::kMessageSetStatusArchived:

=== modified file 'src/logic/queue_cmd_ids.h'
--- src/logic/queue_cmd_ids.h	2016-08-04 15:49:05 +0000
+++ src/logic/queue_cmd_ids.h	2017-01-21 14:37:18 +0000
@@ -60,7 +60,7 @@
 
 	// 17 was a command related to old events. removed
 
-	kSetWareMaxFill = 18,
+	kSetInputMaxFill = 18,
 
 	kMessageSetStatusRead = 21,
 	kMessageSetStatusArchived,

=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc	2016-12-01 16:59:34 +0000
+++ src/map_io/map_buildingdata_packet.cc	2017-01-21 14:37:18 +0000
@@ -30,6 +30,7 @@
 #include "economy/request.h"
 #include "economy/warehousesupply.h"
 #include "economy/wares_queue.h"
+#include "economy/workers_queue.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"
 #include "logic/editor_game_base.h"
@@ -61,7 +62,7 @@
 constexpr uint16_t kCurrentPacketPFBuilding = 1;
 constexpr uint16_t kCurrentPacketVersionWarehouse = 6;
 constexpr uint16_t kCurrentPacketVersionMilitarysite = 5;
-constexpr uint16_t kCurrentPacketVersionProductionsite = 5;
+constexpr uint16_t kCurrentPacketVersionProductionsite = 6;
 constexpr uint16_t kCurrentPacketVersionTrainingsite = 5;
 
 void MapBuildingdataPacket::read(FileSystem& fs,
@@ -547,7 +548,7 @@
                                                 MapObjectLoader& mol) {
 	try {
 		uint16_t const packet_version = fr.unsigned_16();
-		if (packet_version == kCurrentPacketVersionProductionsite) {
+		if (packet_version >= 5 && packet_version <= kCurrentPacketVersionProductionsite) {
 			ProductionSite::WorkingPosition& wp_begin = *productionsite.working_positions_;
 			const ProductionSiteDescr& pr_descr = productionsite.descr();
 			const BillOfMaterials& working_positions = pr_descr.working_positions();
@@ -673,15 +674,30 @@
 			productionsite.program_time_ = fr.signed_32();
 
 			uint16_t nr_queues = fr.unsigned_16();
-			assert(!productionsite.input_queues_.size());
+			assert(!productionsite.input_ware_queues_.size());
 			for (uint16_t i = 0; i < nr_queues; ++i) {
 				WaresQueue* wq = new WaresQueue(productionsite, INVALID_INDEX, 0);
 				wq->read(fr, game, mol);
 
-				if (!game.tribes().ware_exists(wq->get_ware())) {
+				if (!game.tribes().ware_exists(wq->get_index())) {
 					delete wq;
 				} else {
-					productionsite.input_queues_.push_back(wq);
+					productionsite.input_ware_queues_.push_back(wq);
+				}
+			}
+
+			if (packet_version > 5) {
+				nr_queues = fr.unsigned_16();
+				assert(!productionsite.input_worker_queues_.size());
+				for (uint16_t i = 0; i < nr_queues; ++i) {
+					WorkersQueue* wq = new WorkersQueue(productionsite, INVALID_INDEX, 0);
+					wq->read(fr, game, mol);
+
+					if (!game.tribes().worker_exists(wq->get_index())) {
+						delete wq;
+					} else {
+						productionsite.input_worker_queues_.push_back(wq);
+					}
 				}
 			}
 
@@ -1124,10 +1140,17 @@
 	fw.unsigned_8(productionsite.program_timer_);
 	fw.signed_32(productionsite.program_time_);
 
-	const uint16_t input_queues_size = productionsite.input_queues_.size();
+	const uint16_t input_queues_size = productionsite.input_ware_queues_.size();
 	fw.unsigned_16(input_queues_size);
-	for (uint16_t i = 0; i < input_queues_size; ++i)
-		productionsite.input_queues_[i]->write(fw, game, mos);
+	for (uint16_t i = 0; i < input_queues_size; ++i) {
+		productionsite.input_ware_queues_[i]->write(fw, game, mos);
+	}
+
+	const uint16_t input_worker_queues_size = productionsite.input_worker_queues_.size();
+	fw.unsigned_16(input_worker_queues_size);
+	for (uint16_t i = 0; i < input_worker_queues_size; ++i) {
+		productionsite.input_worker_queues_[i]->write(fw, game, mos);
+	}
 
 	const uint16_t statistics_size = productionsite.statistics_.size();
 	fw.unsigned_16(statistics_size);

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2017-01-21 14:22:31 +0000
+++ src/scripting/lua_map.cc	2017-01-21 14:37:18 +0000
@@ -27,6 +27,7 @@
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/wares_queue.h"
+#include "economy/workers_queue.h"
 #include "graphic/graphic.h"
 #include "logic/findimmovable.h"
 #include "logic/map_objects/checkstep.h"
@@ -152,9 +153,108 @@
 using WorkerAmount = std::pair<Widelands::DescriptionIndex, Widelands::Quantity>;
 using PlrInfluence = std::pair<Widelands::PlayerNumber, Widelands::MilitaryInfluence>;
 using WaresSet = std::set<Widelands::DescriptionIndex>;
+using InputSet = std::set<std::pair<Widelands::DescriptionIndex, Widelands::WareWorker>>;
 using WorkersSet = std::set<Widelands::DescriptionIndex>;
 using SoldiersList = std::vector<Widelands::Soldier*>;
 
+// Versions of the above macros which accept wares and workers
+InputSet parse_get_input_arguments(lua_State* L, const TribeDescr& tribe, bool* return_number) {
+	/* takes either "all", a name or an array of names */
+	int32_t nargs = lua_gettop(L);
+	if (nargs != 2)
+		report_error(L, "Wrong number of arguments to get_inputs!");
+	*return_number = false;
+	InputSet rv;
+	if (lua_isstring(L, 2)) {
+		std::string what = luaL_checkstring(L, -1);
+		if (what == "all") {
+			for (const DescriptionIndex& i : tribe.wares()) {
+				rv.insert(std::make_pair(i, wwWARE));
+			}
+			for (const DescriptionIndex& i : tribe.workers()) {
+				rv.insert(std::make_pair(i, wwWORKER));
+			}
+		} else {
+			/* Only one item requested */
+			DescriptionIndex index = tribe.ware_index(what);
+			if (tribe.has_ware(index)) {
+				rv.insert(std::make_pair(index, wwWARE));
+				*return_number = true;
+			} else {
+				index = tribe.worker_index(what);
+				if (tribe.has_worker(index)) {
+					rv.insert(std::make_pair(index, wwWORKER));
+					*return_number = true;
+				} else {
+					report_error(L, "Invalid input: <%s>", what.c_str());
+				}
+			}
+		}
+	} else {
+		/* array of names */
+		luaL_checktype(L, 2, LUA_TTABLE);
+		lua_pushnil(L);
+		while (lua_next(L, 2) != 0) {
+			std::string what = luaL_checkstring(L, -1);
+			DescriptionIndex index = tribe.ware_index(what);
+			if (tribe.has_ware(index)) {
+				rv.insert(std::make_pair(index, wwWARE));
+			} else {
+				index = tribe.worker_index(what);
+				if (tribe.has_worker(index)) {
+					rv.insert(std::make_pair(index, wwWORKER));
+				} else {
+					report_error(L, "Invalid input: <%s>", what.c_str());
+				}
+			}
+			lua_pop(L, 1);
+		}
+	}
+	return rv;
+}
+
+InputMap parse_set_input_arguments(lua_State* L, const TribeDescr& tribe) {
+	int32_t nargs = lua_gettop(L);
+	if (nargs != 2 && nargs != 3)
+		report_error(L, "Wrong number of arguments to set_inputs!");
+	InputMap rv;
+	if (nargs == 3) {
+		/* name amount */
+		std::string what = luaL_checkstring(L, 2);
+		DescriptionIndex index = tribe.ware_index(what);
+		if (tribe.has_ware(index)) {
+			rv.insert(std::make_pair(std::make_pair(index, wwWARE), luaL_checkuint32(L, 3)));
+		} else {
+			index = tribe.worker_index(what);
+			if (tribe.has_worker(index)) {
+				rv.insert(std::make_pair(std::make_pair(index, wwWORKER), luaL_checkuint32(L, 3)));
+			} else {
+				report_error(L, "Invalid input: <%s>", what.c_str());
+			}
+		}
+	} else {
+		/* array of (name, count) */
+		luaL_checktype(L, 2, LUA_TTABLE);
+		lua_pushnil(L);
+		while (lua_next(L, 2) != 0) {
+			std::string what = luaL_checkstring(L, -2);
+			DescriptionIndex index = tribe.ware_index(what);
+			if (tribe.has_ware(index)) {
+				rv.insert(std::make_pair(std::make_pair(index, wwWARE), luaL_checkuint32(L, -1)));
+			} else {
+				index = tribe.worker_index(what);
+				if (tribe.has_worker(index)) {
+					rv.insert(std::make_pair(std::make_pair(index, wwWORKER), luaL_checkuint32(L, -1)));
+				} else {
+					report_error(L, "Invalid input: <%s>", what.c_str());
+				}
+			}
+			lua_pop(L, 1);
+		}
+	}
+	return rv;
+}
+
 WaresWorkersMap count_wares_on_flag_(Flag& f, const Tribes& tribes) {
 	WaresWorkersMap rv;
 
@@ -262,7 +362,7 @@
 	const TribeDescr& tribe = pi->owner().tribe();
 
 	// setpoints is map of index:quantity
-	WaresWorkersMap setpoints;
+	InputMap setpoints;
 	parse_wares_workers_counted(L, tribe, &setpoints, false);
 
 	// c_workers is actual statistics, the map index:quantity
@@ -273,18 +373,19 @@
 			c_workers.insert(WorkerAmount(i, 1));
 		else
 			c_workers[i] += 1;
-		if (!setpoints.count(i))
-			setpoints.insert(WorkerAmount(i, 0));
+		if (!setpoints.count(std::make_pair(i, Widelands::WareWorker::wwWORKER)))
+			setpoints.insert(std::make_pair(std::make_pair(i, Widelands::WareWorker::wwWORKER), 0));
 	}
 
 	// The idea is to change as little as possible
-	for (const WaresWorkersMap::value_type& sp : setpoints) {
-		const WorkerDescr* wdes = tribe.get_worker_descr(sp.first);
-		if (!valid_workers.count(sp.first))
+	for (const auto& sp : setpoints) {
+		const Widelands::DescriptionIndex& index = sp.first.first;
+		const WorkerDescr* wdes = tribe.get_worker_descr(index);
+		if (sp.second != 0 && !valid_workers.count(index))
 			report_error(L, "<%s> can't be employed here!", wdes->name().c_str());
 
 		Widelands::Quantity cur = 0;
-		WaresWorkersMap::iterator i = c_workers.find(sp.first);
+		WaresWorkersMap::iterator i = c_workers.find(index);
 		if (i != c_workers.end())
 			cur = i->second;
 
@@ -292,7 +393,7 @@
 		if (d < 0) {
 			while (d) {
 				for (const Worker* w : pi->get_workers()) {
-					if (tribe.worker_index(w->descr().name()) == sp.first) {
+					if (tribe.worker_index(w->descr().name()) == index) {
 						const_cast<Worker*>(w)->remove(egbase);
 						++d;
 						break;
@@ -668,7 +769,7 @@
 // Very similar to above function, but expects numbers for every received ware/worker
 RequestedWareWorker parse_wares_workers_counted(lua_State* L,
                                                 const TribeDescr& tribe,
-                                                WaresWorkersMap* ware_workers_list,
+																InputMap* ware_workers_list,
                                                 bool is_ware) {
 	RequestedWareWorker result = RequestedWareWorker::kUndefined;
 	int32_t nargs = lua_gettop(L);
@@ -685,13 +786,13 @@
 				report_error(L, "Illegal ware %s", luaL_checkstring(L, 2));
 			}
 			ware_workers_list->insert(
-			   WareAmount(tribe.ware_index(luaL_checkstring(L, 2)), luaL_checkuint32(L, 3)));
+				std::make_pair(std::make_pair(tribe.ware_index(luaL_checkstring(L, 2)), Widelands::WareWorker::wwWARE), luaL_checkuint32(L, 3)));
 		} else {
 			if (tribe.worker_index(luaL_checkstring(L, 2)) == INVALID_INDEX) {
 				report_error(L, "Illegal worker %s", luaL_checkstring(L, 2));
 			}
 			ware_workers_list->insert(
-			   WorkerAmount(tribe.worker_index(luaL_checkstring(L, 2)), luaL_checkuint32(L, 3)));
+				std::make_pair(std::make_pair(tribe.worker_index(luaL_checkstring(L, 2)), Widelands::WareWorker::wwWORKER), luaL_checkuint32(L, 3)));
 		}
 	} else {
 		result = RequestedWareWorker::kList;
@@ -711,10 +812,10 @@
 
 			if (is_ware) {
 				ware_workers_list->insert(
-				   WareAmount(tribe.ware_index(luaL_checkstring(L, -2)), luaL_checkuint32(L, -1)));
+					std::make_pair(std::make_pair(tribe.ware_index(luaL_checkstring(L, -2)), Widelands::WareWorker::wwWARE), luaL_checkuint32(L, -1)));
 			} else {
 				ware_workers_list->insert(
-				   WorkerAmount(tribe.worker_index(luaL_checkstring(L, -2)), luaL_checkuint32(L, -1)));
+					std::make_pair(std::make_pair(tribe.worker_index(luaL_checkstring(L, -2)), Widelands::WareWorker::wwWORKER), luaL_checkuint32(L, -1)));
 			}
 			lua_pop(L, 1);
 		}
@@ -742,10 +843,9 @@
 
 .. class:: HasWares
 
-   HasWares is an interface that all :class:`PlayerImmovable` objects
+   HasWares is an interface that most :class:`PlayerImmovable` objects
    that can contain wares implement. This is at the time of this writing
-   :class:`~wl.map.Flag`, :class:`~wl.map.Warehouse` and
-   :class:`~wl.map.ProductionSite`.
+   :class:`~wl.map.Flag` and :class:`~wl.map.Warehouse`.
 */
 
 /* RST
@@ -762,7 +862,7 @@
       * a ware name.
          In this case a single integer is returned. No check is made
          if this ware makes sense for this location, you can for example ask a
-         :const:`lumberjacks_hut` for the number of :const:`raw_stone` he has
+         :const:`lumberjacks_hut` for the number of :const:`granite` he has
          and he will return 0.
       * an :class:`array` of ware names.
          In this case a :class:`table` of
@@ -776,7 +876,7 @@
    .. method:: set_wares(which[, amount])
 
       Sets the wares available in this location. Either takes two arguments,
-      a ware name and an amount to set it too. Or it takes a table of
+      a ware name and an amount to set it to. Or it takes a table of
       (ware name, amount) pairs. Wares are created and added to an economy out
       of thin air.
 
@@ -803,14 +903,85 @@
 */
 
 /* RST
+HasInputs
+--------
+
+.. class:: HasInputs
+
+   HasInputs is an interface that some :class:`PlayerImmovable` objects
+   implement. At the time of this writing these are
+   :class:`~wl.map.ProductionSite` and :class:`~wl.map.TrainingSite`.
+   This interface is similar to :class:`HasWares` but additionally allows
+   to set workers as inputs. These workers are consumed by the production
+   or trainings programm.
+*/
+
+/* RST
+   .. method:: get_inputs(which)
+
+      Gets the number of wares and workers that currently reside here
+      for consumption.
+
+      :arg which:  can be either of
+
+      * the string :const:`all`.
+           In this case the function will return a
+           :class:`table` of (ware/worker name,amount) pairs that gives
+           information about all ware information available for this object.
+      * a ware or worker name.
+           In this case a single integer is returned. No check is made
+           if this ware/worker makes sense for this location, you can for example ask a
+           :const:`lumberjacks_hut` for the number of :const:`granite` he has
+           and he will return 0.
+      * an :class:`array` of ware and worker names.
+           In this case a :class:`table` of
+           (ware/worker name,amount) pairs is returned where only the requested
+           wares/workers are listed. All other entries are :const:`nil`.
+
+      :returns: :class:`integer` or :class:`table`
+*/
+
+/* RST
+   .. method:: set_inputs(which[, amount])
+
+      Sets the wares/workers available in this location which will
+      be consumed by the production/training programm. Either takes two arguments,
+      a ware/worker name and an amount to set it to. Or it takes a table of
+      (ware/worker name, amount) pairs. Wares are created and added to an
+      economy out of thin air.
+
+      :arg which: name of ware/worker or (ware/worker name, amount) table
+      :type which: :class:`string` or :class:`table`
+      :arg amount: this many units will be available after the call
+      :type amount: :class:`integer`
+*/
+
+/* RST
+   .. attribute:: valid_inputs
+
+      (RO) A :class:`table` of (ware/worker name, count) which describes how
+      many wares/workers can be stored here for consumption. For example for a
+      :class:`~wl.map.ProductionSite` this is the information what wares/workers
+      and can be stored in which amount as inputs.
+
+      You can use this to quickly fill a building:
+
+      .. code-block:: lua
+
+         if b.valid_inputs then b:set_inputs(b.valid_inputs) end
+*/
+
+/* RST
 HasWorkers
 ----------
 
 .. class:: HasWorkers
 
-   Analogon to :class:`HasWares`, but for Workers. Supported at the time of
-   this writing by :class:`~wl.map.Road`, :class:`~wl.map.Warehouse` and
-   :class:`~wl.map.ProductionSite`.
+   Analogon to :class:`HasWares`, but for Workers. Supported at the time
+   of this writing by :class:`~wl.map.Road`, :class:`~wl.map.Warehouse`
+   and :class:`~wl.map.ProductionSite`. In the case of ProductionSites,
+   these methods allow access to the workers which do the work instead of
+   workers which are consumed as accessed by the methods of :class:`HasInputs`.
 */
 
 /* RST
@@ -1930,7 +2101,7 @@
 */
 const char LuaProductionSiteDescription::className[] = "ProductionSiteDescription";
 const MethodType<LuaProductionSiteDescription> LuaProductionSiteDescription::Methods[] = {
-   METHOD(LuaProductionSiteDescription, consumed_wares),
+	METHOD(LuaProductionSiteDescription, consumed_wares_workers),
    METHOD(LuaProductionSiteDescription, produced_wares),
    METHOD(LuaProductionSiteDescription, recruited_workers),
    {nullptr, nullptr},
@@ -1958,7 +2129,7 @@
 int LuaProductionSiteDescription::get_inputs(lua_State* L) {
 	lua_newtable(L);
 	int index = 1;
-	for (const auto& input_ware : get()->inputs()) {
+	for (const auto& input_ware : get()->input_wares()) {
 		lua_pushint32(L, index++);
 		const WareDescr* descr = get_egbase(L).tribes().get_ware_descr(input_ware.first);
 		to_lua<LuaWareDescription>(L, new LuaWareDescription(descr));
@@ -2042,7 +2213,7 @@
 }
 
 /* RST
-	.. attribute:: consumed_wares
+	.. attribute:: consumed_wares_workers
 
 		:arg program_name: the name of the production program that we want to get the consumed wares for
 		:type tribename: :class:`string`
@@ -2050,18 +2221,22 @@
 		(RO) Returns a table of {{ware name}, ware amount} for the wares consumed by this production program.
 			  Multiple entries in {ware name} are alternatives (OR logic)).
 */
-int LuaProductionSiteDescription::consumed_wares(lua_State* L) {
+int LuaProductionSiteDescription::consumed_wares_workers(lua_State* L) {
 	std::string program_name = luaL_checkstring(L, -1);
 	const Widelands::ProductionSiteDescr::Programs& programs = get()->programs();
 	if (programs.count(program_name) == 1) {
 		const ProductionProgram& program = *programs.at(program_name);
 		lua_newtable(L);
 		int counter = 0;
-		for (const auto& group : program.consumed_wares()) {
+		for (const auto& group : program.consumed_wares_workers()) {
 			lua_pushuint32(L, ++counter);