Improved NPC Soldier movement and gun