simplify the combat logic a bit