Nope, I have tried both quarterstaff, one handed weapon and two one handed weapons. On having done more play time with Hiravius it seems to work but only sometimes. I'm not sure if its checking for a certain length of combat or what but he seems to spiritshift without me commanding it actively about 1/4 combats total.