Started reworking damage types and calculations