Fixed Production/Food gathering

Continue working on tests/second part of EtaCiv