bug fixes for combat

Alright, pretty sure combat works now, with error.
Still missing xp and stuff. adding things in issues.