Fixes #16

Fixes #16: timewarp is now stopped by a failure.
Refactoring in the perk generator system in preparation for the perk
system.