Moving some enums around, adding groundwork for the weapon object.

PARTTYPE CHANGED TO DEFAULTTYPE FOR COLLISION!!!!