Move attribute references back to effects, and assign default effect to a type

This is needed for proper detection of weapon type, and several other things