Connect farming and fighting by making them codependent #44

Merged
Jonathan merged 4 commits from feature/farm_fight_loop into develop 4 weeks ago