Fixed attack commands to not share code
Merge branch 'master' of https://github.com/DennyScott/rotk