Don't subtract lifestock from used/gathered resources.

Also some cleaning in the statistics tracker.
(total is used by the lobby bots and hence not removed.)

References r20543 / rP20543 and #3948.
Differential revision: Don't subtract lifestock from used/gathered resources.
Tested by: @Langbart
Fixes #6744