Optimised syntax

Made coding easier to read
Only outputs secondary effect and makes contact if fields are true
Detection for multiple secondary effect moves