Updated

…removed character switching on move
…added NPC attack after warning