Added fromCanonical to ResultType
Added code for parsing ResultTypes that are explicitly for conditions
Added XML support to WeaponType