Moved some Weapon events to new Modifier class