UNSTABLE: Fixed combat system

Written but not tested.