added type modifiers and damage calc