Improve data persistence in an out of combat

Reduces a lot of the object designs to be reusable resources that act as templates for factory methods.