working on boss/attacks
merge