Degat + combat fixed