Simplify with_auras_id
Renamed delayed_attack to attack and changed its members
Added extra damage values to entities::with_weapon
Use optional weapon unique_ptrs in entities::with_weapon