fixed combat(again)