Fix evolving from (adv.) granger to dretch or adv. granger.
Merge branch 'gameplay/testing'