[FIX] more combat

it's hopelessly broken and undergoing a total rewrite. don;t worry
about it now.