Commit prior to a big remake of damage dealing system