Forgotten helper functions in untested combat code