Fix attack
Merge branch 'devel' of github.com:jpascale/RPG into devel