Removed stupid table for attack types. Too specific to be included in this.
Added some more combat events.