Added seperate damages for building/people
Merge