updated combat mechanics