pvp combat modifications
Merge branch 'master' of https://github.com/Hywela/Project_Game.git