Merge pull request #60 from Rutherther/feat/combat-v1

Make combat nonblocking, make multiple queues for distinct operations

feat(combat): update operations to be non-blocking, add support for handling waiting