fix attack 1
Merge branch 'master' of https://github.com/DrunkReaperMatt/PCQ-Conjure-Omega