Revamp2014

Latest version of my combat system revamp.