feat(combat): make waiting return an error with information about waiting information

chore: make updates to get rid of warnings

Merge pull request #32 from Rutherther/combat

Add combat extension

feat(combat): add errors