Do wonder effect in terms of other effects
Re-introduce third effect parameter
Add new parser for second and third effect parameters
Add p3 handling where necessary