merged with merge branch, does not work yet
merged townstorage to town, set rats and thieves to 0 for the time being