Pet type changed to include combat variables