main v0.021

made attack collision better