Updated animation class, added combatable.