Refactor combat to include Party's

[malikhollins]

Combat uses only uses two single actors, instead it should make a call to simulation and get all the party members.